X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/06ef151178ba3196fa237165b35a0686a461ff76..d62c1e628d2e36f00dd1c703a41c2d41415c10cc:/tests/strings/tokenizer.cpp diff --git a/tests/strings/tokenizer.cpp b/tests/strings/tokenizer.cpp index f694339c2b..c22c5ba3b5 100644 --- a/tests/strings/tokenizer.cpp +++ b/tests/strings/tokenizer.cpp @@ -123,7 +123,8 @@ gs_testData[] = // fails in the diagnostic message static std::string Nth(size_t n) { - return wxString::Format(_T("for loop index %lu"), (unsigned long)n).mb_str(); + return std::string(wxString::Format(_T("for loop index %lu"), + (unsigned long)n).mb_str()); } // ---------------------------------------------------------------------------- @@ -204,7 +205,7 @@ DoTestGetString(const wxChar *s, const wxChar *delims, int pos, ...) { if ( !pos ) { - CPPUNIT_ASSERT_EQUAL( wxString(), tkz.GetString() ); + CPPUNIT_ASSERT( tkz.GetString().empty() ) ; break; }