mirrors/gcc
0
0
Fork 0
mirror of https://gcc.gnu.org/git/gcc.git synced 2024-11-30 07:14:09 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

streambuf.tcc (__copy_streambufs): Rewrote.

Browse Source 
2003-05-02  Nathan Myers  <ncm@cantrip.org>
	    Paolo Carlini  <pcarlini@unitus.it>

	* include/bits/streambuf.tcc (__copy_streambufs): Rewrote.

Co-Authored-By: Paolo Carlini <pcarlini@unitus.it>

From-SVN: r66395
This commit is contained in:
Nathan Myers 2003-05-02 18:35:24 +00:00 committed by Paolo Carlini
parent 20bfcd6924
commit 0992fb51ae
2 changed files with 23 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,8 @@
2003-05-02 Nathan Myers <ncm@cantrip.org>
Paolo Carlini <pcarlini@unitus.it>
* include/bits/streambuf.tcc (__copy_streambufs): Rewrote.
2003-05-02 Jonathan Wakely <redi@gcc.gnu.org>
* include/bits/basic_string.h (swap): Remove redundant template

64
libstdc++-v3/include/bits/streambuf.tcc
View File

@ -183,61 +183,33 @@ namespace std
__copy_streambufs(basic_ios<_CharT, _Traits>& __ios,
basic_streambuf<_CharT, _Traits>* __sbin,
basic_streambuf<_CharT, _Traits>* __sbout)
{
typedef typename _Traits::int_type int_type;
{
streamsize __ret = 0;
try
{
for (;;)
{
streamsize __xtrct;
const ptrdiff_t __avail = __sbin->_M_in_end
- __sbin->_M_in_cur;
if (__avail)
typename _Traits::int_type __c = __sbin->sgetc();
while (!_Traits::eq_int_type(__c, _Traits::eof()))
{
const size_t __n = __sbin->_M_in_end - __sbin->_M_in_cur;
if (__n > 1)
{
__xtrct = __sbout->sputn(__sbin->_M_in_cur, __avail);
__ret += __xtrct;
__sbin->_M_move_in_cur(__xtrct);
if (__xtrct != __avail)
const size_t __wrote = __sbout->sputn(__sbin->_M_in_cur,
__n);
__sbin->_M_move_in_cur(__wrote);
__ret += __wrote;
if (__wrote < __n)
break;
__c = __sbin->underflow();
}
else
else
{
streamsize __charsread;
const size_t __size = __sbout->_M_out_end
- __sbout->_M_out_cur;
if (__size)
{
_CharT* __buf =
static_cast<_CharT*>(__builtin_alloca(sizeof(_CharT)
* __size));
// Since the next sputn cannot fail sgetn can be
// safely used.
__charsread = __sbin->sgetn(__buf, __size);
__xtrct = __sbout->sputn(__buf, __charsread);
}
else
{
__xtrct = __charsread = 0;
const int_type __c = __sbin->sgetc();
if (!_Traits::eq_int_type(__c, _Traits::eof()))
{
++__charsread;
if (_Traits::eq_int_type(__sbout->overflow(__c),
_Traits::eof()))
break;
++__xtrct;
__sbin->sbumpc();
}
}
__ret += __xtrct;
if (__xtrct != __charsread)
__c = __sbout->sputc(_Traits::to_char_type(__c));
if (_Traits::eq_int_type(__c, _Traits::eof()))
break;
++__ret;
__c = __sbin->snextc();
}
if (_Traits::eq_int_type(__sbin->sgetc(), _Traits::eof()))
break;
}
}
}
catch(exception& __fail)
{