removed operator>>(istream&, wxString&) -- it's better to not have it at all than have an empty function which compiles but doesn't work
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41338 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1578,7 +1578,6 @@ inline bool operator!=(const wxString& s, wxChar c) { return !s.IsSameAs(c); }
|
|||||||
|
|
||||||
#include "wx/iosfwrap.h"
|
#include "wx/iosfwrap.h"
|
||||||
|
|
||||||
WXDLLIMPEXP_BASE wxSTD istream& operator>>(wxSTD istream&, wxString&);
|
|
||||||
WXDLLIMPEXP_BASE wxSTD ostream& operator<<(wxSTD ostream&, const wxString&);
|
WXDLLIMPEXP_BASE wxSTD ostream& operator<<(wxSTD ostream&, const wxString&);
|
||||||
|
|
||||||
#endif // wxSTD_STRING_COMPATIBILITY
|
#endif // wxSTD_STRING_COMPATIBILITY
|
||||||
|
@@ -86,44 +86,8 @@ extern const wxChar WXDLLIMPEXP_BASE *wxEmptyString = &g_strEmpty.dummy;
|
|||||||
|
|
||||||
#if wxUSE_STD_IOSTREAM
|
#if wxUSE_STD_IOSTREAM
|
||||||
|
|
||||||
// MS Visual C++ version 5.0 provides the new STL headers as well as the old
|
|
||||||
// iostream ones.
|
|
||||||
//
|
|
||||||
// ATTN: you can _not_ use both of these in the same program!
|
|
||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
|
||||||
wxSTD istream& operator>>(wxSTD istream& is, wxString& WXUNUSED(str))
|
|
||||||
{
|
|
||||||
#if 0
|
|
||||||
int w = is.width(0);
|
|
||||||
if ( is.ipfx(0) ) {
|
|
||||||
streambuf *sb = is.rdbuf();
|
|
||||||
str.erase();
|
|
||||||
while ( true ) {
|
|
||||||
int ch = sb->sbumpc ();
|
|
||||||
if ( ch == EOF ) {
|
|
||||||
is.setstate(ios::eofbit);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
else if ( isspace(ch) ) {
|
|
||||||
sb->sungetc();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
str += ch;
|
|
||||||
if ( --w == 1 )
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
is.isfx();
|
|
||||||
if ( str.length() == 0 )
|
|
||||||
is.setstate(ios::failbit);
|
|
||||||
#endif
|
|
||||||
return is;
|
|
||||||
}
|
|
||||||
|
|
||||||
wxSTD ostream& operator<<(wxSTD ostream& os, const wxString& str)
|
wxSTD ostream& operator<<(wxSTD ostream& os, const wxString& str)
|
||||||
{
|
{
|
||||||
#ifdef __BORLANDC__
|
#ifdef __BORLANDC__
|
||||||
|
Reference in New Issue
Block a user