From 17e48bcebf8f65df995d2bed81f73dcdf532f8eb Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 22 Oct 2009 11:17:56 +0000 Subject: [PATCH] Suppress a warning in cppunit/extensions/ExceptionTestCaseDecorator.h. This was the last warning given during the tests phase in build bot builds. Also use #pragma warning(pop) for MSVC instead of incorrect warning(default). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62470 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/cppunit.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/include/wx/cppunit.h b/include/wx/cppunit.h index 7d608a63ca..d320acdc71 100644 --- a/include/wx/cppunit.h +++ b/include/wx/cppunit.h @@ -49,9 +49,15 @@ #include "wx/beforestd.h" #ifdef __VISUALC__ + #pragma warning(push) + // with cppunit 1.12 we get many bogus warnings 4701 (local variable may be // used without having been initialized) in TestAssert.h #pragma warning(disable:4701) + + // and also 4100 (unreferenced formal parameter) in extensions/ + // ExceptionTestCaseDecorator.h + #pragma warning(disable:4100) #endif #include @@ -61,7 +67,7 @@ #include #ifdef __VISUALC__ - #pragma warning(default:4701) + #pragma warning(pop) #endif #include "wx/afterstd.h"