From 76981461ce401eedb048a3f556cdb972132cc5cb Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 9 Jul 2009 15:19:03 +0000 Subject: [PATCH] disable VC6 warnings before warning(push), otherwise they're reenabled by warning(pop) in wx/afterstd.h git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61358 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/beforestd.h | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) 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 /** -- 2.45.2