+2004-11-15 Paolo Carlini <pcarlini@suse.de>
+
+ * include/bits/streambuf.tcc (__copy_streambufs): Provide
+ a generic version of the function, not using the protected
+ members of basic_streambuf.
+ * include/std/std_streambuf.h (__copy_streambufs): Declare
+ optimized specializations for char and wchar_t.
+ * src/streambuf.cc: New file, define the latter.
+ * src/Makefile.am: Add.
+ * src/Makefile.in: Regenerate.
+
2004-11-15 Matthias Klose <doko@debian.org>
* docs/doxygen/run_doxygen: Add --build_alias option,
// Stream buffer classes -*- C++ -*-
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003
+// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
// Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// Conceivably, this could be used to implement buffer-to-buffer
// copies, if this was ever desired in an un-ambiguous way by the
- // standard. If so, then checks for __ios being zero would be
- // necessary.
+ // standard.
template<typename _CharT, typename _Traits>
streamsize
__copy_streambufs(basic_streambuf<_CharT, _Traits>* __sbin,
typename _Traits::int_type __c = __sbin->sgetc();
while (!_Traits::eq_int_type(__c, _Traits::eof()))
{
- const size_t __n = __sbin->egptr() - __sbin->gptr();
- if (__n > 1)
- {
- const size_t __wrote = __sbout->sputn(__sbin->gptr(), __n);
- __sbin->gbump(__wrote);
- __ret += __wrote;
- if (__wrote < __n)
- break;
- __c = __sbin->underflow();
- }
- else
- {
- __c = __sbout->sputc(_Traits::to_char_type(__c));
- if (_Traits::eq_int_type(__c, _Traits::eof()))
- break;
- ++__ret;
- __c = __sbin->snextc();
- }
+ __c = __sbout->sputc(_Traits::to_char_type(__c));
+ if (_Traits::eq_int_type(__c, _Traits::eof()))
+ break;
+ ++__ret;
+ __c = __sbin->snextc();
}
return __ret;
}
--- /dev/null
+// Stream buffer classes -*- C++ -*-
+
+// Copyright (C) 2004 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library. This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 2, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING. If not, write to the Free
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+// USA.
+
+// As a special exception, you may use this file as part of a free software
+// library without restriction. Specifically, if other files instantiate
+// templates or use macros or inline functions from this file, or you compile
+// this file and link it with other files to produce an executable, this
+// file does not by itself cause the resulting executable to be covered by
+// the GNU General Public License. This exception does not however
+// invalidate any other reasons why the executable file might be covered by
+// the GNU General Public License.
+
+//
+// ISO C++ 14882: 27.5 Stream buffers
+//
+
+#include <streambuf>
+
+namespace std
+{
+ template<>
+ streamsize
+ __copy_streambufs(basic_streambuf<char>* __sbin,
+ basic_streambuf<char>* __sbout)
+ {
+ typedef basic_streambuf<char>::traits_type traits_type;
+ streamsize __ret = 0;
+ traits_type::int_type __c = __sbin->sgetc();
+ while (!traits_type::eq_int_type(__c, traits_type::eof()))
+ {
+ const size_t __n = __sbin->egptr() - __sbin->gptr();
+ if (__n > 1)
+ {
+ const size_t __wrote = __sbout->sputn(__sbin->gptr(), __n);
+ __sbin->gbump(__wrote);
+ __ret += __wrote;
+ if (__wrote < __n)
+ break;
+ __c = __sbin->underflow();
+ }
+ else
+ {
+ __c = __sbout->sputc(traits_type::to_char_type(__c));
+ if (traits_type::eq_int_type(__c, traits_type::eof()))
+ break;
+ ++__ret;
+ __c = __sbin->snextc();
+ }
+ }
+ return __ret;
+ }
+
+#ifdef _GLIBCXX_USE_WCHAR_T
+ template<>
+ streamsize
+ __copy_streambufs(basic_streambuf<wchar_t>* __sbin,
+ basic_streambuf<wchar_t>* __sbout)
+ {
+ typedef basic_streambuf<wchar_t>::traits_type traits_type;
+ streamsize __ret = 0;
+ traits_type::int_type __c = __sbin->sgetc();
+ while (!traits_type::eq_int_type(__c, traits_type::eof()))
+ {
+ const size_t __n = __sbin->egptr() - __sbin->gptr();
+ if (__n > 1)
+ {
+ const size_t __wrote = __sbout->sputn(__sbin->gptr(), __n);
+ __sbin->gbump(__wrote);
+ __ret += __wrote;
+ if (__wrote < __n)
+ break;
+ __c = __sbin->underflow();
+ }
+ else
+ {
+ __c = __sbout->sputc(traits_type::to_char_type(__c));
+ if (traits_type::eq_int_type(__c, traits_type::eof()))
+ break;
+ ++__ret;
+ __c = __sbin->snextc();
+ }
+ }
+ return __ret;
+ }
+#endif
+} // namespace std
git://gcc.gnu.org / gcc.git / commitdiff