Skip to content

O
opencv
Commit 8c65f8a0 authored by Maksim Shabunin's avatar Maksim Shabunin
Browse files
Options

fixup! Some changes to support mingw-w64

parent e009d79c
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
modules/core/include/opencv2/core/base.hpp
View file @ 8c65f8a0
...@@ -271,7 +271,7 @@ enum BorderTypes { ...@@ -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;
......
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