Merge pull request #14878 from JoeHowse:4.1.0-patches

6 years ago · b58b2c5ae8
parent de60600126 729848caeb
commit b58b2c5ae8
1 changed files with 5 additions and 0 deletions
--- 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