fix another warning about unused variable in DoCStrDataTernaryOperator()

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

diff --git a/tests/strings/strings.cpp b/tests/strings/strings.cpp
index 92898edc986d5f71bad33c99b35ca96e0adcc91f..ca6a5cd709bfb518c8569b596947498f251e7a9c 100644 (file)
--- a/tests/strings/strings.cpp
+++ b/tests/strings/strings.cpp
@@ -678,7 +678,6 @@ void StringTestCase::DoCStrDataTernaryOperator(bool cond)
     // are not very important, we're testing if the code compiles at all):
 
     wxString s("foo");
     // are not very important, we're testing if the code compiles at all):
 
     wxString s("foo");

-    const char *mbStr = "foo";

 
     // FIXME-UTF8: when wxCStrData can handle both conversions, this should
     //             be changed to always test all versions, both MB and WC
 
     // FIXME-UTF8: when wxCStrData can handle both conversions, this should
     //             be changed to always test all versions, both MB and WC


@@ -689,6 +688,7 @@ void StringTestCase::DoCStrDataTernaryOperator(bool cond)
     CPPUNIT_ASSERT( CheckStr(s, (cond ? wcStr : s.c_str())) );
     CPPUNIT_ASSERT( CheckStr(s, (cond ? L"bar" : s.c_str())) );
 #else
     CPPUNIT_ASSERT( CheckStr(s, (cond ? wcStr : s.c_str())) );
     CPPUNIT_ASSERT( CheckStr(s, (cond ? L"bar" : s.c_str())) );
 #else

+    const char *mbStr = "foo";

     CPPUNIT_ASSERT( CheckStr(s, (cond ? s.c_str() : mbStr)) );
     CPPUNIT_ASSERT( CheckStr(s, (cond ? s.c_str() : "foo")) );
     CPPUNIT_ASSERT( CheckStr(s, (cond ? mbStr : s.c_str())) );
     CPPUNIT_ASSERT( CheckStr(s, (cond ? s.c_str() : mbStr)) );
     CPPUNIT_ASSERT( CheckStr(s, (cond ? s.c_str() : "foo")) );
     CPPUNIT_ASSERT( CheckStr(s, (cond ? mbStr : s.c_str())) );