From dd6b82d6b200b48f8e39aa1923ec7ba260c7e87f Mon Sep 17 00:00:00 2001 From: Charles Pigott Date: Wed, 11 Apr 2018 12:36:45 +0100 Subject: Codechange: Simplify C++11 check for assert_compile --- src/stdafx.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/stdafx.h') diff --git a/src/stdafx.h b/src/stdafx.h index 237ead346..6c59d7f20 100644 --- a/src/stdafx.h +++ b/src/stdafx.h @@ -383,8 +383,7 @@ typedef unsigned char byte; /* Compile time assertions. Prefer c++0x static_assert(). * Older compilers cannot evaluate some expressions at compile time, * typically when templates are involved, try assert_tcompile() in those cases. */ -#if defined(__STDCXX_VERSION__) || defined(__GXX_EXPERIMENTAL_CXX0X__) || defined(__GXX_EXPERIMENTAL_CPP0X__) || defined(static_assert) || (defined(_MSC_VER) && _MSC_VER >= 1600) - /* __STDCXX_VERSION__ is c++0x feature macro, __GXX_EXPERIMENTAL_CXX0X__ is used by gcc, __GXX_EXPERIMENTAL_CPP0X__ by icc */ +#if __cplusplus >= 201103L || (defined(_MSC_VER) && _MSC_VER >= 1600) #define assert_compile(expr) static_assert(expr, #expr ) #define assert_tcompile(expr) assert_compile(expr) #elif defined(__OS2__) -- cgit v1.2.3-54-g00ecf