From 7a88b212e0107299b277dae8657476bc8d5d2b0f Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Wed, 10 Jun 2020 00:07:59 +0300 Subject: android: camera_device: Use std::make_tuple() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Until N4387 (https://wg21.link/N4387, applied as a defect report for C++11), a function could not return a tuple using copy-list-initialization. This affects gcc-5 that was released before N4387 was integrated, and causes a compilation error: ../../src/android/camera_device.cpp: In member function ‘std::tuple CameraDevice::calculateStaticMetadataSize()’: ../../src/android/camera_device.cpp:391:32: error: converting to ‘std::tuple’ from initializer list would use explicit constructor ‘constexpr std::tuple<_T1, _T2>::tuple(_U1&&, _U2&&) [with _U1 = unsigned int&; _U2 = unsigned int&; = void; _T1 = unsigned int; _T2 = unsigned int]’ return { numEntries, byteSize }; Fix it by using std::make_tuple(). Fixes: a80d38109f65 ("android: camera_device: Calculate metadata size") Signed-off-by: Laurent Pinchart Acked-by: Jacopo Mondi Reviewed-by: Niklas Söderlund --- src/android/camera_device.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/android') diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index 7a0dc530..c56e2355 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -388,7 +388,7 @@ std::tuple CameraDevice::calculateStaticMetadataSize() */ byteSize += streamConfigurations_.size() * 52; - return { numEntries, byteSize }; + return std::make_tuple(numEntries, byteSize); } /* -- cgit v1.2.1