Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

work around (harmless) warnings in VC7 release build

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60922 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-06-06 23:04:50 +00:00
parent 8664669368
commit 895cae46b7
4 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/wx/cppunit.h
View File

@@ -48,11 +48,21 @@
// //
#include "wx/beforestd.h" #include "wx/beforestd.h"
#ifdef __VISUALC__
// 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)
#endif
#include <cppunit/extensions/TestFactoryRegistry.h> #include <cppunit/extensions/TestFactoryRegistry.h>
#include <cppunit/ui/text/TestRunner.h> #include <cppunit/ui/text/TestRunner.h>
#include <cppunit/TestCase.h> #include <cppunit/TestCase.h>
#include <cppunit/extensions/HelperMacros.h> #include <cppunit/extensions/HelperMacros.h>
#include <cppunit/CompilerOutputter.h> #include <cppunit/CompilerOutputter.h>
#ifdef __VISUALC__
#pragma warning(default:4701)
#endif
#include "wx/afterstd.h" #include "wx/afterstd.h"
#include "wx/string.h" #include "wx/string.h"

10
tests/archive/tartest.cpp
View File

@@ -59,13 +59,15 @@ CppUnit::Test *tartest::makeTest(
return NULL; return NULL;
if (genericInterface) if (genericInterface)
{
return new ArchiveTestCase<wxArchiveClassFactory>( return new ArchiveTestCase<wxArchiveClassFactory>(
descr, new wxTarClassFactory, descr, new wxTarClassFactory,
options, archiver, unarchiver); options, archiver, unarchiver);
else }
return new ArchiveTestCase<wxTarClassFactory>(
descr, new wxTarClassFactory, return new ArchiveTestCase<wxTarClassFactory>(
options, archiver, unarchiver); descr, new wxTarClassFactory,
options, archiver, unarchiver);
} }
CPPUNIT_TEST_SUITE_REGISTRATION(tartest); CPPUNIT_TEST_SUITE_REGISTRATION(tartest);

6
tests/archive/ziptest.cpp
View File

@@ -261,11 +261,13 @@ CppUnit::Test *ziptest::makeTest(
return NULL; return NULL;
if (genericInterface) if (genericInterface)
{
return new ArchiveTestCase<wxArchiveClassFactory>( return new ArchiveTestCase<wxArchiveClassFactory>(
descr, new wxZipClassFactory, descr, new wxZipClassFactory,
options, archiver, unarchiver); options, archiver, unarchiver);
else }
return new ZipTestCase(descr, options, archiver, unarchiver);
return new ZipTestCase(descr, options, archiver, unarchiver);
} }
CPPUNIT_TEST_SUITE_REGISTRATION(ziptest); CPPUNIT_TEST_SUITE_REGISTRATION(ziptest);

4
tests/regex/regextest.cpp
View File

@@ -170,8 +170,8 @@ wxString RegExTestCase::Conv(const char *str)
if (!buf || wxWcscmp(wxConvCurrent->cWX2WC(buf), wstr) != 0) if (!buf || wxWcscmp(wxConvCurrent->cWX2WC(buf), wstr) != 0)
return convError(); return convError();
else
return buf; return buf;
} }
// Parse flags // Parse flags