| Message ID | 20200609211110.13440-1-laurent.pinchart@ideasonboard.com |
|---|---|
| State | Accepted |
| Commit | 7a88b212e0107299b277dae8657476bc8d5d2b0f |
| Headers | show |
| Series |
|
| Related | show |
Hi Laurent, On Wed, Jun 10, 2020 at 12:11:10AM +0300, Laurent Pinchart wrote: > 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<unsigned int, unsigned int> CameraDevice::calculateStaticMetadataSize()’: > ../../src/android/camera_device.cpp:391:32: error: converting to ‘std::tuple<unsigned int, unsigned int>’ from initializer list would use explicit constructor ‘constexpr std::tuple<_T1, _T2>::tuple(_U1&&, _U2&&) [with _U1 = unsigned int&; _U2 = unsigned int&; <template-parameter-2-3> = 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 <laurent.pinchart@ideasonboard.com> Thanks for catching this Acked-by: Jacopo Mondi <jacopo@jmondi.org> Thanks j > --- > src/android/camera_device.cpp | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp > index 7a0dc530e35b..c56e2355f778 100644 > --- a/src/android/camera_device.cpp > +++ b/src/android/camera_device.cpp > @@ -388,7 +388,7 @@ std::tuple<uint32_t, uint32_t> CameraDevice::calculateStaticMetadataSize() > */ > byteSize += streamConfigurations_.size() * 52; > > - return { numEntries, byteSize }; > + return std::make_tuple(numEntries, byteSize); > } > > /* > -- > Regards, > > Laurent Pinchart > > _______________________________________________ > libcamera-devel mailing list > libcamera-devel@lists.libcamera.org > https://lists.libcamera.org/listinfo/libcamera-devel
Hi Laurent, Thanks for your work. On 2020-06-10 00:11:10 +0300, Laurent Pinchart wrote: > 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<unsigned int, unsigned int> CameraDevice::calculateStaticMetadataSize()’: > ../../src/android/camera_device.cpp:391:32: error: converting to ‘std::tuple<unsigned int, unsigned int>’ from initializer list would use explicit constructor ‘constexpr std::tuple<_T1, _T2>::tuple(_U1&&, _U2&&) [with _U1 = unsigned int&; _U2 = unsigned int&; <template-parameter-2-3> = 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 <laurent.pinchart@ideasonboard.com> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> > --- > src/android/camera_device.cpp | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp > index 7a0dc530e35b..c56e2355f778 100644 > --- a/src/android/camera_device.cpp > +++ b/src/android/camera_device.cpp > @@ -388,7 +388,7 @@ std::tuple<uint32_t, uint32_t> CameraDevice::calculateStaticMetadataSize() > */ > byteSize += streamConfigurations_.size() * 52; > > - return { numEntries, byteSize }; > + return std::make_tuple(numEntries, byteSize); > } > > /* > -- > Regards, > > Laurent Pinchart > > _______________________________________________ > libcamera-devel mailing list > libcamera-devel@lists.libcamera.org > https://lists.libcamera.org/listinfo/libcamera-devel
diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index 7a0dc530e35b..c56e2355f778 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -388,7 +388,7 @@ std::tuple<uint32_t, uint32_t> CameraDevice::calculateStaticMetadataSize() */ byteSize += streamConfigurations_.size() * 52; - return { numEntries, byteSize }; + return std::make_tuple(numEntries, byteSize); } /*
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<unsigned int, unsigned int> CameraDevice::calculateStaticMetadataSize()’: ../../src/android/camera_device.cpp:391:32: error: converting to ‘std::tuple<unsigned int, unsigned int>’ from initializer list would use explicit constructor ‘constexpr std::tuple<_T1, _T2>::tuple(_U1&&, _U2&&) [with _U1 = unsigned int&; _U2 = unsigned int&; <template-parameter-2-3> = 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 <laurent.pinchart@ideasonboard.com> --- src/android/camera_device.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)