Adjust gcc/testsuite/ChangeLog

[pf3gnuchains/gcc-fork.git] / libstdc++-v3 / src / streambuf.cc

diff --git a/libstdc++-v3/src/streambuf.cc b/libstdc++-v3/src/streambuf.cc
index 7badf94..5bcd0ea 100644 (file)
--- a/libstdc++-v3/src/streambuf.cc
+++ b/libstdc++-v3/src/streambuf.cc
@@ -1,11 +1,12 @@
 // Stream buffer classes -*- C++ -*-
 
-// Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+// Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+// 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)
+// Free Software Foundation; either version 3, or (at your option)
 // any later version.
 
 // This library is distributed in the hope that it will be useful,
@@ -13,19 +14,14 @@
 // 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.
+// Under Section 7 of GPL version 3, you are granted additional
+// permissions described in the GCC Runtime Library Exception, version
+// 3.1, as published by the Free Software Foundation.
 
-// 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.
+// You should have received a copy of the GNU General Public License and
+// a copy of the GCC Runtime Library Exception along with this program;
+// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+// <http://www.gnu.org/licenses/>.
 
 //
 // ISO C++ 14882: 27.5  Stream buffers
@@ -33,15 +29,18 @@
 
 #include <streambuf>
 
-namespace std
+namespace std _GLIBCXX_VISIBILITY(default)
 {
+_GLIBCXX_BEGIN_NAMESPACE_VERSION
+
   template<>
     streamsize
-    __copy_streambufs(basic_streambuf<char>* __sbin,
-                     basic_streambuf<char>* __sbout)
+    __copy_streambufs_eof(basic_streambuf<char>* __sbin,
+                         basic_streambuf<char>* __sbout, bool& __ineof)
     {
       typedef basic_streambuf<char>::traits_type traits_type;
       streamsize __ret = 0;
+      __ineof = true;
       traits_type::int_type __c = __sbin->sgetc();
       while (!traits_type::eq_int_type(__c, traits_type::eof()))
        {
@@ -49,17 +48,23 @@ namespace std
          if (__n > 1)
            {
              const streamsize __wrote = __sbout->sputn(__sbin->gptr(), __n);
-             __sbin->gbump(__wrote);
+             __sbin->__safe_gbump(__wrote);
              __ret += __wrote;
              if (__wrote < __n)
-               break;
+               {
+                 __ineof = false;
+                 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;
+               {
+                 __ineof = false;
+                 break;
+               }
              ++__ret;
              __c = __sbin->snextc();
            }
@@ -70,11 +75,12 @@ namespace std
 #ifdef _GLIBCXX_USE_WCHAR_T
   template<>
     streamsize
-    __copy_streambufs(basic_streambuf<wchar_t>* __sbin,
-                     basic_streambuf<wchar_t>* __sbout)
+    __copy_streambufs_eof(basic_streambuf<wchar_t>* __sbin,
+                         basic_streambuf<wchar_t>* __sbout, bool& __ineof)
     {
       typedef basic_streambuf<wchar_t>::traits_type traits_type;
       streamsize __ret = 0;
+      __ineof = true;
       traits_type::int_type __c = __sbin->sgetc();
       while (!traits_type::eq_int_type(__c, traits_type::eof()))
        {
@@ -82,17 +88,23 @@ namespace std
          if (__n > 1)
            {
              const streamsize __wrote = __sbout->sputn(__sbin->gptr(), __n);
-             __sbin->gbump(__wrote);
+             __sbin->__safe_gbump(__wrote);
              __ret += __wrote;
              if (__wrote < __n)
-               break;
+               {
+                 __ineof = false;
+                 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;
+               {
+                 __ineof = false;
+                 break;
+               }
              ++__ret;
              __c = __sbin->snextc();
            }
@@ -100,4 +112,6 @@ namespace std
       return __ret;
     }
 #endif
-} // namespace std
+
+_GLIBCXX_END_NAMESPACE_VERSION
+} // namespace