X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/282e8e0c1044171a53580499007e4fcee022869e..3f69756e3d68cc8a04b95c95df211295d2ac0ec8:/include/wx/beforestd.h?ds=sidebyside diff --git a/include/wx/beforestd.h b/include/wx/beforestd.h index ee02dca945..945296dde1 100644 --- a/include/wx/beforestd.h +++ b/include/wx/beforestd.h @@ -20,22 +20,30 @@ it can be included several times. */ -// VC 7.x isn't as bad as VC6 and doesn't give these warnings -#if defined(__VISUALC__) && __VISUALC__ <= 1200 +// VC 7.x isn't as bad as VC6 and doesn't give these warnings but eVC (which +// defines _MSC_VER as 1201) does need to be included as it's VC6-like +#if defined(__VISUALC__) && __VISUALC__ <= 1201 // MSVC 5 does not have this #if __VISUALC__ > 1100 + // we have to disable (and reenable in afterstd.h) this one because, + // even though it is of level 4, it is not disabled by warning(push, 1) + // below for VC7.1! + + // unreachable code + #pragma warning(disable:4702) + #pragma warning(push, 1) #else // VC 5 - // 'expression' : signed/unsigned mismatch - #pragma warning(disable:4018) + // 'expression' : signed/unsigned mismatch + #pragma warning(disable:4018) - // 'conversion' : conversion from 'type1' to 'type2', - // possible loss of data - #pragma warning(disable:4244) + // 'conversion' : conversion from 'type1' to 'type2', + // possible loss of data + #pragma warning(disable:4244) - // C++ language change: to explicitly specialize class template - // 'identifier' use the following syntax - #pragma warning(disable:4663) + // C++ language change: to explicitly specialize class template + // 'identifier' use the following syntax + #pragma warning(disable:4663) #endif // these warning have to be disabled and not just temporarily disabled