diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2020-01-14 01:35:22 +0200 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2020-01-14 19:06:40 +0200 |
| commit | acf18e4265dec2991e62f7c8baecfacf1a6708b3 (patch) | |
| tree | 9113e55c2012de225f694d2824fdda444e8e8f56 /test | |
| parent | 9a61a134669c2240100fd1ccadaf974f86fe4655 (diff) | |
libcamera: Switch from utils::make_unique to std::make_unique
Now that we're using C++-14, drop utils::make_unique for
std::make_unique.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Diffstat (limited to 'test')
| -rw-r--r-- | test/ipa/ipa_wrappers_test.cpp | 3 | ||||
| -rw-r--r-- | test/message.cpp | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/test/ipa/ipa_wrappers_test.cpp b/test/ipa/ipa_wrappers_test.cpp index e711e4fe..1ae17811 100644 --- a/test/ipa/ipa_wrappers_test.cpp +++ b/test/ipa/ipa_wrappers_test.cpp @@ -18,7 +18,6 @@ #include "device_enumerator.h" #include "ipa_context_wrapper.h" #include "media_device.h" -#include "utils.h" #include "v4l2_subdevice.h" #include "test.h" @@ -254,7 +253,7 @@ protected: if (ret) return TestFail; - std::unique_ptr<IPAInterface> intf = utils::make_unique<TestIPAInterface>(); + std::unique_ptr<IPAInterface> intf = std::make_unique<TestIPAInterface>(); wrapper_ = new IPAContextWrapper(new IPAInterfaceWrapper(std::move(intf))); wrapper_->queueFrameAction.connect(this, &IPAWrappersTest::queueFrameAction); diff --git a/test/message.cpp b/test/message.cpp index 7ebedb55..478bc79d 100644 --- a/test/message.cpp +++ b/test/message.cpp @@ -12,7 +12,6 @@ #include "message.h" #include "thread.h" #include "test.h" -#include "utils.h" using namespace std; using namespace libcamera; @@ -92,7 +91,7 @@ protected: thread_.start(); - receiver.postMessage(utils::make_unique<Message>(Message::None)); + receiver.postMessage(std::make_unique<Message>(Message::None)); this_thread::sleep_for(chrono::milliseconds(100)); @@ -114,7 +113,7 @@ protected: */ SlowMessageReceiver *slowReceiver = new SlowMessageReceiver(); slowReceiver->moveToThread(&thread_); - slowReceiver->postMessage(utils::make_unique<Message>(Message::None)); + slowReceiver->postMessage(std::make_unique<Message>(Message::None)); this_thread::sleep_for(chrono::milliseconds(10)); |