From 6919e3bb38397d1d01f3b7a180287ef52caf45cd Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 9 Oct 2007 00:01:20 +0000
Subject: [PATCH] don't define operator<<(ostream&, wxString) at all if it's
 already defined in the library

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49098 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/cppunit.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/include/wx/cppunit.h b/include/wx/cppunit.h
index 54db82a366..7f1923332a 100644
--- a/include/wx/cppunit.h
+++ b/include/wx/cppunit.h
@@ -88,8 +88,9 @@
 #define WX_ASSERT_SIZET_EQUAL(n, m) CPPUNIT_ASSERT_EQUAL(((size_t)n), m)
 
 ///////////////////////////////////////////////////////////////////////////////
-// stream inserter for wxString
-//
+// define stream inserter for wxString if it's not defined in the main library,
+// we need it to output the test failures involving wxString
+#if !wxUSE_STD_IOSTREAM
 
 #include "wx/string.h"
 
@@ -102,6 +103,7 @@ inline std::ostream& operator<<(std::ostream& o, const wxString& s)
 #endif
 }
 
+#endif // !wxUSE_STD_IOSTREAM
 
 ///////////////////////////////////////////////////////////////////////////////
 // Some more compiler warning tweaking and auto linking.
-- 
2.47.2