From eb74179c6d66921d2946e4a93e41a5de0af4a4ac Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Mon, 5 Sep 2016 01:15:09 +0100 Subject: Codechange: Unconditionally use static_assert We're well past having to support non-C++11 compliant compilers now. --- src/stdafx.h | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'src') diff --git a/src/stdafx.h b/src/stdafx.h index 5b9281a28..9b9f4c6a9 100644 --- a/src/stdafx.h +++ b/src/stdafx.h @@ -348,15 +348,7 @@ typedef unsigned char byte; # define PERSONAL_DIR "" #endif -/* Compile time assertions. Prefer c++0x static_assert(). */ -#if __cplusplus >= 201103L || (defined(_MSC_VER) && _MSC_VER >= 1600) -# define assert_compile(expr) static_assert(expr, #expr ) -#elif defined(__OS2__) - /* Disabled for OS/2 */ -# define assert_compile(expr) -#else -# define assert_compile(expr) typedef int __ct_assert__[1 - 2 * !(expr)] -#endif +#define assert_compile(expr) static_assert(expr, #expr) /* Check if the types have the bitsizes like we are using them */ assert_compile(sizeof(uint64) == 8); -- cgit v1.2.3-54-g00ecf