Merge pull request #14142 from mshabunin:fix-c-api-3.4

cedd78d5 · Alexander Alekhin · 5f88bbe3 · 41da3ef1 · cedd78d5
Commit cedd78d5 authored Mar 25, 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
@@ -565,7 +565,7 @@ Cv64suf;
 \****************************************************************************************/

 #ifndef CV_CXX_STD_ARRAY
-#  if __cplusplus >= 201103L || (defined(_MSC_VER) && _MSC_VER >= 1900/*MSVS 2015*/)
+#  if __cplusplus >= 201103L || (defined(__cplusplus) && defined(_MSC_VER) && _MSC_VER >= 1900/*MSVS 2015*/)
 #    define CV_CXX_STD_ARRAY 1
 #    include <array>
 #  endif