commit 668396d93a4c65745c5700e51b605a6abe2a1903 parent 0d8a80c42aa5fdc87e6ef98f128e86f4164697fc Author: Michael Savage <mikejsavage@gmail.com> Date: Sun Nov 13 22:50:26 +0200 Really fix STATIC_ASSERT... Diffstat:
intrinsics.h | | | 6 | +++--- |
diff --git a/intrinsics.h b/intrinsics.h @@ -118,10 +118,10 @@ inline void mike_assert( const bool predicate, const char * message ) { #define assert( predicate ) mike_assert( predicate, "\x1b[1;31massertion failed at " __FILE__ " line " STRINGIFY( __LINE__ ) ": \x1b[0;1m" #predicate "\x1b[0m" ) #define ASSERT assert -#if __cplusplus < 201103L -#define STATIC_ASSERT( p ) static int CONCAT( STATIC_ASSERT, __COUNTER__ )[ int( p ) - 1 ] -#elif COMPILER_MSVC +#if COMPILER_MSVC #define STATIC_ASSERT( p ) static_assert( p, #p ) +#elif __cplusplus < 201103L +#define STATIC_ASSERT( p ) static int CONCAT( STATIC_ASSERT, __COUNTER__ )[ int( p ) - 1 ] #else #define STATIC_ASSERT( p ) static_assert( p ) #endif