X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dad49cc7f9d41e241c647bf7bae0ba7d18fc972a..30386aeb867e0b6311450a87c056c42301765a65:/include/wx/cppunit.h 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.