Fix building tests with wxUSE_STL=1 and wxUSE_UNSAFE_WXSTRING_CONV=0

This commit is contained in:
pavel-t
2018-02-08 10:05:21 +02:00
committed by GitHub
parent 0fe9d7c3bb
commit 9c29b6de48

View File

@@ -593,7 +593,7 @@ void StdStringTestCase::StdConversion()
// notice that implicit wxString -> std::string conversion is only
// available in wxUSE_STL case, because it conflicts with conversion to
// const char*/wchar_t*
#if wxUSE_STL
#if wxUSE_STL && wxUSE_UNSAFE_WXSTRING_CONV
std::string s5 = s4;
#else
std::string s5 = s4.ToStdString();