{"id":2641,"url":"https://patchwork.libcamera.org/api/patches/2641/?format=json","web_url":"https://patchwork.libcamera.org/patch/2641/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20200114001531.27129-2-laurent.pinchart@ideasonboard.com>","date":"2020-01-14T00:15:31","name":"[libcamera-devel,2/2] libcamera: Switch from utils::make_unique to std::make_unique","commit_ref":"acf18e4265dec2991e62f7c8baecfacf1a6708b3","pull_url":null,"state":"accepted","archived":false,"hash":"e92d024da8ffd220801dad0158f1f3a57495861d","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/2641/mbox/","series":[{"id":620,"url":"https://patchwork.libcamera.org/api/series/620/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=620","date":"2020-01-14T00:15:30","name":"[libcamera-devel,1/2] meson.build: Switch to C++14","version":1,"mbox":"https://patchwork.libcamera.org/series/620/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/2641/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/2641/checks/","tags":{},"headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 3846060709\n\tfor ;\n\tTue, 14 Jan 2020 01:15:48 +0100 (CET)","from pendragon.ideasonboard.com\n\t(cpc108967-cmbg20-2-0-cust420.5-4.cable.virginm.net [81.101.7.165])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id C02759D7\n\tfor ;\n\tTue, 14 Jan 2020 01:15:47 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1578960947;\n\tbh=7mpupHpBUFXYQcXCQakYCBiVXcuj+UNKvp8MQK3Www0=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=GpOY5bCkcHrj/xZnfsY4GWbGkCRPE+hKCz1OjTrWFVVSYwy3sYezxia/Gqnl6qgQz\n\t38MP3Xir7w4jiTavb+chzJBRTHK/BEMJl+lzEcRQBRcXYyuEIkdsfEouZjC1gC+x//\n\thlZrQqQlCi+vqfpwYQ5d3qaK2Qqc/moqpc2TlOIE=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 14 Jan 2020 02:15:31 +0200","Message-Id":"<20200114001531.27129-2-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.24.1","In-Reply-To":"<20200114001531.27129-1-laurent.pinchart@ideasonboard.com>","References":"<20200114001531.27129-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 2/2] libcamera: Switch from\n\tutils::make_unique to std::make_unique","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Tue, 14 Jan 2020 00:15:48 -0000"},"content":"Now that we're using C++-14, drop utils::make_unique for\nstd::make_unique.\n\nSigned-off-by: Laurent Pinchart \n---\n src/android/camera_device.cpp | 2 +-\n src/ipa/ipa_vimc.cpp | 3 +--\n src/ipa/libipa/ipa_interface_wrapper.cpp | 2 +-\n src/ipa/rkisp1/rkisp1.cpp | 2 +-\n src/libcamera/bound_method.cpp | 5 ++---\n src/libcamera/control_serializer.cpp | 2 +-\n src/libcamera/device_enumerator.cpp | 5 ++---\n src/libcamera/include/ipa_proxy.h | 3 +--\n src/libcamera/include/utils.h | 7 -------\n src/libcamera/ipa_manager.cpp | 2 +-\n src/libcamera/pipeline/ipu3/ipu3.cpp | 2 +-\n src/libcamera/pipeline/rkisp1/rkisp1.cpp | 14 +++++++-------\n src/libcamera/pipeline/uvcvideo.cpp | 2 +-\n src/libcamera/pipeline/vimc.cpp | 2 +-\n .../proxy/worker/ipa_proxy_linux_worker.cpp | 3 +--\n src/libcamera/utils.cpp | 5 -----\n src/libcamera/v4l2_device.cpp | 2 +-\n src/libcamera/v4l2_videodevice.cpp | 2 +-\n src/v4l2/v4l2_camera.cpp | 3 +--\n src/v4l2/v4l2_camera_proxy.cpp | 2 +-\n test/ipa/ipa_wrappers_test.cpp | 3 +--\n test/message.cpp | 5 ++---\n 22 files changed, 29 insertions(+), 49 deletions(-)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex a98fd744f534..67c1d47e67ed 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -860,7 +860,7 @@ std::unique_ptr CameraDevice::getResultMetadata(int frame_number\n \t * Currently: 12 entries, 36 bytes\n \t */\n \tstd::unique_ptr resultMetadata =\n-\t\tutils::make_unique(15, 50);\n+\t\tstd::make_unique(15, 50);\n \tif (!resultMetadata->isValid()) {\n \t\tLOG(HAL, Error) << \"Failed to allocate static metadata\";\n \t\treturn nullptr;\ndiff --git a/src/ipa/ipa_vimc.cpp b/src/ipa/ipa_vimc.cpp\nindex 8f03e811acc7..4751ad919a0f 100644\n--- a/src/ipa/ipa_vimc.cpp\n+++ b/src/ipa/ipa_vimc.cpp\n@@ -20,7 +20,6 @@\n #include \"libipa/ipa_interface_wrapper.h\"\n \n #include \"log.h\"\n-#include \"utils.h\"\n \n namespace libcamera {\n \n@@ -113,7 +112,7 @@ const struct IPAModuleInfo ipaModuleInfo = {\n \n struct ipa_context *ipaCreate()\n {\n-\treturn new IPAInterfaceWrapper(utils::make_unique());\n+\treturn new IPAInterfaceWrapper(std::make_unique());\n }\n }\n \ndiff --git a/src/ipa/libipa/ipa_interface_wrapper.cpp b/src/ipa/libipa/ipa_interface_wrapper.cpp\nindex 3628a785dc3e..b93c1c1f1c1a 100644\n--- a/src/ipa/libipa/ipa_interface_wrapper.cpp\n+++ b/src/ipa/libipa/ipa_interface_wrapper.cpp\n@@ -45,7 +45,7 @@ namespace libcamera {\n *\n * struct ipa_context *ipaCreate()\n * {\n- * \treturn new IPAInterfaceWrapper(utils::make_unique());\n+ * \treturn new IPAInterfaceWrapper(std::make_unique());\n * }\n * \\endcode\n *\ndiff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp\nindex a8dd1645d3e8..438b3c66f77a 100644\n--- a/src/ipa/rkisp1/rkisp1.cpp\n+++ b/src/ipa/rkisp1/rkisp1.cpp\n@@ -278,7 +278,7 @@ const struct IPAModuleInfo ipaModuleInfo = {\n \n struct ipa_context *ipaCreate()\n {\n-\treturn new IPAInterfaceWrapper(utils::make_unique());\n+\treturn new IPAInterfaceWrapper(std::make_unique());\n }\n }\n \ndiff --git a/src/libcamera/bound_method.cpp b/src/libcamera/bound_method.cpp\nindex 8e95c7eec92c..e18c2eb4c68e 100644\n--- a/src/libcamera/bound_method.cpp\n+++ b/src/libcamera/bound_method.cpp\n@@ -10,7 +10,6 @@\n #include \"message.h\"\n #include \"semaphore.h\"\n #include \"thread.h\"\n-#include \"utils.h\"\n \n /**\n * \\file bound_method.h\n@@ -84,7 +83,7 @@ bool BoundMethodBase::activatePack(std::shared_ptr pack,\n \n \tcase ConnectionTypeQueued: {\n \t\tstd::unique_ptr msg =\n-\t\t\tutils::make_unique(this, pack, nullptr, deleteMethod);\n+\t\t\tstd::make_unique(this, pack, nullptr, deleteMethod);\n \t\tobject_->postMessage(std::move(msg));\n \t\treturn false;\n \t}\n@@ -93,7 +92,7 @@ bool BoundMethodBase::activatePack(std::shared_ptr pack,\n \t\tSemaphore semaphore;\n \n \t\tstd::unique_ptr msg =\n-\t\t\tutils::make_unique(this, pack, &semaphore, deleteMethod);\n+\t\t\tstd::make_unique(this, pack, &semaphore, deleteMethod);\n \t\tobject_->postMessage(std::move(msg));\n \n \t\tsemaphore.acquire();\ndiff --git a/src/libcamera/control_serializer.cpp b/src/libcamera/control_serializer.cpp\nindex a5d6d875c76f..803ac16c2456 100644\n--- a/src/libcamera/control_serializer.cpp\n+++ b/src/libcamera/control_serializer.cpp\n@@ -414,7 +414,7 @@ ControlInfoMap ControlSerializer::deserialize(ByteStreamBuffer &\n \t\t * \\todo Find a way to preserve the control name for debugging\n \t\t * purpose.\n \t\t */\n-\t\tcontrolIds_.emplace_back(utils::make_unique(entry.id, \"\", type));\n+\t\tcontrolIds_.emplace_back(std::make_unique(entry.id, \"\", type));\n \n \t\tif (entry.offset != values.offset()) {\n \t\t\tLOG(Serializer, Error)\ndiff --git a/src/libcamera/device_enumerator.cpp b/src/libcamera/device_enumerator.cpp\nindex 0b596bcec363..a8b5c90f5a5d 100644\n--- a/src/libcamera/device_enumerator.cpp\n+++ b/src/libcamera/device_enumerator.cpp\n@@ -13,7 +13,6 @@\n \n #include \"log.h\"\n #include \"media_device.h\"\n-#include \"utils.h\"\n \n /**\n * \\file device_enumerator.h\n@@ -145,7 +144,7 @@ std::unique_ptr DeviceEnumerator::create()\n \tstd::unique_ptr enumerator;\n \n #ifdef HAVE_LIBUDEV\n-\tenumerator = utils::make_unique();\n+\tenumerator = std::make_unique();\n \tif (!enumerator->init())\n \t\treturn enumerator;\n #endif\n@@ -154,7 +153,7 @@ std::unique_ptr DeviceEnumerator::create()\n \t * Either udev is not available or udev initialization failed. Fall back\n \t * on the sysfs enumerator.\n \t */\n-\tenumerator = utils::make_unique();\n+\tenumerator = std::make_unique();\n \tif (!enumerator->init())\n \t\treturn enumerator;\n \ndiff --git a/src/libcamera/include/ipa_proxy.h b/src/libcamera/include/ipa_proxy.h\nindex add40b4b3368..e696551af39f 100644\n--- a/src/libcamera/include/ipa_proxy.h\n+++ b/src/libcamera/include/ipa_proxy.h\n@@ -14,7 +14,6 @@\n #include \n \n #include \"ipa_module.h\"\n-#include \"utils.h\"\n \n namespace libcamera {\n \n@@ -56,7 +55,7 @@ public:\t\t\t\t\t\t\t\\\n \tproxy##Factory() : IPAProxyFactory(#proxy) {}\t\\\n \tstd::unique_ptr create(IPAModule *ipam)\t\\\n \t{\t\t\t\t\t\t\\\n-\t\treturn utils::make_unique(ipam);\t\\\n+\t\treturn std::make_unique(ipam);\t\\\n \t}\t\t\t\t\t\t\\\n };\t\t\t\t\t\t\t\\\n static proxy##Factory global_##proxy##Factory;\ndiff --git a/src/libcamera/include/utils.h b/src/libcamera/include/utils.h\nindex badc77533fa1..e467eb21c518 100644\n--- a/src/libcamera/include/utils.h\n+++ b/src/libcamera/include/utils.h\n@@ -32,13 +32,6 @@ namespace utils {\n \n const char *basename(const char *path);\n \n-/* C++11 doesn't provide std::make_unique */\n-template\n-std::unique_ptr make_unique(Args&&... args)\n-{\n-\treturn std::unique_ptr(new T(std::forward(args)...));\n-}\n-\n char *secure_getenv(const char *name);\n \n template\ndiff --git a/src/libcamera/ipa_manager.cpp b/src/libcamera/ipa_manager.cpp\nindex 90eef12dbaf5..92adc6c45015 100644\n--- a/src/libcamera/ipa_manager.cpp\n+++ b/src/libcamera/ipa_manager.cpp\n@@ -264,7 +264,7 @@ std::unique_ptr IPAManager::createIPA(PipelineHandler *pipe,\n \tif (!ctx)\n \t\treturn nullptr;\n \n-\treturn utils::make_unique(ctx);\n+\treturn std::make_unique(ctx);\n }\n \n } /* namespace libcamera */\ndiff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex 7894084a025e..8e8e370922ad 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -876,7 +876,7 @@ int PipelineHandlerIPU3::registerCameras()\n \tunsigned int numCameras = 0;\n \tfor (unsigned int id = 0; id < 4 && numCameras < 2; ++id) {\n \t\tstd::unique_ptr data =\n-\t\t\tutils::make_unique(this);\n+\t\t\tstd::make_unique(this);\n \t\tstd::set streams = {\n \t\t\t&data->outStream_,\n \t\t\t&data->vfStream_,\ndiff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex 389a99cf52bd..0b3dd9759387 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -388,9 +388,9 @@ void RkISP1CameraData::queueFrameAction(unsigned int frame,\n \tswitch (action.operation) {\n \tcase RKISP1_IPA_ACTION_V4L2_SET: {\n \t\tconst ControlList &controls = action.controls[0];\n-\t\ttimeline_.scheduleAction(utils::make_unique(frame,\n-\t\t\t\t\t\t\t\t\t\t sensor_,\n-\t\t\t\t\t\t\t\t\t\t controls));\n+\t\ttimeline_.scheduleAction(std::make_unique(frame,\n+\t\t\t\t\t\t\t\t\t\t sensor_,\n+\t\t\t\t\t\t\t\t\t\t controls));\n \t\tbreak;\n \t}\n \tcase RKISP1_IPA_ACTION_PARAM_FILLED: {\n@@ -846,9 +846,9 @@ int PipelineHandlerRkISP1::queueRequestDevice(Camera *camera,\n \top.controls = { request->controls() };\n \tdata->ipa_->processEvent(op);\n \n-\tdata->timeline_.scheduleAction(utils::make_unique(data->frame_,\n-\t\t\t\t\t\t\t\t\t\t data,\n-\t\t\t\t\t\t\t\t\t\t this));\n+\tdata->timeline_.scheduleAction(std::make_unique(data->frame_,\n+\t\t\t\t\t\t\t\t\t\t data,\n+\t\t\t\t\t\t\t\t\t\t this));\n \n \tdata->frame_++;\n \n@@ -892,7 +892,7 @@ int PipelineHandlerRkISP1::createCamera(MediaEntity *sensor)\n \tint ret;\n \n \tstd::unique_ptr data =\n-\t\tutils::make_unique(this);\n+\t\tstd::make_unique(this);\n \n \tControlInfoMap::Map ctrls;\n \tctrls.emplace(std::piecewise_construct,\ndiff --git a/src/libcamera/pipeline/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo.cpp\nindex 47916ffb4536..83093676ec73 100644\n--- a/src/libcamera/pipeline/uvcvideo.cpp\n+++ b/src/libcamera/pipeline/uvcvideo.cpp\n@@ -296,7 +296,7 @@ bool PipelineHandlerUVC::match(DeviceEnumerator *enumerator)\n \tif (!media)\n \t\treturn false;\n \n-\tstd::unique_ptr data = utils::make_unique(this);\n+\tstd::unique_ptr data = std::make_unique(this);\n \n \t/* Locate and initialise the camera data with the default video node. */\n \tconst std::vector &entities = media->entities();\ndiff --git a/src/libcamera/pipeline/vimc.cpp b/src/libcamera/pipeline/vimc.cpp\nindex 1700ac967299..c99560a45cfa 100644\n--- a/src/libcamera/pipeline/vimc.cpp\n+++ b/src/libcamera/pipeline/vimc.cpp\n@@ -365,7 +365,7 @@ bool PipelineHandlerVimc::match(DeviceEnumerator *enumerator)\n \tif (!media)\n \t\treturn false;\n \n-\tstd::unique_ptr data = utils::make_unique(this);\n+\tstd::unique_ptr data = std::make_unique(this);\n \n \tdata->ipa_ = IPAManager::instance()->createIPA(this, 0, 0);\n \tif (data->ipa_ == nullptr)\ndiff --git a/src/libcamera/proxy/worker/ipa_proxy_linux_worker.cpp b/src/libcamera/proxy/worker/ipa_proxy_linux_worker.cpp\nindex 07380c16e2d5..7d6287c7115b 100644\n--- a/src/libcamera/proxy/worker/ipa_proxy_linux_worker.cpp\n+++ b/src/libcamera/proxy/worker/ipa_proxy_linux_worker.cpp\n@@ -17,7 +17,6 @@\n #include \"ipc_unixsocket.h\"\n #include \"log.h\"\n #include \"thread.h\"\n-#include \"utils.h\"\n \n using namespace libcamera;\n \n@@ -58,7 +57,7 @@ int main(int argc, char **argv)\n \t\t<< \"Starting worker for IPA module \" << argv[1]\n \t\t<< \" with IPC fd = \" << fd;\n \n-\tstd::unique_ptr ipam = utils::make_unique(argv[1]);\n+\tstd::unique_ptr ipam = std::make_unique(argv[1]);\n \tif (!ipam->isValid() || !ipam->load()) {\n \t\tLOG(IPAProxyLinuxWorker, Error)\n \t\t\t<< \"IPAModule \" << argv[1] << \" should be valid but isn't\";\ndiff --git a/src/libcamera/utils.cpp b/src/libcamera/utils.cpp\nindex 5de9e4813353..4beffdab5eb6 100644\n--- a/src/libcamera/utils.cpp\n+++ b/src/libcamera/utils.cpp\n@@ -70,11 +70,6 @@ char *secure_getenv(const char *name)\n #endif\n }\n \n-/**\n- * \\fn libcamera::utils::make_unique(Args &&... args)\n- * \\brief Constructs an object of type T and wraps it in a std::unique_ptr.\n- */\n-\n /**\n * \\fn libcamera::utils::set_overlap(InputIt1 first1, InputIt1 last1,\n *\t\t\t\t InputIt2 first2, InputIt2 last2)\ndiff --git a/src/libcamera/v4l2_device.cpp b/src/libcamera/v4l2_device.cpp\nindex c13eddc84c7c..1698d2451449 100644\n--- a/src/libcamera/v4l2_device.cpp\n+++ b/src/libcamera/v4l2_device.cpp\n@@ -380,7 +380,7 @@ void V4L2Device::listControls()\n \t\t\tcontinue;\n \t\t}\n \n-\t\tcontrolIds_.emplace_back(utils::make_unique(ctrl));\n+\t\tcontrolIds_.emplace_back(std::make_unique(ctrl));\n \t\tctrls.emplace(controlIds_.back().get(), V4L2ControlRange(ctrl));\n \t}\n \ndiff --git a/src/libcamera/v4l2_videodevice.cpp b/src/libcamera/v4l2_videodevice.cpp\nindex 66adf7b29572..18220b81af21 100644\n--- a/src/libcamera/v4l2_videodevice.cpp\n+++ b/src/libcamera/v4l2_videodevice.cpp\n@@ -1054,7 +1054,7 @@ V4L2VideoDevice::createBuffer(const struct v4l2_buffer &buf)\n \t\tplanes.push_back(std::move(plane));\n \t}\n \n-\treturn utils::make_unique(std::move(planes));\n+\treturn std::make_unique(std::move(planes));\n }\n \n FileDescriptor V4L2VideoDevice::exportDmabufFd(unsigned int index,\ndiff --git a/src/v4l2/v4l2_camera.cpp b/src/v4l2/v4l2_camera.cpp\nindex 44cb4e7c551b..e7018b566475 100644\n--- a/src/v4l2/v4l2_camera.cpp\n+++ b/src/v4l2/v4l2_camera.cpp\n@@ -10,7 +10,6 @@\n #include \n \n #include \"log.h\"\n-#include \"utils.h\"\n \n using namespace libcamera;\n \n@@ -81,7 +80,7 @@ void V4L2Camera::requestComplete(Request *request)\n \tbufferLock_.lock();\n \tFrameBuffer *buffer = request->buffers().begin()->second;\n \tstd::unique_ptr metadata =\n-\t\tutils::make_unique(request->cookie(), buffer->metadata());\n+\t\tstd::make_unique(request->cookie(), buffer->metadata());\n \tcompletedBuffers_.push_back(std::move(metadata));\n \tbufferLock_.unlock();\n \ndiff --git a/src/v4l2/v4l2_camera_proxy.cpp b/src/v4l2/v4l2_camera_proxy.cpp\nindex 28e587226a97..3013a3d17568 100644\n--- a/src/v4l2/v4l2_camera_proxy.cpp\n+++ b/src/v4l2/v4l2_camera_proxy.cpp\n@@ -32,7 +32,7 @@ LOG_DECLARE_CATEGORY(V4L2Compat);\n V4L2CameraProxy::V4L2CameraProxy(unsigned int index,\n \t\t\t\t std::shared_ptr camera)\n \t: refcount_(0), index_(index), bufferCount_(0), currentBuf_(0),\n-\t vcam_(utils::make_unique(camera))\n+\t vcam_(std::make_unique(camera))\n {\n \tquerycap(camera);\n }\ndiff --git a/test/ipa/ipa_wrappers_test.cpp b/test/ipa/ipa_wrappers_test.cpp\nindex e711e4fe318d..1ae1781169c8 100644\n--- a/test/ipa/ipa_wrappers_test.cpp\n+++ b/test/ipa/ipa_wrappers_test.cpp\n@@ -18,7 +18,6 @@\n #include \"device_enumerator.h\"\n #include \"ipa_context_wrapper.h\"\n #include \"media_device.h\"\n-#include \"utils.h\"\n #include \"v4l2_subdevice.h\"\n \n #include \"test.h\"\n@@ -254,7 +253,7 @@ protected:\n \t\tif (ret)\n \t\t\treturn TestFail;\n \n-\t\tstd::unique_ptr intf = utils::make_unique();\n+\t\tstd::unique_ptr intf = std::make_unique();\n \t\twrapper_ = new IPAContextWrapper(new IPAInterfaceWrapper(std::move(intf)));\n \t\twrapper_->queueFrameAction.connect(this, &IPAWrappersTest::queueFrameAction);\n \ndiff --git a/test/message.cpp b/test/message.cpp\nindex 7ebedb557502..478bc79dffa6 100644\n--- a/test/message.cpp\n+++ b/test/message.cpp\n@@ -12,7 +12,6 @@\n #include \"message.h\"\n #include \"thread.h\"\n #include \"test.h\"\n-#include \"utils.h\"\n \n using namespace std;\n using namespace libcamera;\n@@ -92,7 +91,7 @@ protected:\n \n \t\tthread_.start();\n \n-\t\treceiver.postMessage(utils::make_unique(Message::None));\n+\t\treceiver.postMessage(std::make_unique(Message::None));\n \n \t\tthis_thread::sleep_for(chrono::milliseconds(100));\n \n@@ -114,7 +113,7 @@ protected:\n \t\t */\n \t\tSlowMessageReceiver *slowReceiver = new SlowMessageReceiver();\n \t\tslowReceiver->moveToThread(&thread_);\n-\t\tslowReceiver->postMessage(utils::make_unique(Message::None));\n+\t\tslowReceiver->postMessage(std::make_unique(Message::None));\n \n \t\tthis_thread::sleep_for(chrono::milliseconds(10));\n \n","prefixes":["libcamera-devel","2/2"]}