diff options
| author | Spp <spp@jorge.gr> | 2012-10-04 13:33:04 +0200 |
|---|---|---|
| committer | Spp <spp@jorge.gr> | 2012-10-04 13:33:04 +0200 |
| commit | f570383fbadf12c02d2a3f323eadf5ca2417c3bd (patch) | |
| tree | c28f940c3f77171a5b542189f8704c912001de51 /src/server/shared/CompilerDefs.h | |
| parent | 94c8c7ec4e3a1cf625bee0bab77f8814253ddf0d (diff) | |
| parent | e1bee86ee6f5c3ab7b1da6d1b54c98c2851f11ec (diff) | |
Merge branch 'master' into 4.3.4
Conflicts:
src/server/game/Battlegrounds/Battleground.cpp
src/server/game/Battlegrounds/BattlegroundMgr.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Transport/Transport.cpp
src/server/game/Entities/Unit/StatSystem.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Spells/Auras/SpellAuraEffects.cpp
src/server/game/Spells/Auras/SpellAuras.cpp
src/server/game/Spells/SpellEffects.cpp
src/server/game/Spells/SpellInfo.cpp
Diffstat (limited to 'src/server/shared/CompilerDefs.h')
| -rwxr-xr-x | src/server/shared/CompilerDefs.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/server/shared/CompilerDefs.h b/src/server/shared/CompilerDefs.h index f7e3d0b4979..b8be66d928f 100755 --- a/src/server/shared/CompilerDefs.h +++ b/src/server/shared/CompilerDefs.h @@ -50,12 +50,20 @@ # define COMPILER COMPILER_INTEL #elif defined( __GNUC__ ) # define COMPILER COMPILER_GNU +# define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) #else -# pragma error "FATAL ERROR: Unknown compiler." +# error "FATAL ERROR: Unknown compiler." #endif #if COMPILER == COMPILER_MICROSOFT # 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 #endif + +#if defined(__cplusplus) && __cplusplus == 201103L +# define COMPILER_HAS_CPP11_SUPPORT 1 +#else +# define COMPILER_HAS_CPP11_SUPPORT 0 +#endif + #endif |