Replaced static_assert with COMPILE_ASSERT

Author: twist84

game/common/havok/hkArray.hpp

@@ -8,7 +8,7 @@ struct hkArrayBase
 	int m_size;
 	unsigned int m_capacityAndFlags;
 };
-static_assert(sizeof(hkArrayBase<void*>) == 0xC);
+COMPILE_ASSERT(sizeof(hkArrayBase<void*>) == 0xC);
 
 template <typename t_type, typename t_allocator = void>
 struct hkArray :
@@ -21,7 +21,7 @@ struct hkArray :
 	//const t_type& operator[](int i) const;
 	t_type& operator[](int i);
 };
-static_assert(sizeof(hkArray<void*>) == 0xC);
+COMPILE_ASSERT(sizeof(hkArray<void*>) == 0xC);
 
 template <typename t_type, int t_count, typename t_allocator = void>
 struct hkInplaceArray :

game/common/havok/hkMath.hpp

@@ -11,32 +11,32 @@ struct hkVector4
 {
 	__m128 m_quad;
 };
-static_assert(sizeof(hkVector4) == 0x10);
+COMPILE_ASSERT(sizeof(hkVector4) == 0x10);
 
 struct hkQuaternion
 {
 	hkVector4 vector;
 };
-static_assert(sizeof(hkQuaternion) == 0x10);
+COMPILE_ASSERT(sizeof(hkQuaternion) == 0x10);
 
 struct hkMatrix3
 {
 	hkVector4 forward;
 	hkVector4 left;
 	hkVector4 up;
 };
-static_assert(sizeof(hkMatrix3) == 0x30);
+COMPILE_ASSERT(sizeof(hkMatrix3) == 0x30);
 
 struct hkRotation
 {
 	hkMatrix3 matrix;
 };
-static_assert(sizeof(hkRotation) == 0x30);
+COMPILE_ASSERT(sizeof(hkRotation) == 0x30);
 
 struct hkTransform
 {
 	hkRotation rotation;
 	hkVector4 translation;
 };
-static_assert(sizeof(hkTransform) == 0x40);
+COMPILE_ASSERT(sizeof(hkTransform) == 0x40);
 

game/common/havok/hkMonitor.hpp

@@ -10,5 +10,5 @@ struct hkMonitorStream
 	hkPadSpu<char*> m_capacityMinus16;
 	hkBool m_isBufferAllocatedOnTheHeap;
 };
-static_assert(sizeof(hkMonitorStream) == 0x14);
+COMPILE_ASSERT(sizeof(hkMonitorStream) == 0x14);
 

game/common/havok/hkThread.hpp

@@ -21,20 +21,20 @@ struct hkThreadMemory
 		char* m_base;
 		char* m_end;
 	};
-	static_assert(sizeof(Stack) == 0x10);
+	COMPILE_ASSERT(sizeof(Stack) == 0x10);
 
 	struct FreeList
 	{
 		struct FreeElem
 		{
 			FreeElem* m_next;
 		};
-		static_assert(sizeof(FreeElem) == 0x4);
+		COMPILE_ASSERT(sizeof(FreeElem) == 0x4);
 
 		FreeElem* m_head;
 		int m_numElem;
 	};
-	static_assert(sizeof(FreeList) == 0x8);
+	COMPILE_ASSERT(sizeof(FreeList) == 0x8);
 
 	byte __data4[0xC];
 	hkMemory* m_memory;
@@ -48,4 +48,4 @@ struct hkThreadMemory
 	char m_small_size_to_row_lut[512 + 1];
 	int m_large_size_to_row_lut[10];
 };
-static_assert(sizeof(hkThreadMemory) == 0x330);
+COMPILE_ASSERT(sizeof(hkThreadMemory) == 0x330);

game/common/havok/hkWorld.hpp

@@ -7,7 +7,7 @@ struct osTIMER
 	int start;
 	int time;
 };
-static_assert(sizeof(osTIMER) == 0x8);
+COMPILE_ASSERT(sizeof(osTIMER) == 0x8);
 
 enum FIO_OPEN
 {
@@ -46,7 +46,7 @@ struct osASYNC_INFO
 	int holdSignal;
 	byte data[0x4A];
 };
-static_assert(sizeof(osASYNC_INFO) == 0x60);
+COMPILE_ASSERT(sizeof(osASYNC_INFO) == 0x60);
 
 struct fioCHUNK_DESCR;
 struct fioFILE_BUFFER;
@@ -81,7 +81,7 @@ struct fioFILE
 	int random_seed;
 	dsFLAGS<FIO_OPEN, int> state;
 };
-static_assert(sizeof(fioFILE) == 0x24);
+COMPILE_ASSERT(sizeof(fioFILE) == 0x24);
 
 struct fioFILE_DISK :
 	public fioFILE
@@ -95,7 +95,7 @@ struct fioFILE_DISK :
 	int bufSize;
 	int bufSizeMax;
 };
-static_assert(sizeof(fioFILE_DISK) == 0x348);
+COMPILE_ASSERT(sizeof(fioFILE_DISK) == 0x348);
 
 struct fioFILE_MEM :
 	public fioFILE
@@ -108,4 +108,4 @@ struct fioFILE_MEM :
 	osASYNC_FILE_HANDLE_DUMMY* fpAsync;
 	osASYNC_INFO fpAsyncInfo;
 };
-static_assert(sizeof(fioFILE_MEM) == 0x9C);
+COMPILE_ASSERT(sizeof(fioFILE_MEM) == 0x9C);

game/common/incl.sys/fileio/fileio.hpp

@@ -36,7 +36,7 @@ struct FMOD_REVERB_PROPERTIES
 	float Density;
 	unsigned int Flags;
 };
-static_assert(sizeof(FMOD_REVERB_PROPERTIES) == 0x7C);
+COMPILE_ASSERT(sizeof(FMOD_REVERB_PROPERTIES) == 0x7C);
 
 struct HALO_CHANNEL;
 
@@ -107,7 +107,7 @@ struct HALO_SOUND_SYSTEM
 	byte __data80[0x12C];
 	byte __data1AC[0x58];
 };
-static_assert(sizeof(HALO_SOUND_SYSTEM) == 0x204);
+COMPILE_ASSERT(sizeof(HALO_SOUND_SYSTEM) == 0x204);
 
 namespace FMOD
 {
@@ -197,7 +197,7 @@ namespace FMOD
 		EventSystemI_vtbl* __vftable /*VFT*/;
 		byte __data[0xE0];
 	};
-	static_assert(sizeof(EventSystemI) == 0xE4);
+	COMPILE_ASSERT(sizeof(EventSystemI) == 0xE4);
 
 	extern int32 __stdcall System_init(int system, int maxchannels, unsigned int flags, void* extradriverdata);
 };
@@ -257,7 +257,7 @@ namespace snd
 		byte __data8[0x24];
 		int listenersCount;
 	};
-	static_assert(sizeof(SYSTEM) == 0x30);
+	COMPILE_ASSERT(sizeof(SYSTEM) == 0x30);
 
 	struct SYSTEM_FMOD :
 		SYSTEM
@@ -288,7 +288,7 @@ namespace snd
 		dsVECTOR<FMOD_REVERB_PROPERTIES, 8> auxPresets;
 		dsVECTOR<dsTSTRING<char>, 8> auxPresetNames;
 	};
-	static_assert(sizeof(SYSTEM_FMOD) == 0x368);
+	COMPILE_ASSERT(sizeof(SYSTEM_FMOD) == 0x368);
 
 	//extern int& THREAD_ID;
 	//extern FMOD::System*& fmodOriginalSystem;

game/common/lib_3dpart/fmod/src/sound_fmod.hpp

@@ -62,15 +62,15 @@ const int32 QWORD_BITS = SIZEOF_BITS(uns64);
 
 //#define CHAR_MAX char(0x7F)
 #define UNSIGNED_CHAR_MAX ((uns8)-1)
-static_assert(UNSIGNED_CHAR_MAX == 0xFF);
+COMPILE_ASSERT(UNSIGNED_CHAR_MAX == 0xFF);
 
 //#define SHORT_MAX int16(0x7FFF)
 #define UNSIGNED_SHORT_MAX ((uns16)-1)
-static_assert(UNSIGNED_SHORT_MAX == 0xFFFF);
+COMPILE_ASSERT(UNSIGNED_SHORT_MAX == 0xFFFF);
 
 //#define LONG_MAX int32(0x7FFFFFFF)
 #define UNSIGNED_LONG_MAX ((uns32)-1)
-static_assert(UNSIGNED_LONG_MAX == 0xFFFFFFFF);
+COMPILE_ASSERT(UNSIGNED_LONG_MAX == 0xFFFFFFFF);
 
 #define VALID_CONTROLLER(CONTROLLER) ((CONTROLLER) >= _controller0 && (CONTROLLER) < k_number_of_controllers)
 

game/source/_force_includes/_force_included_macros.hpp

@@ -1,44 +1,44 @@
 #pragma once
 
 typedef char int8;
-static_assert(sizeof(int8) == 0x1);
+COMPILE_ASSERT(sizeof(int8) == 0x1);
 
 typedef unsigned char uns8;
-static_assert(sizeof(uns8) == 0x1);
+COMPILE_ASSERT(sizeof(uns8) == 0x1);
 
 typedef short int16;
-static_assert(sizeof(int16) == 0x2);
+COMPILE_ASSERT(sizeof(int16) == 0x2);
 
 typedef unsigned short uns16;
-static_assert(sizeof(uns16) == 0x2);
+COMPILE_ASSERT(sizeof(uns16) == 0x2);
 
 typedef long int32;
-static_assert(sizeof(int32) == 0x4);
+COMPILE_ASSERT(sizeof(int32) == 0x4);
 
 typedef unsigned long uns32;
-static_assert(sizeof(uns32) == 0x4);
+COMPILE_ASSERT(sizeof(uns32) == 0x4);
 
 typedef long long int64;
-static_assert(sizeof(int64) == 0x8);
+COMPILE_ASSERT(sizeof(int64) == 0x8);
 
 typedef unsigned long long uns64;
-static_assert(sizeof(uns64) == 0x8);
+COMPILE_ASSERT(sizeof(uns64) == 0x8);
 
 typedef float real32;
-static_assert(sizeof(real32) == 0x4);
+COMPILE_ASSERT(sizeof(real32) == 0x4);
 
 typedef double real64;
-static_assert(sizeof(real64) == 0x8);
+COMPILE_ASSERT(sizeof(real64) == 0x8);
 
 typedef unsigned char byte;
-static_assert(sizeof(byte) == 0x1);
+COMPILE_ASSERT(sizeof(byte) == 0x1);
 
 typedef char utf8;
-static_assert(sizeof(utf8) == 0x1);
+COMPILE_ASSERT(sizeof(utf8) == 0x1);
 
 typedef unsigned long tag;
-static_assert(sizeof(tag) == 0x4);
+COMPILE_ASSERT(sizeof(tag) == 0x4);
 
 typedef long string_id;
-static_assert(sizeof(string_id) == 0x4);
+COMPILE_ASSERT(sizeof(string_id) == 0x4);
 

game/source/_force_includes/_force_included_types.hpp

@@ -10,7 +10,7 @@ struct s_posture_info
 	bool disallow_targeting;
 	bool debilitated;
 };
-static_assert(sizeof(s_posture_info) == 0x14);
+COMPILE_ASSERT(sizeof(s_posture_info) == 0x14);
 
 extern e_ai_posture const(&g_activity_posture_variants)[k_activity_count][k_max_activity_variants];
 extern int32 const(&g_activity_names)[k_activity_count];