aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorEugene Sandulenko2006-11-22 13:40:32 +0000
committerEugene Sandulenko2006-11-22 13:40:32 +0000
commitcad15161a5bc4cc45be40728ea1189220d502724 (patch)
treea0ac556c717640b04e855090e449309d7b4aef4b /common
parent2768fa24fc809168784d3cde79fcb4ac6ad513c0 (diff)
downloadscummvm-rg350-cad15161a5bc4cc45be40728ea1189220d502724.tar.gz
scummvm-rg350-cad15161a5bc4cc45be40728ea1189220d502724.tar.bz2
scummvm-rg350-cad15161a5bc4cc45be40728ea1189220d502724.zip
Disable yet another MSVC warning
svn-id: r24758
Diffstat (limited to 'common')
-rw-r--r--common/stdafx.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/common/stdafx.h b/common/stdafx.h
index 54d52a9a28..4c32e3cb02 100644
--- a/common/stdafx.h
+++ b/common/stdafx.h
@@ -46,6 +46,7 @@
#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 : 4121 ) // turn off "alignment of a member was sensitive to packing" 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