cpp/openttd-patchpack/source Changeset - r12961:665d27a1e509

Changeset - r12961:665d27a1e509

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

smatz - 15 years ago 2009-09-07 21:02:10
smatz@openttd.org

(svn r17465) -Codechange: use builtin static_assert() for assert_compile() if available

1 file changed with 7 insertions and 3 deletions:

src/stdafx.h

0 comments (0 inline, 0 general)

src/stdafx.h

➞

Show inline comments

@@ @@ -301,12 +301,16 @@ typedef unsigned char byte; @@
 	#define PERSONAL_DIR ""
 #endif
 /* Compile time assertions, disabled for OS/2 or GCC < 3.4 (GCC < 3 isn't supported anymore) */
 #if defined(__OS2__) || (defined(__GNUC__) && __GNUC__ == 3 && __GNUC_MINOR__ < 4)
 /* Compile time assertions. Prefer c++0x static_assert() */
 #if defined(__STDCXX_VERSION__) || defined(__GXX_EXPERIMENTAL_CXX0X__) || defined(__GXX_EXPERIMENTAL_CPP0X__) || defined(static_assert)
 	/* __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 )
 #elif defined(__OS2__) || (defined(__GNUC__) && __GNUC__ == 3 && __GNUC_MINOR__ < 4)
 	/* Disabled for OS/2 or GCC < 3.4 (GCC < 3 isn't supported anymore) */
 	#define assert_compile(expr)
 #else
 	#define assert_compile(expr) extern const int __ct_assert__[1 - 2 * !(expr)] UNUSED
-#endif /* __OS2__ */
 #endif
 /* Check if the types have the bitsizes like we are using them */
 assert_compile(sizeof(uint64) == 8);

0 comments (0 inline, 0 general)