summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormichi_cc <michi_cc@openttd.org>2012-12-03 22:08:03 +0000
committermichi_cc <michi_cc@openttd.org>2012-12-03 22:08:03 +0000
commit2caa80f751d1f8be007936b43c217f4422b825bf (patch)
tree34bbffe09f4acb3ef31a0d348a156928a750ec95
parent02f39ab1ee40a5f90dc1c6b5acb11a81d0fb8ba7 (diff)
downloadopenttd-2caa80f751d1f8be007936b43c217f4422b825bf.tar.xz
(svn r24782) -Codechange: [Win32] Disable MSVC warning about using 'this' in a base member initializer list as we don't use it in any problematic way.
-rw-r--r--src/stdafx.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/stdafx.h b/src/stdafx.h
index 1c804220e..c6a7335c3 100644
--- a/src/stdafx.h
+++ b/src/stdafx.h
@@ -168,6 +168,7 @@
#pragma warning(disable: 4244) // 'conversion' conversion from 'type1' to 'type2', possible loss of data
#pragma warning(disable: 4761) // integral size mismatch in argument : conversion supplied
#pragma warning(disable: 4200) // nonstandard extension used : zero-sized array in struct/union
+ #pragma warning(disable: 4355) // 'this' : used in base member initializer list
#if (_MSC_VER < 1400) // MSVC 2005 safety checks
#error "Only MSVC 2005 or higher are supported. MSVC 2003 and earlier are not! Upgrade your compiler."