Merge pull request #14878 from JoeHowse:4.1.0-patches

b58b2c5a · Alexander Alekhin · de606001 · 729848ca · b58b2c5a
Commit b58b2c5a authored Jun 24, 2019 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

cvstd_wrapper.hpp modules/core/include/opencv2/core/cvstd_wrapper.hpp +5 -0

No files found.
--- a/modules/core/include/opencv2/core/cvstd_wrapper.hpp
+++ b/modules/core/include/opencv2/core/cvstd_wrapper.hpp
@@ -49,7 +49,12 @@ private:
    typedef decltype(check<C>(0)) type;

 public:
+#if __cplusplus >= 201103L || (defined(_MSC_VER) && _MSC_VER >= 1900/*MSVS 2015*/)
    static CV_CONSTEXPR bool value = type::value;
+#else
+    // support MSVS 2013
+    static const int value = type::value;
+#endif
 };
 } // namespace sfinae