From 41da3ef1d2ee8022368e0ef963104405a48ab8c3 Mon Sep 17 00:00:00 2001 From: Maksim Shabunin Date: Mon, 25 Mar 2019 16:44:08 +0300 Subject: [PATCH] Fixed cvdef.h for MSVC C users --- modules/core/include/opencv2/core/cvdef.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/include/opencv2/core/cvdef.h b/modules/core/include/opencv2/core/cvdef.h index deb08fa003..be7da7a4f6 100644 --- 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 # endif