Author: faridz Date: Fri Feb 8 07:24:40 2008 New Revision: 619911 URL: http://svn.apache.org/viewvc?rev=619911&view=rev Log: 2008-02-08 Farid Zaripov <[EMAIL PROTECTED]>
STDCXX-375 * include/istream (std::getline, std::operator>>): Declaration moved from here ... * include/string (std::getline, std::operator>>): ... to here. * include/istream.cc (std::getline, std::operator>>): Added comment about declarations in <string> Modified: stdcxx/trunk/include/istream stdcxx/trunk/include/istream.cc stdcxx/trunk/include/string Modified: stdcxx/trunk/include/istream URL: http://svn.apache.org/viewvc/stdcxx/trunk/include/istream?rev=619911&r1=619910&r2=619911&view=diff ============================================================================== --- stdcxx/trunk/include/istream (original) +++ stdcxx/trunk/include/istream Fri Feb 8 07:24:40 2008 @@ -522,21 +522,7 @@ } -_EXPORT -template<class _CharT, class _Traits, class _Allocator> -basic_istream<_CharT, _Traits>& -operator>> (basic_istream<_CharT, _Traits>&, - basic_string<_CharT, _Traits, _Allocator>&); - - -_EXPORT -template<class _CharT, class _Traits, class _Allocator> -basic_istream<_CharT, _Traits>& -getline (basic_istream<_CharT, _Traits>&, - basic_string<_CharT, _Traits, _Allocator>&, - _CharT); - - +// 21.3.7.9 - defined here, declared inline in <string> template<class _CharT, class _Traits, class _Allocator> inline basic_istream<_CharT, _Traits>& getline (basic_istream<_CharT, _Traits>& __is, Modified: stdcxx/trunk/include/istream.cc URL: http://svn.apache.org/viewvc/stdcxx/trunk/include/istream.cc?rev=619911&r1=619910&r2=619911&view=diff ============================================================================== --- stdcxx/trunk/include/istream.cc (original) +++ stdcxx/trunk/include/istream.cc Fri Feb 8 07:24:40 2008 @@ -780,6 +780,7 @@ } +// 21.3.7.9 - defined here, declared in <string> _EXPORT template<class _CharT, class _Traits, class _Allocator> basic_istream<_CharT, _Traits>& @@ -962,6 +963,7 @@ } +// 21.3.7.9 - defined here, declared in <string> _EXPORT template<class _CharT, class _Traits, class _Allocator> basic_istream<_CharT, _Traits>& Modified: stdcxx/trunk/include/string URL: http://svn.apache.org/viewvc/stdcxx/trunk/include/string?rev=619911&r1=619910&r2=619911&view=diff ============================================================================== --- stdcxx/trunk/include/string (original) +++ stdcxx/trunk/include/string Fri Feb 8 07:24:40 2008 @@ -1509,6 +1509,30 @@ } +// 21.3.7.9 - declared here, defined in <istream.cc> +_EXPORT +template<class _CharT, class _Traits, class _Allocator> +basic_istream<_CharT, _Traits>& +operator>> (basic_istream<_CharT, _Traits>&, + basic_string<_CharT, _Traits, _Allocator>&); + + +// 21.3.7.9 - declared here, defined in <istream.cc> +_EXPORT +template<class _CharT, class _Traits, class _Allocator> +basic_istream<_CharT, _Traits>& +getline (basic_istream<_CharT, _Traits>&, + basic_string<_CharT, _Traits, _Allocator>&, + _CharT); + + +// 21.3.7.9 - declared here, defined inline in <istream> +template<class _CharT, class _Traits, class _Allocator> +inline basic_istream<_CharT, _Traits>& +getline (basic_istream<_CharT, _Traits>&, + basic_string<_CharT, _Traits, _Allocator>&); + + // 21.3.7.9, p3 - declared here, defined inline in <ostream> template<class _CharT, class _Traits, class _Allocator> inline basic_ostream<_CharT, _Traits>&