Fix building tests with wxUSE_UNSAFE_WXSTRING_CONV==0

Avoid relying on implicit conversions to std::string in the tests code.
2017-02-24 16:37:37 +02:00
parent 3a02672de8
commit e8207c8c59
4 changed files with 6 additions and 2 deletions
--- a/tests/strings/stdstrings.cpp
+++ b/tests/strings/stdstrings.cpp
@@ -607,8 +607,10 @@ void StdStringTestCase::StdConversion()
 #endif
    CPPUNIT_ASSERT_EQUAL( "hello", s6 );

+#if wxUSE_UNSAFE_WXSTRING_CONV
    std::string s7(s4);
    CPPUNIT_ASSERT( s7 == "hello" );
+#endif

    wxStdWideString s8(s4);
    CPPUNIT_ASSERT( s8 == "hello" );