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

pull/14158/head
Alexander Alekhin 6 years ago
commit cedd78d526
  1. 2
      modules/core/include/opencv2/core/cvdef.h

@ -565,7 +565,7 @@ Cv64suf;
\****************************************************************************************/ \****************************************************************************************/
#ifndef CV_CXX_STD_ARRAY #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 # define CV_CXX_STD_ARRAY 1
# include <array> # include <array>
# endif # endif

Loading…
Cancel
Save