X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d6f513f829d7060a7f4adada4e023b3f1ac3d29c..aaedb44c5e7169db22d32e8a335936e3213da33a:/include/wx/beforestd.h diff --git a/include/wx/beforestd.h b/include/wx/beforestd.h index 5bf6377113..832a7ee4e8 100644 --- a/include/wx/beforestd.h +++ b/include/wx/beforestd.h @@ -23,6 +23,20 @@ // 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 + // these warning have to be disabled and not just temporarily disabled + // because they will be given at the end of the compilation of the + // current source and there is absolutely nothing we can do about them so + // disable them before warning(push) below + + // 'foo': unreferenced inline function has been removed + #pragma warning(disable:4514) + + // 'function' : function not inlined + #pragma warning(disable:4710) + + // 'id': identifier was truncated to 'num' characters in the debug info + #pragma warning(disable:4786) + // MSVC 5 does not have this #if __VISUALC__ > 1100 // we have to disable (and reenable in afterstd.h) this one because, @@ -48,19 +62,6 @@ // 'identifier' use the following syntax #pragma warning(disable:4663) #endif - - // these warning have to be disabled and not just temporarily disabled - // because they will be given at the end of the compilation of the - // current source and there is absolutely nothing we can do about them - - // 'foo': unreferenced inline function has been removed - #pragma warning(disable:4514) - - // 'function' : function not inlined - #pragma warning(disable:4710) - - // 'id': identifier was truncated to 'num' characters in the debug info - #pragma warning(disable:4786) #endif // VC++ < 7 /**