diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-05-03 20:23:44 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-05-03 20:23:44 +0200 |
| commit | 13ec761ad2cc2aec24f850520f459bb124050a34 (patch) | |
| tree | d22b616621787ecdf81579ae08d3c46b93d471b3 /src/server/shared/CompilerDefs.h | |
| parent | 9a8cd0593c985a05dfc0fc9a45dd8d905974505b (diff) | |
| parent | d7b1405725d2f247776f3586df8c3512416f60cd (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Entities/Player/Player.h
src/server/game/Globals/ObjectMgr.h
Diffstat (limited to 'src/server/shared/CompilerDefs.h')
| -rw-r--r-- | src/server/shared/CompilerDefs.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/server/shared/CompilerDefs.h b/src/server/shared/CompilerDefs.h index 8a557328af4..2c2d7ea861d 100644 --- a/src/server/shared/CompilerDefs.h +++ b/src/server/shared/CompilerDefs.h @@ -55,12 +55,4 @@ # error "FATAL ERROR: Unknown compiler." #endif -#if defined(__cplusplus) && __cplusplus == 201103L -# define COMPILER_HAS_CPP11_SUPPORT 1 -#elif _MSC_VER >= 1700 -# define COMPILER_HAS_CPP11_SUPPORT 1 -#else -# define COMPILER_HAS_CPP11_SUPPORT 0 -#endif - #endif |