remove implicit conversion to C strings from wxString if wxUSE_STL=1; this fixes problems with converting between wxString and std::string in some situations at the cost of having to use c_str() explicitly just as you have to when using std::string
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46554 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -736,10 +736,13 @@ void StringTestCase::CStrDataImplicitConversion()
|
||||
wxString s("foo");
|
||||
|
||||
CPPUNIT_ASSERT( CheckStrConstWChar(s, s.c_str()) );
|
||||
CPPUNIT_ASSERT( CheckStrConstWChar(s, s) );
|
||||
|
||||
CPPUNIT_ASSERT( CheckStrConstChar(s, s.c_str()) );
|
||||
|
||||
// implicit conversion of wxString is not available in STL build
|
||||
#if !wxUSE_STL
|
||||
CPPUNIT_ASSERT( CheckStrConstWChar(s, s) );
|
||||
CPPUNIT_ASSERT( CheckStrConstChar(s, s) );
|
||||
#endif
|
||||
}
|
||||
|
||||
void StringTestCase::ExplicitConversion()
|
||||
|
Reference in New Issue
Block a user