From 1abf065953704c2ff519b4957586cdac25b11fe1 Mon Sep 17 00:00:00 2001 From: Mattes D Date: Thu, 5 Nov 2015 11:09:37 +0100 Subject: MSVC: Reviewed warnings, disabled a useless one, re-enabled an old one. --- src/Globals.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/Globals.h') 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 -- cgit v1.2.3