From acf18e4265dec2991e62f7c8baecfacf1a6708b3 Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Tue, 14 Jan 2020 01:35:22 +0200
Subject: libcamera: Switch from utils::make_unique to std::make_unique
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 src/ipa/ipa_vimc.cpp                     | 3 +--
 src/ipa/libipa/ipa_interface_wrapper.cpp | 2 +-
 src/ipa/rkisp1/rkisp1.cpp                | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/ipa')

diff --git a/src/ipa/ipa_vimc.cpp b/src/ipa/ipa_vimc.cpp
index 8f03e811..4751ad91 100644
--- a/src/ipa/ipa_vimc.cpp
+++ b/src/ipa/ipa_vimc.cpp
@@ -20,7 +20,6 @@
 #include "libipa/ipa_interface_wrapper.h"
 
 #include "log.h"
-#include "utils.h"
 
 namespace libcamera {
 
@@ -113,7 +112,7 @@ const struct IPAModuleInfo ipaModuleInfo = {
 
 struct ipa_context *ipaCreate()
 {
-	return new IPAInterfaceWrapper(utils::make_unique<IPAVimc>());
+	return new IPAInterfaceWrapper(std::make_unique<IPAVimc>());
 }
 }
 
diff --git a/src/ipa/libipa/ipa_interface_wrapper.cpp b/src/ipa/libipa/ipa_interface_wrapper.cpp
index 3628a785..b93c1c1f 100644
--- a/src/ipa/libipa/ipa_interface_wrapper.cpp
+++ b/src/ipa/libipa/ipa_interface_wrapper.cpp
@@ -45,7 +45,7 @@ namespace libcamera {
  *
  * struct ipa_context *ipaCreate()
  * {
- * 	return new IPAInterfaceWrapper(utils::make_unique<MyIPA>());
+ * 	return new IPAInterfaceWrapper(std::make_unique<MyIPA>());
  * }
  * \endcode
  *
diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp
index a8dd1645..438b3c66 100644
--- a/src/ipa/rkisp1/rkisp1.cpp
+++ b/src/ipa/rkisp1/rkisp1.cpp
@@ -278,7 +278,7 @@ const struct IPAModuleInfo ipaModuleInfo = {
 
 struct ipa_context *ipaCreate()
 {
-	return new IPAInterfaceWrapper(utils::make_unique<IPARkISP1>());
+	return new IPAInterfaceWrapper(std::make_unique<IPARkISP1>());
 }
 }
 
-- 
cgit v1.2.1