Codechange: Unconditionally use static_assert
We're well past having to support non-C++11 compliant compilers now.
This commit is contained in:
		
				
					committed by
					
						
						Charles Pigott
					
				
			
			
				
	
			
			
			
						parent
						
							52f3abba6e
						
					
				
				
					commit
					eb74179c6d
				
			
							
								
								
									
										10
									
								
								src/stdafx.h
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								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);
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user