From 9c29b6de48e7775ee88024d46949f4ea5d01ce6b Mon Sep 17 00:00:00 2001
From: pavel-t <36256989+pavel-t@users.noreply.github.com>
Date: Thu, 8 Feb 2018 10:05:21 +0200
Subject: [PATCH] Fix building tests with wxUSE_STL=1 and
 wxUSE_UNSAFE_WXSTRING_CONV=0

---
 tests/strings/stdstrings.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/strings/stdstrings.cpp b/tests/strings/stdstrings.cpp
index 1446a8c040..e9682b5761 100644
--- a/tests/strings/stdstrings.cpp
+++ b/tests/strings/stdstrings.cpp
@@ -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();