From 8c65f8a0d15cf89faf92c5f3682ec3b49e338835 Mon Sep 17 00:00:00 2001 From: Maksim Shabunin Date: Tue, 1 Sep 2015 13:49:23 +0300 Subject: [PATCH] fixup! Some changes to support mingw-w64 --- modules/core/include/opencv2/core/base.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/include/opencv2/core/base.hpp b/modules/core/include/opencv2/core/base.hpp index 262ce911a..95142c513 100644 --- a/modules/core/include/opencv2/core/base.hpp +++ b/modules/core/include/opencv2/core/base.hpp @@ -271,7 +271,7 @@ enum BorderTypes { # endif #endif #ifndef CV_StaticAssert -# if defined(__GNUC__) && (__GNUC__*100 + __GNUC_MINOR__ > 302) +# if !defined(__clang__) && defined(__GNUC__) && (__GNUC__*100 + __GNUC_MINOR__ > 302) # define CV_StaticAssert(condition, reason) ({ extern int __attribute__((error("CV_StaticAssert: " reason " " #condition))) CV_StaticAssert(); ((condition) ? 0 : CV_StaticAssert()); }) # else template struct CV_StaticAssert_failed;