Merge pull request #14878 from JoeHowse:4.1.0-patches

This commit is contained in:
Alexander Alekhin 2019-06-24 18:29:29 +00:00
commit b58b2c5ae8

View File

@ -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