From 212f410c7c5cdacd18141d9b9234272fb55396d2 Mon Sep 17 00:00:00 2001 From: Hirokazu Honda Date: Wed, 24 Mar 2021 16:07:50 +0900 Subject: android: CameraHalManager: Hold CameraDevice with std::unique_ptr CameraDevice is owned by CameraHalManager. The ownership of the object is not shared with other classes. So CameraHalManager should manage CameraDevice with std::unique_ptr. Signed-off-by: Hirokazu Honda Reviewed-by: Laurent Pinchart Signed-off-by: Laurent Pinchart --- src/android/camera_device.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/android/camera_device.cpp') diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index 72a89258..d0955de7 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -350,11 +350,10 @@ CameraDevice::~CameraDevice() delete it.second; } -std::shared_ptr CameraDevice::create(unsigned int id, +std::unique_ptr CameraDevice::create(unsigned int id, const std::shared_ptr &cam) { - CameraDevice *camera = new CameraDevice(id, cam); - return std::shared_ptr(camera); + return std::unique_ptr(new CameraDevice(id, cam)); } /* -- cgit v1.2.1