compilation fix for Mingw: it doesn't have std::wostream

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49115 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 838021c9c8df5bdd4e23f2146f2923beb2dde251..8e387b61edd250a5762fc1365e8dc7cbe360db23 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -449,6 +449,13 @@ typedef int wxWindowID;
 #endif /* HAVE_VARIADIC_MACROS */
 
 
 #endif /* HAVE_VARIADIC_MACROS */
 
 

+#ifndef HAVE_WOSTREAM
+    // Mingw <=3.4 doesn't have std::wostream
+    #if !defined(__MINGW32__) || wxCHECK_GCC_VERSION(4,0)
+        #define HAVE_WOSTREAM
+    #endif
+#endif /* HAVE_WOSTREAM */
+

 /*  ---------------------------------------------------------------------------- */
 /*  portable calling conventions macros */
 /*  ---------------------------------------------------------------------------- */
 /*  ---------------------------------------------------------------------------- */
 /*  portable calling conventions macros */
 /*  ---------------------------------------------------------------------------- */

diff --git a/include/wx/string.h b/include/wx/string.h
index 9f403dab076100d0e503d9db0f27ea9abcc0714d..ba651e5d976ec28178424da1f9045565fde82ccd 100644 (file)
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -3031,13 +3031,13 @@ WXDLLIMPEXP_BASE wxSTD ostream& operator<<(wxSTD ostream&, const wxCharBuffer&);
 WXDLLIMPEXP_BASE wxSTD ostream& operator<<(wxSTD ostream&, const wxWCharBuffer&);
 #endif
 
 WXDLLIMPEXP_BASE wxSTD ostream& operator<<(wxSTD ostream&, const wxWCharBuffer&);
 #endif
 

-#if wxUSE_UNICODE
+#if wxUSE_UNICODE && defined(HAVE_WOSTREAM)

 
 WXDLLIMPEXP_BASE wxSTD wostream& operator<<(wxSTD wostream&, const wxString&);
 WXDLLIMPEXP_BASE wxSTD wostream& operator<<(wxSTD wostream&, const wxCStrData&);
 WXDLLIMPEXP_BASE wxSTD wostream& operator<<(wxSTD wostream&, const wxWCharBuffer&);
 
 
 WXDLLIMPEXP_BASE wxSTD wostream& operator<<(wxSTD wostream&, const wxString&);
 WXDLLIMPEXP_BASE wxSTD wostream& operator<<(wxSTD wostream&, const wxCStrData&);
 WXDLLIMPEXP_BASE wxSTD wostream& operator<<(wxSTD wostream&, const wxWCharBuffer&);
 

-#endif  // wxUSE_UNICODE
+#endif  // wxUSE_UNICODE && defined(HAVE_WOSTREAM)

 
 #endif  // wxUSE_STD_IOSTREAM
 
 
 #endif  // wxUSE_STD_IOSTREAM
 

diff --git a/src/common/string.cpp b/src/common/string.cpp
index a032dec82f30350863eb197c9f6d40d465586ae5..9b05497c373daeb489defb129657e14f64556626 100644 (file)
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -96,7 +96,7 @@ wxSTD ostream& operator<<(wxSTD ostream& os, const wxWCharBuffer& str)
 }
 #endif
 
 }
 #endif
 

-#if wxUSE_UNICODE
+#if wxUSE_UNICODE && defined(HAVE_WOSTREAM)

 
 wxSTD wostream& operator<<(wxSTD wostream& wos, const wxString& str)
 {
 
 wxSTD wostream& operator<<(wxSTD wostream& wos, const wxString& str)
 {


@@ -113,7 +113,7 @@ wxSTD wostream& operator<<(wxSTD wostream& wos, const wxWCharBuffer& str)
     return wos << str.data();
 }
 
     return wos << str.data();
 }
 

-#endif  // wxUSE_UNICODE
+#endif  // wxUSE_UNICODE && defined(HAVE_WOSTREAM)

 
 #endif // wxUSE_STD_IOSTREAM
 
 
 #endif // wxUSE_STD_IOSTREAM