Merge pull request #15037 from hugolm84:noop-noexcept-for-vs13

5 years ago · f5e01f7b49
parent c9fcc12e3b 245c256b1c
commit f5e01f7b49
1 changed files with 1 additions and 1 deletions
--- a/modules/core/include/opencv2/core/cvdef.h
+++ b/modules/core/include/opencv2/core/cvdef.h
@ -627,7 +627,7 @@ Cv64suf;
 \****************************************************************************************/

 #ifndef CV_NOEXCEPT
-#  ifdef CV_CXX11
+#  if defined(CV_CXX11) && (!defined(_MSC_VER) || _MSC_VER > 1800) /* MSVC 2015 and above */
 #    define CV_NOEXCEPT noexcept
 #  endif
 #endif