From 446f3448180075cfbb8227644352ad9c3e573caf Mon Sep 17 00:00:00 2001 From: Anton Potapov Date: Tue, 1 Dec 2020 09:34:53 +0300 Subject: [PATCH] GAPI: fix C++17 compilation errors in GNetPackage (fixes #17385) MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit - explicitly declared default constructor - made initilizer_list  constructor to accept the list by copy    -- as it is  more canonical (and as copying the initializer_list does not force copy of the list items)    -- current version anyway does not do what it is intended to --- modules/gapi/include/opencv2/gapi/infer.hpp | 4 ++-- modules/gapi/src/api/ginfer.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/gapi/include/opencv2/gapi/infer.hpp b/modules/gapi/include/opencv2/gapi/infer.hpp index b850775..f20f638 100644 --- a/modules/gapi/include/opencv2/gapi/infer.hpp +++ b/modules/gapi/include/opencv2/gapi/infer.hpp @@ -418,8 +418,8 @@ struct GAPI_EXPORTS GNetParam { * @sa cv::gapi::networks */ struct GAPI_EXPORTS_W_SIMPLE GNetPackage { - GAPI_WRAP GNetPackage() : GNetPackage({}) {} - explicit GNetPackage(std::initializer_list &&ii); + GAPI_WRAP GNetPackage() = default; + explicit GNetPackage(std::initializer_list ii); std::vector backends() const; std::vector networks; }; diff --git a/modules/gapi/src/api/ginfer.cpp b/modules/gapi/src/api/ginfer.cpp index 156f893..f4bd1c3 100644 --- a/modules/gapi/src/api/ginfer.cpp +++ b/modules/gapi/src/api/ginfer.cpp @@ -16,8 +16,8 @@ #include -cv::gapi::GNetPackage::GNetPackage(std::initializer_list &&ii) - : networks(std::move(ii)) { +cv::gapi::GNetPackage::GNetPackage(std::initializer_list ii) + : networks(ii) { } std::vector cv::gapi::GNetPackage::backends() const { -- 2.7.4