Merge pull request #18981 from anton-potapov:fix_gnet_package_compilation_std_17

pull/18977/head
Alexander Alekhin 4 years ago
commit ef0eed8d3c
  1. 4
      modules/gapi/include/opencv2/gapi/infer.hpp
  2. 4
      modules/gapi/src/api/ginfer.cpp

@ -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<GNetParam> &&ii);
GAPI_WRAP GNetPackage() = default;
explicit GNetPackage(std::initializer_list<GNetParam> ii);
std::vector<GBackend> backends() const;
std::vector<GNetParam> networks;
};

@ -16,8 +16,8 @@
#include <opencv2/gapi/infer.hpp>
cv::gapi::GNetPackage::GNetPackage(std::initializer_list<GNetParam> &&ii)
: networks(std::move(ii)) {
cv::gapi::GNetPackage::GNetPackage(std::initializer_list<GNetParam> ii)
: networks(ii) {
}
std::vector<cv::gapi::GBackend> cv::gapi::GNetPackage::backends() const {

Loading…
Cancel
Save