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

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49115 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2007-10-10 09:48:00 +00:00
parent 1583600031
commit 6a6ea041d9
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/wx/defs.h
View File

@ -449,6 +449,13 @@ typedef int wxWindowID;
#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 */
/* ---------------------------------------------------------------------------- */

4
include/wx/string.h
View File

@ -3031,13 +3031,13 @@ WXDLLIMPEXP_BASE wxSTD ostream& operator<<(wxSTD ostream&, const wxCharBuffer&);
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&);
#endif // wxUSE_UNICODE
#endif // wxUSE_UNICODE && defined(HAVE_WOSTREAM)
#endif // wxUSE_STD_IOSTREAM

4
src/common/string.cpp
View File

@ -96,7 +96,7 @@ wxSTD ostream& operator<<(wxSTD ostream& os, const wxWCharBuffer& str)
}
#endif
#if wxUSE_UNICODE
#if wxUSE_UNICODE && defined(HAVE_WOSTREAM)
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();
}
#endif // wxUSE_UNICODE
#endif // wxUSE_UNICODE && defined(HAVE_WOSTREAM)
#endif // wxUSE_STD_IOSTREAM