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

diff --git a/include/wx/cppunit.h b/include/wx/cppunit.h
index 7d608a63cae5c831397353403b1184d1be45890c..d320acdc7109dc922fcbefac74d03ca0a09a3493 100644 (file)
--- a/include/wx/cppunit.h
+++ b/include/wx/cppunit.h
@@ -49,9 +49,15 @@
 
 #include "wx/beforestd.h"
 #ifdef __VISUALC__
 
 #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)
     // 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 <cppunit/extensions/TestFactoryRegistry.h>
 #endif
 
 #include <cppunit/extensions/TestFactoryRegistry.h>


@@ -61,7 +67,7 @@
 #include <cppunit/CompilerOutputter.h>
 
 #ifdef __VISUALC__
 #include <cppunit/CompilerOutputter.h>
 
 #ifdef __VISUALC__

-    #pragma warning(default:4701)
+    #pragma warning(pop)

 #endif
 #include "wx/afterstd.h"
 
 #endif
 #include "wx/afterstd.h"