From b7f80074315114ef866b9eb383a7b99622b8738f Mon Sep 17 00:00:00 2001 From: Youngbok Shin Date: Mon, 30 Jul 2018 15:47:36 +0900 Subject: [PATCH] lottie: use make_unique construct Change-Id: I8618541470fb636d2315aa39360fadc58c182dd3 --- example/uxsampletest.cpp | 3 ++- src/vector/vdebug.cpp | 13 +++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/example/uxsampletest.cpp b/example/uxsampletest.cpp index dae6b44..0ff8f7b 100644 --- a/example/uxsampletest.cpp +++ b/example/uxsampletest.cpp @@ -1,5 +1,6 @@ #include"evasapp.h" #include "lottieview.h" +#include #include #include @@ -38,7 +39,7 @@ public: private: void show() { - mView = std::unique_ptr(new LottieView(mApp->evas(), mRenderMode)); + mView = std::make_unique(mApp->evas(), mRenderMode); mView->setFilePath(mResourceList[mCurIndex].c_str()); mView->setPos(0, 0); mView->setSize(mApp->width(), mApp->height()); diff --git a/src/vector/vdebug.cpp b/src/vector/vdebug.cpp index 3b42ea2..25d69fa 100644 --- a/src/vector/vdebug.cpp +++ b/src/vector/vdebug.cpp @@ -4,6 +4,7 @@ #include #include #include +#include #include #include #include @@ -256,7 +257,7 @@ void VDebug::resize_buffer_if_needed(size_t additional_bytes) if (!m_heap_buffer) { m_buffer_size = std::max(static_cast(512), required_size); - m_heap_buffer.reset(new char[m_buffer_size]); + m_heap_buffer = std::make_unique(m_buffer_size); memcpy(m_heap_buffer.get(), m_stack_buffer, m_bytes_used); return; } else { @@ -603,7 +604,7 @@ private: } m_bytes_written = 0; - m_os.reset(new std::ofstream()); + m_os = std::make_unique(); // TODO Optimize this part. Does it even matter ? std::string log_file_name = m_name; log_file_name.append("."); @@ -697,8 +698,8 @@ void initialize(NonGuaranteedLogger ngl, std::string const& log_directory, std::string const& log_file_name, uint32_t log_file_roll_size_mb) { - nanologger.reset(new NanoLogger(ngl, log_directory, log_file_name, - log_file_roll_size_mb)); + nanologger = std::make_unique(ngl, log_directory, log_file_name, + log_file_roll_size_mb); atomic_nanologger.store(nanologger.get(), std::memory_order_seq_cst); } @@ -706,8 +707,8 @@ void initialize(GuaranteedLogger gl, std::string const& log_directory, std::string const& log_file_name, uint32_t log_file_roll_size_mb) { - nanologger.reset(new NanoLogger(gl, log_directory, log_file_name, - log_file_roll_size_mb)); + nanologger = std::make_unique(gl, log_directory, log_file_name, + log_file_roll_size_mb); atomic_nanologger.store(nanologger.get(), std::memory_order_seq_cst); } -- 2.34.1