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

f5e01f7b · Alexander Alekhin · c9fcc12e · 245c256b · f5e01f7b
Commit f5e01f7b authored Jul 16, 2019 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

cvdef.h modules/core/include/opencv2/core/cvdef.h +1 -1

No files found.
--- 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