diff options
| author | Vincent_Michael <Vincent_Michael@gmx.de> | 2014-01-31 23:51:07 +0100 |
|---|---|---|
| committer | Vincent_Michael <Vincent_Michael@gmx.de> | 2014-01-31 23:51:07 +0100 |
| commit | 224da4795283d1314bd255611730a2b46f84f68c (patch) | |
| tree | 9f118a2f9bafcce24ee3fd62057689bbd085d0d6 /src/server/shared/CompilerDefs.h | |
| parent | 9316b947863dcac7675fc9e4cf43a44c4e678ab9 (diff) | |
| parent | 19172ee4c26a12b844a7e1f435daed9bb44bf625 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/scripts/Spells/spell_dk.cpp
Diffstat (limited to 'src/server/shared/CompilerDefs.h')
| -rw-r--r-- | src/server/shared/CompilerDefs.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/server/shared/CompilerDefs.h b/src/server/shared/CompilerDefs.h index 71b20a4d175..8a557328af4 100644 --- a/src/server/shared/CompilerDefs.h +++ b/src/server/shared/CompilerDefs.h @@ -57,6 +57,8 @@ #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 |