AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

don't define operator<<(ostream&, wxString) at all if it's already defined in the library

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49098 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2007-10-09 00:01:20 +00:00
parent d20d5ee858
commit 6919e3bb38
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/cppunit.h
View File

@ -88,8 +88,9 @@
#define WX_ASSERT_SIZET_EQUAL(n, m) CPPUNIT_ASSERT_EQUAL(((size_t)n), m) #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" #include "wx/string.h"
@ -102,6 +103,7 @@ inline std::ostream& operator<<(std::ostream& o, const wxString& s)
#endif #endif
} }
#endif // !wxUSE_STD_IOSTREAM
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// Some more compiler warning tweaking and auto linking. // Some more compiler warning tweaking and auto linking.