mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-12 19:37:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[12775] Final fix for clang compiler

Browse source
This commit is contained in:
sanctum32 2013-12-31 04:53:26 +02:00 • committed by Antz
parent 3f914fc7a2
commit badba34e28
4 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/framework/Platform/CompilerDefs.h
View file

@ -63,4 +63,11 @@
# pragma warning( disable : 4267 ) // conversion from 'size_t' to 'int', possible loss of data # pragma warning( disable : 4267 ) // conversion from 'size_t' to 'int', possible loss of data
# pragma warning( disable : 4786 ) // identifier was truncated to '255' characters in the debug information # pragma warning( disable : 4786 ) // identifier was truncated to '255' characters in the debug information
#endif #endif
#if defined( __clang__)
#define COMPILE_ASSERT(exp, name) _Static_assert((exp), #name)
#else
#define COMPILE_ASSERT(exp, name) static_assert((exp), #name)
#endif
#endif #endif

2
src/game/ObjectMgr.h
View file

@ -131,7 +131,7 @@ typedef UNORDERED_MAP < uint32/*(mapid,spawnMode) pair*/, CellObjectGuidsMap > M
#define MAX_CREATURE_AI_TEXT_STRING_ID (-1000000) #define MAX_CREATURE_AI_TEXT_STRING_ID (-1000000)
// Anything below MAX_CREATURE_AI_TEXT_STRING_ID is handled by the external script lib // Anything below MAX_CREATURE_AI_TEXT_STRING_ID is handled by the external script lib
static_assert(MAX_DB_SCRIPT_STRING_ID < ACE_INT32_MAX, "Must scope with int32 range"); COMPILE_ASSERT(MAX_DB_SCRIPT_STRING_ID < ACE_INT32_MAX, "Must scope with int32 range");
struct MangosStringLocale struct MangosStringLocale
{ {

2
src/game/Unit.h
View file

@ -401,7 +401,7 @@ enum UnitMods
UNIT_MOD_POWER_END = UNIT_MOD_ALTERNATIVE + 1 UNIT_MOD_POWER_END = UNIT_MOD_ALTERNATIVE + 1
}; };
static_assert(UNIT_MOD_POWER_END - UNIT_MOD_POWER_START == MAX_POWERS, "Power-related UnitMods are not updated."); COMPILE_ASSERT(UNIT_MOD_POWER_END - UNIT_MOD_POWER_START == MAX_POWERS, "Power-related UnitMods are not updated.");
enum BaseModGroup enum BaseModGroup
{ {

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "12774" #define REVISION_NR "12775"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__