diff options
| author | Mattes D <github@xoft.cz> | 2015-11-05 11:09:37 +0100 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2015-11-05 11:09:37 +0100 |
| commit | 1abf065953704c2ff519b4957586cdac25b11fe1 (patch) | |
| tree | 4bb18bc4824cfb9a47455b6363bb10a58941adb5 /src | |
| parent | Merge pull request #2605 from cuberite/SubmoduleChange (diff) | |
| download | cuberite-1abf065953704c2ff519b4957586cdac25b11fe1.tar cuberite-1abf065953704c2ff519b4957586cdac25b11fe1.tar.gz cuberite-1abf065953704c2ff519b4957586cdac25b11fe1.tar.bz2 cuberite-1abf065953704c2ff519b4957586cdac25b11fe1.tar.lz cuberite-1abf065953704c2ff519b4957586cdac25b11fe1.tar.xz cuberite-1abf065953704c2ff519b4957586cdac25b11fe1.tar.zst cuberite-1abf065953704c2ff519b4957586cdac25b11fe1.zip | |
Diffstat (limited to 'src')
| -rw-r--r-- | src/Globals.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/Globals.h b/src/Globals.h index 2ee8574ba..dc5d27636 100644 --- a/src/Globals.h +++ b/src/Globals.h @@ -10,9 +10,6 @@ // Compiler-dependent stuff: #if defined(_MSC_VER) - // MSVC produces warning C4481 on the override keyword usage, so disable the warning altogether - #pragma warning(disable:4481) - // Disable some warnings that we don't care about: #pragma warning(disable:4100) // Unreferenced formal parameter @@ -34,6 +31,7 @@ // Disabled because it's useless: #pragma warning(disable: 4512) // 'class': assignment operator could not be generated - reported for each class that has a reference-type member + #pragma warning(disable: 4351) // new behavior: elements of array 'member' will be default initialized // 2014_01_06 xoft: Disabled this warning because MSVC is stupid and reports it in obviously wrong places // #pragma warning(3 : 4244) // Conversion from 'type1' to 'type2', possible loss of data |