From 00ba414f7f79f8842d25c8b47cb091e20487b819 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 16 Nov 2004 12:09:17 +0000 Subject: [PATCH] attempts to suppress C4702 for VC git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30567 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/afterstd.h | 7 +++++++ include/wx/beforestd.h | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/include/wx/afterstd.h b/include/wx/afterstd.h index ecb2c3c88e..e4967e0a78 100644 --- a/include/wx/afterstd.h +++ b/include/wx/afterstd.h @@ -20,6 +20,13 @@ #if defined(__VISUALC__) && __VISUALC__ <= 1200 // MSVC 5 does not have this #if _MSC_VER > 1100 + // don't restore this one for VC6, it gives it in each try/catch which is a + // bit annoying to say the least + #if _MSC_VER >= 0x1300 + // unreachable code + #pragma warning(default:4702) + #endif // VC++ >= 7 + #pragma warning(pop) #else // 'expression' : signed/unsigned mismatch diff --git a/include/wx/beforestd.h b/include/wx/beforestd.h index 6f8eb762f1..4c79e2660e 100644 --- a/include/wx/beforestd.h +++ b/include/wx/beforestd.h @@ -24,6 +24,13 @@ #if defined(__VISUALC__) && __VISUALC__ <= 1200 // 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 -- 2.47.2