diff options
author | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-11-17 09:04:14 +0000 |
---|---|---|
committer | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-11-17 09:04:14 +0000 |
commit | 5712dd7d701141a2862027dcc5fee5a058d32422 (patch) | |
tree | ea625306475111f10944bfe90cf2e54e6c2aaf6c /libstdc++-v3/include/std | |
parent | aaa6a523451c253e394f4cc2ce9908fad8a42a2d (diff) | |
download | gcc-5712dd7d701141a2862027dcc5fee5a058d32422.tar.gz |
2004-11-17 Paolo Carlini <pcarlini@suse.de>
* include/bits/istream.tcc (getline(basic_istream<>&, basic_string<>&,
_CharT)): Remove temporary kludge for libstdc++/15002.
* include/std/std_streambuf.h (class basic_streambuf): Declare
getline(basic_istream<>&, basic_string<>&, _CharT) as friend.
* include/bits/basic_string.h (getline(basic_istream<>&,
basic_string<>&, _CharT)): Declare optimized specializations for
char and wchar_t, using protected members of basic_streambuf.
* src/istream.cc: Define the latter.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@90801 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/std')
-rw-r--r-- | libstdc++-v3/include/std/std_streambuf.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libstdc++-v3/include/std/std_streambuf.h b/libstdc++-v3/include/std/std_streambuf.h index 23da7b90a69..eed17767cc0 100644 --- a/libstdc++-v3/include/std/std_streambuf.h +++ b/libstdc++-v3/include/std/std_streambuf.h @@ -154,7 +154,12 @@ namespace std friend streamsize __copy_streambufs<>(__streambuf_type* __sbin, __streambuf_type* __sbout); - + + template<typename _CharT2, typename _Traits2, typename _Alloc> + friend basic_istream<_CharT2, _Traits2>& + getline(basic_istream<_CharT2, _Traits2>&, + basic_string<_CharT2, _Traits2, _Alloc>&, _CharT2); + protected: //@{ /** |