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/libcamera/device_enumerator.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/libcamera/device_enumerator.cpp')

diff --git a/src/libcamera/device_enumerator.cpp b/src/libcamera/device_enumerator.cpp
index 0b596bce..a8b5c90f 100644
--- a/src/libcamera/device_enumerator.cpp
+++ b/src/libcamera/device_enumerator.cpp
@@ -13,7 +13,6 @@
 
 #include "log.h"
 #include "media_device.h"
-#include "utils.h"
 
 /**
  * \file device_enumerator.h
@@ -145,7 +144,7 @@ std::unique_ptr<DeviceEnumerator> DeviceEnumerator::create()
 	std::unique_ptr<DeviceEnumerator> enumerator;
 
 #ifdef HAVE_LIBUDEV
-	enumerator = utils::make_unique<DeviceEnumeratorUdev>();
+	enumerator = std::make_unique<DeviceEnumeratorUdev>();
 	if (!enumerator->init())
 		return enumerator;
 #endif
@@ -154,7 +153,7 @@ std::unique_ptr<DeviceEnumerator> DeviceEnumerator::create()
 	 * Either udev is not available or udev initialization failed. Fall back
 	 * on the sysfs enumerator.
 	 */
-	enumerator = utils::make_unique<DeviceEnumeratorSysfs>();
+	enumerator = std::make_unique<DeviceEnumeratorSysfs>();
 	if (!enumerator->init())
 		return enumerator;
 
-- 
cgit v1.2.1