work around (harmless) warnings in VC7 release build

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60922 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/cppunit.h

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

tests/archive/tartest.cpp

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

tests/archive/ziptest.cpp

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

tests/regex/regextest.cpp

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