diff --git a/modules/gapi/include/opencv2/gapi/util/any.hpp b/modules/gapi/include/opencv2/gapi/util/any.hpp index 94451c7717..9f0a5618ac 100644 --- a/modules/gapi/include/opencv2/gapi/util/any.hpp +++ b/modules/gapi/include/opencv2/gapi/util/any.hpp @@ -17,6 +17,7 @@ #if defined(_MSC_VER) // disable MSVC warning on "multiple copy constructors specified" + #pragma warning(push) # pragma warning(disable: 4521) #endif @@ -184,7 +185,7 @@ namespace util #if defined(_MSC_VER) // Enable "multiple copy constructors specified" back -# pragma warning(default: 4521) +# pragma warning(pop) #endif #endif // OPENCV_GAPI_UTIL_ANY_HPP diff --git a/modules/gapi/src/streaming/queue_source.cpp b/modules/gapi/src/streaming/queue_source.cpp index 59fde09c44..d81aaf43b4 100644 --- a/modules/gapi/src/streaming/queue_source.cpp +++ b/modules/gapi/src/streaming/queue_source.cpp @@ -67,7 +67,7 @@ cv::GMetaArg QueueSourceBase::descr_of() const { QueueInput::QueueInput(const cv::GMetaArgs &args) { for (auto &&m : args) { - m_sources.emplace_back(new cv::gapi::wip::QueueSourceBase(m)); + m_sources.emplace_back(std::make_shared(m)); } } diff --git a/modules/gapi/test/gapi_async_test.cpp b/modules/gapi/test/gapi_async_test.cpp index 7086f47c5c..e510526def 100644 --- a/modules/gapi/test/gapi_async_test.cpp +++ b/modules/gapi/test/gapi_async_test.cpp @@ -359,7 +359,7 @@ TYPED_TEST_CASE_P(cancel); TYPED_TEST_P(cancel, basic) { -#if defined(__GNUC__) && __GNUC__ >= 11 +#if defined(__GNUC__) && __GNUC__ == 11 // std::vector requests can't handle type with ctor parameter (SelfCanceling) FAIL() << "Test code is not available due to compilation error with GCC 11"; #else