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
This commit is contained in:
@@ -49,9 +49,15 @@
|
|||||||
|
|
||||||
#include "wx/beforestd.h"
|
#include "wx/beforestd.h"
|
||||||
#ifdef __VISUALC__
|
#ifdef __VISUALC__
|
||||||
|
#pragma warning(push)
|
||||||
|
|
||||||
// with cppunit 1.12 we get many bogus warnings 4701 (local variable may be
|
// with cppunit 1.12 we get many bogus warnings 4701 (local variable may be
|
||||||
// used without having been initialized) in TestAssert.h
|
// used without having been initialized) in TestAssert.h
|
||||||
#pragma warning(disable:4701)
|
#pragma warning(disable:4701)
|
||||||
|
|
||||||
|
// and also 4100 (unreferenced formal parameter) in extensions/
|
||||||
|
// ExceptionTestCaseDecorator.h
|
||||||
|
#pragma warning(disable:4100)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <cppunit/extensions/TestFactoryRegistry.h>
|
#include <cppunit/extensions/TestFactoryRegistry.h>
|
||||||
@@ -61,7 +67,7 @@
|
|||||||
#include <cppunit/CompilerOutputter.h>
|
#include <cppunit/CompilerOutputter.h>
|
||||||
|
|
||||||
#ifdef __VISUALC__
|
#ifdef __VISUALC__
|
||||||
#pragma warning(default:4701)
|
#pragma warning(pop)
|
||||||
#endif
|
#endif
|
||||||
#include "wx/afterstd.h"
|
#include "wx/afterstd.h"
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user