diff options
| author | Mattes D <github@xoft.cz> | 2014-10-23 10:53:18 +0200 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2014-10-23 10:58:41 +0200 |
| commit | 154c329a259d937270a23fcbadfa2c01400db0c3 (patch) | |
| tree | f883ef3cf45ab08fb4829eff20663e485cc195fe /src/Globals.h | |
| parent | Merge pull request #1562 from mc-server/signplace (diff) | |
| download | cuberite-154c329a259d937270a23fcbadfa2c01400db0c3.tar cuberite-154c329a259d937270a23fcbadfa2c01400db0c3.tar.gz cuberite-154c329a259d937270a23fcbadfa2c01400db0c3.tar.bz2 cuberite-154c329a259d937270a23fcbadfa2c01400db0c3.tar.lz cuberite-154c329a259d937270a23fcbadfa2c01400db0c3.tar.xz cuberite-154c329a259d937270a23fcbadfa2c01400db0c3.tar.zst cuberite-154c329a259d937270a23fcbadfa2c01400db0c3.zip | |
Diffstat (limited to 'src/Globals.h')
| -rw-r--r-- | src/Globals.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/Globals.h b/src/Globals.h index e0a25ed83..582f5fdaa 100644 --- a/src/Globals.h +++ b/src/Globals.h @@ -17,7 +17,6 @@ #pragma warning(disable:4100) // Unreferenced formal parameter // Useful warnings from warning level 4: - #pragma warning(3 : 4127) // Conditional expression is constant #pragma warning(3 : 4189) // Local variable is initialized but not referenced #pragma warning(3 : 4245) // Conversion from 'type1' to 'type2', signed/unsigned mismatch #pragma warning(3 : 4310) // Cast truncates constant value @@ -26,7 +25,10 @@ #pragma warning(3 : 4701) // Potentially unitialized local variable used #pragma warning(3 : 4702) // Unreachable code #pragma warning(3 : 4706) // Assignment within conditional expression - + + // 2014-10-23 xoft: Disabled this because the new C++11 headers in MSVC produce tons of these warnings uselessly + // #pragma warning(3 : 4127) // Conditional expression is constant + // Disabling this warning, because we know what we're doing when we're doing this: #pragma warning(disable: 4355) // 'this' used in initializer list |