mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codechange: Simplify C++11 check for assert_compile

pull/6701/head
Charles Pigott 2018-04-11 12:36:45 +01:00 committed by frosch
parent e61435774b
commit dd6b82d6b2
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/stdafx.h
View File

@ -383,8 +383,7 @@ typedef unsigned char byte;
/* Compile time assertions. Prefer c++0x static_assert(). /* Compile time assertions. Prefer c++0x static_assert().
* Older compilers cannot evaluate some expressions at compile time, * Older compilers cannot evaluate some expressions at compile time,
* typically when templates are involved, try assert_tcompile() in those cases. */ * 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) #if __cplusplus >= 201103L || (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 */
#define assert_compile(expr) static_assert(expr, #expr ) #define assert_compile(expr) static_assert(expr, #expr )
#define assert_tcompile(expr) assert_compile(expr) #define assert_tcompile(expr) assert_compile(expr)
#elif defined(__OS2__) #elif defined(__OS2__)