diff options
| -rw-r--r-- | common/scummsys.h | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/common/scummsys.h b/common/scummsys.h index e4f984ccfc..dfdf728ff4 100644 --- a/common/scummsys.h +++ b/common/scummsys.h @@ -45,28 +45,16 @@ #ifdef _MSC_VER #pragma once #pragma warning( disable : 4068 ) // turn off "unknown pragma" warning - #pragma warning( disable : 4100 ) // turn off "unreferenced formal parameter" warning - #pragma warning( disable : 4127 ) // turn off "conditional expression is constant" warning - #pragma warning( disable : 4201 ) // turn off "nonstandard extension used : nameless struct/union" warning - #pragma warning( disable : 4244 ) // turn off "conversion type" warning - #pragma warning( disable : 4310 ) // turn off "cast truncates constant value" warning - #pragma warning( disable : 4355 ) // turn off "base member init" warning - #pragma warning( disable : 4390 ) // turn off "empty statement" warning for BS2 code - #pragma warning( disable : 4250 ) // turn off "inherits via dominance" warning #pragma warning( disable : 4103 ) // turn off "alignement changed after including header" warning. We use pack-start.h file - #pragma warning( disable : 4121 ) // turn off "alignment of a member was sensitive to packing" warning #pragma warning( disable : 4125 ) // turn off "decimal digit terminates octal escape sequence" warning - #pragma warning( disable : 4511 ) // turn off "copy constructor could not be generated" warning - #pragma warning( disable : 4512 ) // turn off "assignment operator could not be generated" warning + #pragma warning( disable : 4244 ) // turn off "conversion type" warning + #pragma warning( disable : 4250 ) // turn off "inherits via dominance" warning #pragma warning( disable : 4351 ) // turn off "new behavior ... will be default initialized" warning + #pragma warning( disable : 4355 ) // turn off "base member init" warning #pragma warning( disable : 4505 ) // turn off "unreferenced local function has been removed" #pragma warning( disable : 4510 ) // turn off "default constructor could not be generated" #pragma warning( disable : 4610 ) // turn off "struct can never be instantiated - user defined constructor required" - // FIXME: 4702 & 4706 - may be enabled - #pragma warning( disable : 4702 ) // turn off "unreachable code" warning - #pragma warning( disable : 4706 ) // turn off "assignment within conditional expression" warning - // vsnprintf is already defined in Visual Studio 2008 #if (_MSC_VER < 1500) #define vsnprintf _vsnprintf |