diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-09-22 15:31:21 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-09-22 15:31:21 +0200 |
| commit | f2dff3da38be4dffca204013e917579a1116a817 (patch) | |
| tree | 94e0958c862f9d8ba09dcaca39127a2459283b67 /src/server/shared/CompilerDefs.h | |
| parent | fb997c5f41965eafb080597a71181fcfc57e7678 (diff) | |
| parent | 56b3e52f067f5f5d671559e6f8ce28506afce635 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Achievements/AchievementMgr.cpp
Diffstat (limited to 'src/server/shared/CompilerDefs.h')
| -rw-r--r-- | src/server/shared/CompilerDefs.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/server/shared/CompilerDefs.h b/src/server/shared/CompilerDefs.h index 10cdaf4e179..909dcd1707b 100644 --- a/src/server/shared/CompilerDefs.h +++ b/src/server/shared/CompilerDefs.h @@ -55,11 +55,6 @@ # 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 |