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 /src/libcamera/device_enumerator.cpp | |
| 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 'src/libcamera/device_enumerator.cpp')
| -rw-r--r-- | src/libcamera/device_enumerator.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
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; |