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.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@90701 138bc75d-0d04-0410-961f-82ee72b054a4

6 files changed, 136 insertions, 22 deletions

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 5beafdbcf64..d92c5187e80 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,14 @@
+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,
diff --git a/libstdc++-v3/include/bits/streambuf.tcc b/libstdc++-v3/include/bits/streambuf.tcc
index 554d0617899..bc59edd4712 100644
--- a/libstdc++-v3/include/bits/streambuf.tcc
+++ b/libstdc++-v3/include/bits/streambuf.tcc
@@ -1,6 +1,6 @@
 // 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
@@ -109,8 +109,7 @@ namespace std
 
   // 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,
@@ -120,24 +119,11 @@ namespace std
       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;
     }
diff --git a/libstdc++-v3/include/std/std_streambuf.h b/libstdc++-v3/include/std/std_streambuf.h
index 42b3d782b0f..23da7b90a69 100644
--- a/libstdc++-v3/include/std/std_streambuf.h
+++ b/libstdc++-v3/include/std/std_streambuf.h
@@ -775,6 +775,18 @@ namespace std
       __streambuf_type& 
       operator=(const __streambuf_type&) { return *this; };
     };
+
+  // Explicit specialization declarations, defined in src/streambuf.cc.
+  template<>
+    streamsize
+    __copy_streambufs(basic_streambuf<char>* __sbin,
+		      basic_streambuf<char>* __sbout);
+#ifdef _GLIBCXX_USE_WCHAR_T
+  template<>
+    streamsize
+    __copy_streambufs(basic_streambuf<wchar_t>* __sbin,
+		      basic_streambuf<wchar_t>* __sbout);
+#endif
 } // namespace std
 
 #ifndef _GLIBCXX_EXPORT_TEMPLATE
diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am
index 67e17cf7879..630f4dcd6d0 100644
--- a/libstdc++-v3/src/Makefile.am
+++ b/libstdc++-v3/src/Makefile.am
@@ -133,6 +133,7 @@ sources = \
 	ostream-inst.cc \
 	sstream-inst.cc \
 	streambuf-inst.cc \
+	streambuf.cc \
 	string-inst.cc \
 	valarray-inst.cc \
 	wlocale-inst.cc \
diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in
index e49698c903e..14a8b1e0633 100644
--- a/libstdc++-v3/src/Makefile.in
+++ b/libstdc++-v3/src/Makefile.in
@@ -73,7 +73,7 @@ am__objects_3 = bitmap_allocator.lo pool_allocator.lo mt_allocator.lo \
 	concept-inst.lo fstream-inst.lo ext-inst.lo io-inst.lo \
 	istream-inst.lo istream.lo locale-inst.lo locale-misc-inst.lo \
 	misc-inst.lo ostream-inst.lo sstream-inst.lo streambuf-inst.lo \
-	string-inst.lo valarray-inst.lo wlocale-inst.lo \
+	streambuf.lo string-inst.lo valarray-inst.lo wlocale-inst.lo \
 	wstring-inst.lo $(am__objects_1) $(am__objects_2)
 am_libstdc___la_OBJECTS = $(am__objects_3)
 libstdc___la_OBJECTS = $(am_libstdc___la_OBJECTS)
@@ -343,6 +343,7 @@ sources = \
 	ostream-inst.cc \
 	sstream-inst.cc \
 	streambuf-inst.cc \
+	streambuf.cc \
 	string-inst.cc \
 	valarray-inst.cc \
 	wlocale-inst.cc \
diff --git a/libstdc++-v3/src/streambuf.cc b/libstdc++-v3/src/streambuf.cc
new file mode 100644
index 00000000000..2f9640950e0
--- /dev/null
+++ b/libstdc++-v3/src/streambuf.cc
@@ -0,0 +1,103 @@
+// 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