From 70c99f6c02013c9de34ce838732dd370d7ca379e Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Sun, 15 Oct 2006 14:43:50 +0000 Subject: [PATCH] istream.tcc (getline(basic_istream<>&, basic_string<>&)): Move... 2006-10-15 Paolo Carlini * include/bits/istream.tcc (getline(basic_istream<>&, basic_string<>&)): Move... * include/bits/basic_string.h: ... here. (operator<<(basic_ostream<>&, const basic_string<>&)): Mark inline. From-SVN: r117745 --- libstdc++-v3/ChangeLog | 7 +++++++ libstdc++-v3/include/bits/basic_string.h | 7 ++++--- libstdc++-v3/include/bits/istream.tcc | 6 ------ 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index b87cb77408a..0fa59dd3deb 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2006-10-15 Paolo Carlini + + * include/bits/istream.tcc (getline(basic_istream<>&, + basic_string<>&)): Move... + * include/bits/basic_string.h: ... here. + (operator<<(basic_ostream<>&, const basic_string<>&)): Mark inline. + 2006-10-15 Geoffrey Keating * scripts/make_exports.pl: Use -_ rather than --strip-underscores diff --git a/libstdc++-v3/include/bits/basic_string.h b/libstdc++-v3/include/bits/basic_string.h index da6ef1c2d19..9e8ea6c6e0c 100644 --- a/libstdc++-v3/include/bits/basic_string.h +++ b/libstdc++-v3/include/bits/basic_string.h @@ -2394,7 +2394,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) * writing a C string. */ template - basic_ostream<_CharT, _Traits>& + inline basic_ostream<_CharT, _Traits>& operator<<(basic_ostream<_CharT, _Traits>& __os, const basic_string<_CharT, _Traits, _Alloc>& __str) { @@ -2436,8 +2436,9 @@ _GLIBCXX_BEGIN_NAMESPACE(std) template inline basic_istream<_CharT, _Traits>& getline(basic_istream<_CharT, _Traits>& __is, - basic_string<_CharT, _Traits, _Alloc>& __str); - + basic_string<_CharT, _Traits, _Alloc>& __str) + { return getline(__is, __str, __is.widen('\n')); } + template<> basic_istream& getline(basic_istream& __in, basic_string& __str, diff --git a/libstdc++-v3/include/bits/istream.tcc b/libstdc++-v3/include/bits/istream.tcc index 39ee2c75772..38caddc4de2 100644 --- a/libstdc++-v3/include/bits/istream.tcc +++ b/libstdc++-v3/include/bits/istream.tcc @@ -988,12 +988,6 @@ _GLIBCXX_BEGIN_NAMESPACE(std) return __in; } - template - inline basic_istream<_CharT,_Traits>& - getline(basic_istream<_CharT, _Traits>& __in, - basic_string<_CharT,_Traits,_Alloc>& __str) - { return getline(__in, __str, __in.widen('\n')); } - // Inhibit implicit instantiations for required instantiations, // which are defined via explicit instantiations elsewhere. // NB: This syntax is a GNU extension. -- 2.30.2