From 8518d078d75a1edbf7046c584f2429d5b1d24aed Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Tue, 19 Mar 2019 13:02:22 +0300 Subject: [PATCH] core: fix fallback CV_CONSTEXPR definition keep it empty to avoid failures of these declarations: static CV_CONSTEXPR const int var = ...; --- 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 0e2c66b1f1..caa4a9e4c7 100644 --- a/modules/core/include/opencv2/core/cvdef.h +++ b/modules/core/include/opencv2/core/cvdef.h @@ -691,7 +691,7 @@ __CV_ENUM_FLAGS_BITWISE_XOR_EQ (EnumType, EnumType) # endif #endif #ifndef CV_CONSTEXPR -# define CV_CONSTEXPR const +# define CV_CONSTEXPR #endif // Integer types portatibility