fixup! Some changes to support mingw-w64

This commit is contained in:
Maksim Shabunin 2015-09-01 13:49:23 +03:00
parent e009d79cc8
commit 8c65f8a0d1

View File

@ -271,7 +271,7 @@ enum BorderTypes {
# endif # endif
#endif #endif
#ifndef CV_StaticAssert #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()); }) # define CV_StaticAssert(condition, reason) ({ extern int __attribute__((error("CV_StaticAssert: " reason " " #condition))) CV_StaticAssert(); ((condition) ? 0 : CV_StaticAssert()); })
# else # else
template <bool x> struct CV_StaticAssert_failed; template <bool x> struct CV_StaticAssert_failed;