Skip to content

O
opencv
Commit cedd78d5 authored by Alexander Alekhin's avatar Alexander Alekhin
Browse files
Options

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

parents 5f88bbe3 41da3ef1
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
modules/core/include/opencv2/core/cvdef.h
View file @ cedd78d5
...@@ -565,7 +565,7 @@ Cv64suf; ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment