]> git.ipfire.org Git - thirdparty/gcc.git/blobdiff - libstdc++-v3/include/bits/istream.tcc
Update copyright years in libstdc++-v3/
[thirdparty/gcc.git] / libstdc++-v3 / include / bits / istream.tcc
index db3e96e00e11043c9f9ca60c4a51961df9615a7c..f50d7b30105133fb0146b2b3af811054937ead1e 100644 (file)
@@ -1,12 +1,11 @@
 // istream classes -*- C++ -*-
 
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-// Free Software Foundation, Inc.
+// Copyright (C) 1997-2014 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,
 // 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, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-// 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.
-
-/** @file istream.tcc
+// 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.
+
+// 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/>.
+
+/** @file bits/istream.tcc
  *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
+ *  Do not attempt to use it directly. @headername{istream}
  */
 
 //
 
 #pragma GCC system_header
 
-#include <locale>
-#include <ostream> // For flush()
+#include <bits/cxxabi_forced.h>
 
-_GLIBCXX_BEGIN_NAMESPACE(std)
+namespace std _GLIBCXX_VISIBILITY(default)
+{
+_GLIBCXX_BEGIN_NAMESPACE_VERSION
 
   template<typename _CharT, typename _Traits>
     basic_istream<_CharT, _Traits>::sentry::
     sentry(basic_istream<_CharT, _Traits>& __in, bool __noskip) : _M_ok(false)
     {
-      ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
+      ios_base::iostate __err = ios_base::goodbit;
       if (__in.good())
        {
          if (__in.tie())
            __in.tie()->flush();
-         if (!__noskip && (__in.flags() & ios_base::skipws))
+         if (!__noskip && bool(__in.flags() & ios_base::skipws))
            {
              const __int_type __eof = traits_type::eof();
              __streambuf_type* __sb = __in.rdbuf();
@@ -85,30 +80,6 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
        }
     }
 
-  template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>&
-    basic_istream<_CharT, _Traits>::
-    operator>>(__istream_type& (*__pf)(__istream_type&))
-    { return __pf(*this); }
-
-  template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>&
-    basic_istream<_CharT, _Traits>::
-    operator>>(__ios_type& (*__pf)(__ios_type&))
-    {
-      __pf(*this);
-      return *this;
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>&
-    basic_istream<_CharT, _Traits>::
-    operator>>(ios_base& (*__pf)(ios_base&))
-    {
-      __pf(*this);
-      return *this;
-    }
-
   template<typename _CharT, typename _Traits>
     template<typename _ValueT>
       basic_istream<_CharT, _Traits>&
@@ -118,13 +89,18 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
        sentry __cerb(*this, false);
        if (__cerb)
          {
-           ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-           try
+           ios_base::iostate __err = ios_base::goodbit;
+           __try
              {
                const __num_get_type& __ng = __check_facet(this->_M_num_get);
                __ng.get(*this, 0, *this, __err, __v);
              }
-           catch(...)
+           __catch(__cxxabiv1::__forced_unwind&)
+             {
+               this->_M_setstate(ios_base::badbit);
+               __throw_exception_again;
+             }
+           __catch(...)
              { this->_M_setstate(ios_base::badbit); }
            if (__err)
              this->setstate(__err);
@@ -139,19 +115,44 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
     {
       // _GLIBCXX_RESOLVE_LIB_DEFECTS
       // 118. basic_istream uses nonexistent num_get member functions.
-      long __l;
-      _M_extract(__l);
-      if (!this->fail())
+      sentry __cerb(*this, false);
+      if (__cerb)
        {
-         if (numeric_limits<short>::min() <= __l
-             && __l <= numeric_limits<short>::max())
-           __n = __l;
-         else
-           this->setstate(ios_base::failbit);
+         ios_base::iostate __err = ios_base::goodbit;
+         __try
+           {
+             long __l;
+             const __num_get_type& __ng = __check_facet(this->_M_num_get);
+             __ng.get(*this, 0, *this, __err, __l);
+
+             // _GLIBCXX_RESOLVE_LIB_DEFECTS
+             // 696. istream::operator>>(int&) broken.
+             if (__l < __gnu_cxx::__numeric_traits<short>::__min)
+               {
+                 __err |= ios_base::failbit;
+                 __n = __gnu_cxx::__numeric_traits<short>::__min;
+               }
+             else if (__l > __gnu_cxx::__numeric_traits<short>::__max)
+               {
+                 __err |= ios_base::failbit;
+                 __n = __gnu_cxx::__numeric_traits<short>::__max;
+               }
+             else
+               __n = short(__l);
+           }
+         __catch(__cxxabiv1::__forced_unwind&)
+           {
+             this->_M_setstate(ios_base::badbit);
+             __throw_exception_again;
+           }
+         __catch(...)
+           { this->_M_setstate(ios_base::badbit); }
+         if (__err)
+           this->setstate(__err);
        }
       return *this;
     }
-    
+
   template<typename _CharT, typename _Traits>
     basic_istream<_CharT, _Traits>&
     basic_istream<_CharT, _Traits>::
@@ -159,15 +160,40 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
     {
       // _GLIBCXX_RESOLVE_LIB_DEFECTS
       // 118. basic_istream uses nonexistent num_get member functions.
-      long __l;
-      _M_extract(__l);
-      if (!this->fail())
+      sentry __cerb(*this, false);
+      if (__cerb)
        {
-         if (numeric_limits<int>::min() <= __l
-             && __l <= numeric_limits<int>::max())
-           __n = __l;
-         else
-           this->setstate(ios_base::failbit);
+         ios_base::iostate __err = ios_base::goodbit;
+         __try
+           {
+             long __l;
+             const __num_get_type& __ng = __check_facet(this->_M_num_get);
+             __ng.get(*this, 0, *this, __err, __l);
+
+             // _GLIBCXX_RESOLVE_LIB_DEFECTS
+             // 696. istream::operator>>(int&) broken.
+             if (__l < __gnu_cxx::__numeric_traits<int>::__min)
+               {
+                 __err |= ios_base::failbit;
+                 __n = __gnu_cxx::__numeric_traits<int>::__min;
+               }
+             else if (__l > __gnu_cxx::__numeric_traits<int>::__max)
+               {
+                 __err |= ios_base::failbit;         
+                 __n = __gnu_cxx::__numeric_traits<int>::__max;
+               }
+             else
+               __n = int(__l);
+           }
+         __catch(__cxxabiv1::__forced_unwind&)
+           {
+             this->_M_setstate(ios_base::badbit);
+             __throw_exception_again;
+           }
+         __catch(...)
+           { this->_M_setstate(ios_base::badbit); }
+         if (__err)
+           this->setstate(__err);
        }
       return *this;
     }
@@ -177,11 +203,11 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
     basic_istream<_CharT, _Traits>::
     operator>>(__streambuf_type* __sbout)
     {
-      ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
+      ios_base::iostate __err = ios_base::goodbit;
       sentry __cerb(*this, false);
       if (__cerb && __sbout)
        {
-         try
+         __try
            {
              bool __ineof;
              if (!__copy_streambufs_eof(this->rdbuf(), __sbout, __ineof))
@@ -189,7 +215,12 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
              if (__ineof)
                __err |= ios_base::eofbit;
            }
-         catch(...)
+         __catch(__cxxabiv1::__forced_unwind&)
+           {
+             this->_M_setstate(ios_base::failbit);
+             __throw_exception_again;
+           }
+         __catch(...)
            { this->_M_setstate(ios_base::failbit); }
        }
       else if (!__sbout)
@@ -207,11 +238,11 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
       const int_type __eof = traits_type::eof();
       int_type __c = __eof;
       _M_gcount = 0;
-      ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
+      ios_base::iostate __err = ios_base::goodbit;
       sentry __cerb(*this, true);
       if (__cerb)
        {
-         try
+         __try
            {
              __c = this->rdbuf()->sbumpc();
              // 27.6.1.1 paragraph 3
@@ -220,7 +251,12 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
              else
                __err |= ios_base::eofbit;
            }
-         catch(...)
+         __catch(__cxxabiv1::__forced_unwind&)
+           {
+             this->_M_setstate(ios_base::badbit);
+             __throw_exception_again;
+           }
+         __catch(...)
            { this->_M_setstate(ios_base::badbit); }
        }
       if (!_M_gcount)
@@ -236,11 +272,11 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
     get(char_type& __c)
     {
       _M_gcount = 0;
-      ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
+      ios_base::iostate __err = ios_base::goodbit;
       sentry __cerb(*this, true);
       if (__cerb)
        {
-         try
+         __try
            {
              const int_type __cb = this->rdbuf()->sbumpc();
              // 27.6.1.1 paragraph 3
@@ -252,7 +288,12 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
              else
                __err |= ios_base::eofbit;
            }
-         catch(...)
+         __catch(__cxxabiv1::__forced_unwind&)
+           {
+             this->_M_setstate(ios_base::badbit);
+             __throw_exception_again;
+           }
+         __catch(...)
            { this->_M_setstate(ios_base::badbit); }
        }
       if (!_M_gcount)
@@ -268,11 +309,11 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
     get(char_type* __s, streamsize __n, char_type __delim)
     {
       _M_gcount = 0;
-      ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
+      ios_base::iostate __err = ios_base::goodbit;
       sentry __cerb(*this, true);
       if (__cerb)
        {
-         try
+         __try
            {
              const int_type __idelim = traits_type::to_int_type(__delim);
              const int_type __eof = traits_type::eof();
@@ -290,7 +331,12 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
              if (traits_type::eq_int_type(__c, __eof))
                __err |= ios_base::eofbit;
            }
-         catch(...)
+         __catch(__cxxabiv1::__forced_unwind&)
+           {
+             this->_M_setstate(ios_base::badbit);
+             __throw_exception_again;
+           }
+         __catch(...)
            { this->_M_setstate(ios_base::badbit); }
        }
       // _GLIBCXX_RESOLVE_LIB_DEFECTS
@@ -310,11 +356,11 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
     get(__streambuf_type& __sb, char_type __delim)
     {
       _M_gcount = 0;
-      ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
+      ios_base::iostate __err = ios_base::goodbit;
       sentry __cerb(*this, true);
       if (__cerb)
        {
-         try
+         __try
            {
              const int_type __idelim = traits_type::to_int_type(__delim);
              const int_type __eof = traits_type::eof();
@@ -333,7 +379,12 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
              if (traits_type::eq_int_type(__c, __eof))
                __err |= ios_base::eofbit;
            }
-         catch(...)
+         __catch(__cxxabiv1::__forced_unwind&)
+           {
+             this->_M_setstate(ios_base::badbit);
+             __throw_exception_again;
+           }
+         __catch(...)
            { this->_M_setstate(ios_base::badbit); }
        }
       if (!_M_gcount)
@@ -349,11 +400,11 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
     getline(char_type* __s, streamsize __n, char_type __delim)
     {
       _M_gcount = 0;
-      ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
+      ios_base::iostate __err = ios_base::goodbit;
       sentry __cerb(*this, true);
       if (__cerb)
         {
-          try
+          __try
             {
               const int_type __idelim = traits_type::to_int_type(__delim);
               const int_type __eof = traits_type::eof();
@@ -381,7 +432,12 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
                     __err |= ios_base::failbit;
                 }
             }
-          catch(...)
+         __catch(__cxxabiv1::__forced_unwind&)
+           {
+             this->_M_setstate(ios_base::badbit);
+             __throw_exception_again;
+           }
+          __catch(...)
             { this->_M_setstate(ios_base::badbit); }
         }
       // _GLIBCXX_RESOLVE_LIB_DEFECTS
@@ -407,8 +463,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
       sentry __cerb(*this, true);
       if (__cerb)
        {
-         ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-         try
+         ios_base::iostate __err = ios_base::goodbit;
+         __try
            {
              const int_type __eof = traits_type::eof();
              __streambuf_type* __sb = this->rdbuf();
@@ -418,7 +474,12 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
              else
                _M_gcount = 1;
            }
-         catch(...)
+         __catch(__cxxabiv1::__forced_unwind&)
+           {
+             this->_M_setstate(ios_base::badbit);
+             __throw_exception_again;
+           }
+         __catch(...)
            { this->_M_setstate(ios_base::badbit); }
          if (__err)
            this->setstate(__err);
@@ -435,8 +496,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
       sentry __cerb(*this, true);
       if (__cerb && __n > 0)
         {
-          ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-          try
+          ios_base::iostate __err = ios_base::goodbit;
+          __try
             {
               const int_type __eof = traits_type::eof();
               __streambuf_type* __sb = this->rdbuf();
@@ -458,10 +519,11 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
                      ++_M_gcount;
                      __c = __sb->snextc();
                    }
-                 if (__n == numeric_limits<streamsize>::max()
+                 if (__n == __gnu_cxx::__numeric_traits<streamsize>::__max
                      && !traits_type::eq_int_type(__c, __eof))
                    {
-                     _M_gcount = numeric_limits<streamsize>::min();
+                     _M_gcount =
+                       __gnu_cxx::__numeric_traits<streamsize>::__min;
                      __large_ignore = true;
                    }
                  else
@@ -469,12 +531,17 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
                }
 
              if (__large_ignore)
-               _M_gcount = numeric_limits<streamsize>::max();
+               _M_gcount = __gnu_cxx::__numeric_traits<streamsize>::__max;
 
              if (traits_type::eq_int_type(__c, __eof))
                 __err |= ios_base::eofbit;
             }
-          catch(...)
+         __catch(__cxxabiv1::__forced_unwind&)
+           {
+             this->_M_setstate(ios_base::badbit);
+             __throw_exception_again;
+           }
+          __catch(...)
             { this->_M_setstate(ios_base::badbit); }
           if (__err)
             this->setstate(__err);
@@ -491,8 +558,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
       sentry __cerb(*this, true);
       if (__cerb && __n > 0)
         {
-          ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-          try
+          ios_base::iostate __err = ios_base::goodbit;
+          __try
             {
               const int_type __eof = traits_type::eof();
               __streambuf_type* __sb = this->rdbuf();
@@ -509,11 +576,12 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
                      ++_M_gcount;
                      __c = __sb->snextc();
                    }
-                 if (__n == numeric_limits<streamsize>::max()
+                 if (__n == __gnu_cxx::__numeric_traits<streamsize>::__max
                      && !traits_type::eq_int_type(__c, __eof)
                      && !traits_type::eq_int_type(__c, __delim))
                    {
-                     _M_gcount = numeric_limits<streamsize>::min();
+                     _M_gcount =
+                       __gnu_cxx::__numeric_traits<streamsize>::__min;
                      __large_ignore = true;
                    }
                  else
@@ -521,18 +589,24 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
                }
 
              if (__large_ignore)
-               _M_gcount = numeric_limits<streamsize>::max();
+               _M_gcount = __gnu_cxx::__numeric_traits<streamsize>::__max;
 
               if (traits_type::eq_int_type(__c, __eof))
                 __err |= ios_base::eofbit;
              else if (traits_type::eq_int_type(__c, __delim))
                {
-                 if (_M_gcount < numeric_limits<streamsize>::max())
+                 if (_M_gcount
+                     < __gnu_cxx::__numeric_traits<streamsize>::__max)
                    ++_M_gcount;
                  __sb->sbumpc();
                }
             }
-          catch(...)
+         __catch(__cxxabiv1::__forced_unwind&)
+           {
+             this->_M_setstate(ios_base::badbit);
+             __throw_exception_again;
+           }
+          __catch(...)
             { this->_M_setstate(ios_base::badbit); }
           if (__err)
             this->setstate(__err);
@@ -550,14 +624,19 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
       sentry __cerb(*this, true);
       if (__cerb)
        {
-         ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-         try
+         ios_base::iostate __err = ios_base::goodbit;
+         __try
            {
              __c = this->rdbuf()->sgetc();
              if (traits_type::eq_int_type(__c, traits_type::eof()))
                __err |= ios_base::eofbit;
            }
-         catch(...)
+         __catch(__cxxabiv1::__forced_unwind&)
+           {
+             this->_M_setstate(ios_base::badbit);
+             __throw_exception_again;
+           }
+         __catch(...)
            { this->_M_setstate(ios_base::badbit); }
          if (__err)
            this->setstate(__err);
@@ -574,14 +653,19 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
       sentry __cerb(*this, true);
       if (__cerb)
        {
-         ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-         try
+         ios_base::iostate __err = ios_base::goodbit;
+         __try
            {
              _M_gcount = this->rdbuf()->sgetn(__s, __n);
              if (_M_gcount != __n)
                __err |= (ios_base::eofbit | ios_base::failbit);
            }
-         catch(...)
+         __catch(__cxxabiv1::__forced_unwind&)
+           {
+             this->_M_setstate(ios_base::badbit);
+             __throw_exception_again;
+           }
+         __catch(...)
            { this->_M_setstate(ios_base::badbit); }
          if (__err)
            this->setstate(__err);
@@ -598,8 +682,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
       sentry __cerb(*this, true);
       if (__cerb)
        {
-         ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-         try
+         ios_base::iostate __err = ios_base::goodbit;
+         __try
            {
              // Cannot compare int_type with streamsize generically.
              const streamsize __num = this->rdbuf()->in_avail();
@@ -608,7 +692,12 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
              else if (__num == -1)
                __err |= ios_base::eofbit;
            }
-         catch(...)
+         __catch(__cxxabiv1::__forced_unwind&)
+           {
+             this->_M_setstate(ios_base::badbit);
+             __throw_exception_again;
+           }
+         __catch(...)
            { this->_M_setstate(ios_base::badbit); }
          if (__err)
            this->setstate(__err);
@@ -624,11 +713,13 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
       // _GLIBCXX_RESOLVE_LIB_DEFECTS
       // 60. What is a formatted input function?
       _M_gcount = 0;
+      // Clear eofbit per N3168.
+      this->clear(this->rdstate() & ~ios_base::eofbit);
       sentry __cerb(*this, true);
       if (__cerb)
        {
-         ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-         try
+         ios_base::iostate __err = ios_base::goodbit;
+         __try
            {
              const int_type __eof = traits_type::eof();
              __streambuf_type* __sb = this->rdbuf();
@@ -636,7 +727,12 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
                  || traits_type::eq_int_type(__sb->sputbackc(__c), __eof))
                __err |= ios_base::badbit;
            }
-         catch(...)
+         __catch(__cxxabiv1::__forced_unwind&)
+           {
+             this->_M_setstate(ios_base::badbit);
+             __throw_exception_again;
+           }
+         __catch(...)
            { this->_M_setstate(ios_base::badbit); }
          if (__err)
            this->setstate(__err);
@@ -652,11 +748,13 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
       // _GLIBCXX_RESOLVE_LIB_DEFECTS
       // 60. What is a formatted input function?
       _M_gcount = 0;
+      // Clear eofbit per N3168.
+      this->clear(this->rdstate() & ~ios_base::eofbit);
       sentry __cerb(*this, true);
       if (__cerb)
        {
-         ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-         try
+         ios_base::iostate __err = ios_base::goodbit;
+         __try
            {
              const int_type __eof = traits_type::eof();
              __streambuf_type* __sb = this->rdbuf();
@@ -664,7 +762,12 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
                  || traits_type::eq_int_type(__sb->sungetc(), __eof))
                __err |= ios_base::badbit;
            }
-         catch(...)
+         __catch(__cxxabiv1::__forced_unwind&)
+           {
+             this->_M_setstate(ios_base::badbit);
+             __throw_exception_again;
+           }
+         __catch(...)
            { this->_M_setstate(ios_base::badbit); }
          if (__err)
            this->setstate(__err);
@@ -683,8 +786,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
       sentry __cerb(*this, true);
       if (__cerb)
        {
-         ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-         try
+         ios_base::iostate __err = ios_base::goodbit;
+         __try
            {
              __streambuf_type* __sb = this->rdbuf();
              if (__sb)
@@ -695,7 +798,12 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
                    __ret = 0;
                }
            }
-         catch(...)
+         __catch(__cxxabiv1::__forced_unwind&)
+           {
+             this->_M_setstate(ios_base::badbit);
+             __throw_exception_again;
+           }
+         __catch(...)
            { this->_M_setstate(ios_base::badbit); }
          if (__err)
            this->setstate(__err);
@@ -714,13 +822,18 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
       sentry __cerb(*this, true);
       if (__cerb)
        {
-         try
+         __try
            {
              if (!this->fail())
                __ret = this->rdbuf()->pubseekoff(0, ios_base::cur,
                                                  ios_base::in);
            }
-         catch(...)
+         __catch(__cxxabiv1::__forced_unwind&)
+           {
+             this->_M_setstate(ios_base::badbit);
+             __throw_exception_again;
+           }
+         __catch(...)
            { this->_M_setstate(ios_base::badbit); }
        }
       return __ret;
@@ -733,24 +846,31 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
     {
       // _GLIBCXX_RESOLVE_LIB_DEFECTS
       // DR60.  Do not change _M_gcount.
+      // Clear eofbit per N3168.
+      this->clear(this->rdstate() & ~ios_base::eofbit);
       sentry __cerb(*this, true);
       if (__cerb)
        {
-         ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-         try
+         ios_base::iostate __err = ios_base::goodbit;
+         __try
            {
              if (!this->fail())
                {
                  // 136.  seekp, seekg setting wrong streams?
                  const pos_type __p = this->rdbuf()->pubseekpos(__pos,
                                                                 ios_base::in);
-
-                 // 129. Need error indication from seekp() and seekg()
+                 
+                 // 129.  Need error indication from seekp() and seekg()
                  if (__p == pos_type(off_type(-1)))
                    __err |= ios_base::failbit;
                }
            }
-         catch(...)
+         __catch(__cxxabiv1::__forced_unwind&)
+           {
+             this->_M_setstate(ios_base::badbit);
+             __throw_exception_again;
+           }
+         __catch(...)
            { this->_M_setstate(ios_base::badbit); }
          if (__err)
            this->setstate(__err);
@@ -765,24 +885,31 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
     {
       // _GLIBCXX_RESOLVE_LIB_DEFECTS
       // DR60.  Do not change _M_gcount.
+      // Clear eofbit per N3168.
+      this->clear(this->rdstate() & ~ios_base::eofbit);
       sentry __cerb(*this, true);
       if (__cerb)
        {
-         ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-         try
+         ios_base::iostate __err = ios_base::goodbit;
+         __try
            {
              if (!this->fail())
                {
                  // 136.  seekp, seekg setting wrong streams?
                  const pos_type __p = this->rdbuf()->pubseekoff(__off, __dir,
                                                                 ios_base::in);
-
-                 // 129. Need error indication from seekp() and seekg()
+             
+                 // 129.  Need error indication from seekp() and seekg()
                  if (__p == pos_type(off_type(-1)))
                    __err |= ios_base::failbit;
                }
            }
-         catch(...)
+         __catch(__cxxabiv1::__forced_unwind&)
+           {
+             this->_M_setstate(ios_base::badbit);
+             __throw_exception_again;
+           }
+         __catch(...)
            { this->_M_setstate(ios_base::badbit); }
          if (__err)
            this->setstate(__err);
@@ -801,8 +928,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
       typename __istream_type::sentry __cerb(__in, false);
       if (__cerb)
        {
-         ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-         try
+         ios_base::iostate __err = ios_base::goodbit;
+         __try
            {
              const __int_type __cb = __in.rdbuf()->sbumpc();
              if (!_Traits::eq_int_type(__cb, _Traits::eof()))
@@ -810,7 +937,12 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
              else
                __err |= (ios_base::eofbit | ios_base::failbit);
            }
-         catch(...)
+         __catch(__cxxabiv1::__forced_unwind&)
+           {
+             __in._M_setstate(ios_base::badbit);
+             __throw_exception_again;
+           }
+         __catch(...)
            { __in._M_setstate(ios_base::badbit); }
          if (__err)
            __in.setstate(__err);
@@ -823,22 +955,22 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
     operator>>(basic_istream<_CharT, _Traits>& __in, _CharT* __s)
     {
       typedef basic_istream<_CharT, _Traits>           __istream_type;
-      typedef typename __istream_type::__streambuf_type __streambuf_type;
+      typedef basic_streambuf<_CharT, _Traits>          __streambuf_type;
       typedef typename _Traits::int_type               int_type;
       typedef _CharT                                   char_type;
       typedef ctype<_CharT>                            __ctype_type;
 
       streamsize __extracted = 0;
-      ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
+      ios_base::iostate __err = ios_base::goodbit;
       typename __istream_type::sentry __cerb(__in, false);
       if (__cerb)
        {
-         try
+         __try
            {
              // Figure out how many characters to extract.
              streamsize __num = __in.width();
              if (__num <= 0)
-               __num = numeric_limits<streamsize>::max();
+               __num = __gnu_cxx::__numeric_traits<streamsize>::__max;
 
              const __ctype_type& __ct = use_facet<__ctype_type>(__in.getloc());
 
@@ -863,7 +995,12 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
              *__s = char_type();
              __in.width(0);
            }
-         catch(...)
+         __catch(__cxxabiv1::__forced_unwind&)
+           {
+             __in._M_setstate(ios_base::badbit);
+             __throw_exception_again;
+           }
+         __catch(...)
            { __in._M_setstate(ios_base::badbit); }
        }
       if (!__extracted)
@@ -875,13 +1012,13 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
 
   // 27.6.1.4 Standard basic_istream manipulators
   template<typename _CharT, typename _Traits>
-    basic_istream<_CharT,_Traits>&
-    ws(basic_istream<_CharT,_Traits>& __in)
+    basic_istream<_CharT, _Traits>&
+    ws(basic_istream<_CharT, _Traits>& __in)
     {
       typedef basic_istream<_CharT, _Traits>           __istream_type;
-      typedef typename __istream_type::__streambuf_type __streambuf_type;
-      typedef typename __istream_type::__ctype_type    __ctype_type;
+      typedef basic_streambuf<_CharT, _Traits>          __streambuf_type;
       typedef typename __istream_type::int_type                __int_type;
+      typedef ctype<_CharT>                            __ctype_type;
 
       const __ctype_type& __ct = use_facet<__ctype_type>(__in.getloc());
       const __int_type __eof = _Traits::eof();
@@ -897,142 +1034,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
       return __in;
     }
 
-  // 21.3.7.9 basic_string::getline and operators
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    basic_istream<_CharT, _Traits>&
-    operator>>(basic_istream<_CharT, _Traits>& __in,
-              basic_string<_CharT, _Traits, _Alloc>& __str)
-    {
-      typedef basic_istream<_CharT, _Traits>           __istream_type;
-      typedef typename __istream_type::int_type                __int_type;
-      typedef typename __istream_type::__streambuf_type __streambuf_type;
-      typedef typename __istream_type::__ctype_type    __ctype_type;
-      typedef basic_string<_CharT, _Traits, _Alloc>    __string_type;
-      typedef typename __string_type::size_type                __size_type;
-
-      __size_type __extracted = 0;
-      ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-      typename __istream_type::sentry __cerb(__in, false);
-      if (__cerb)
-       {
-         try
-           {
-             // Avoid reallocation for common case.
-             __str.erase();
-             _CharT __buf[128];
-             __size_type __len = 0;          
-             const streamsize __w = __in.width();
-             const __size_type __n = __w > 0 ? static_cast<__size_type>(__w)
-                                             : __str.max_size();
-             const __ctype_type& __ct = use_facet<__ctype_type>(__in.getloc());
-             const __int_type __eof = _Traits::eof();
-             __streambuf_type* __sb = __in.rdbuf();
-             __int_type __c = __sb->sgetc();
-
-             while (__extracted < __n
-                    && !_Traits::eq_int_type(__c, __eof)
-                    && !__ct.is(ctype_base::space, _Traits::to_char_type(__c)))
-               {
-                 if (__len == sizeof(__buf) / sizeof(_CharT))
-                   {
-                     __str.append(__buf, sizeof(__buf) / sizeof(_CharT));
-                     __len = 0;
-                   }
-                 __buf[__len++] = _Traits::to_char_type(__c);
-                 ++__extracted;
-                 __c = __sb->snextc();
-               }
-             __str.append(__buf, __len);
-
-             if (_Traits::eq_int_type(__c, __eof))
-               __err |= ios_base::eofbit;
-             __in.width(0);
-           }
-         catch(...)
-           {
-             // _GLIBCXX_RESOLVE_LIB_DEFECTS
-             // 91. Description of operator>> and getline() for string<>
-             // might cause endless loop
-             __in._M_setstate(ios_base::badbit);
-           }
-       }
-      // 211.  operator>>(istream&, string&) doesn't set failbit
-      if (!__extracted)
-       __err |= ios_base::failbit;
-      if (__err)
-       __in.setstate(__err);
-      return __in;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    basic_istream<_CharT, _Traits>&
-    getline(basic_istream<_CharT, _Traits>& __in,
-           basic_string<_CharT, _Traits, _Alloc>& __str, _CharT __delim)
-    {
-      typedef basic_istream<_CharT, _Traits>           __istream_type;
-      typedef typename __istream_type::int_type                __int_type;
-      typedef typename __istream_type::__streambuf_type __streambuf_type;
-      typedef typename __istream_type::__ctype_type    __ctype_type;
-      typedef basic_string<_CharT, _Traits, _Alloc>    __string_type;
-      typedef typename __string_type::size_type                __size_type;
-
-      __size_type __extracted = 0;
-      const __size_type __n = __str.max_size();
-      ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-      typename __istream_type::sentry __cerb(__in, true);
-      if (__cerb)
-       {
-         try
-           {
-             __str.erase();
-             const __int_type __idelim = _Traits::to_int_type(__delim);
-             const __int_type __eof = _Traits::eof();
-             __streambuf_type* __sb = __in.rdbuf();
-             __int_type __c = __sb->sgetc();
-
-             while (__extracted < __n
-                    && !_Traits::eq_int_type(__c, __eof)
-                    && !_Traits::eq_int_type(__c, __idelim))
-               {
-                 __str += _Traits::to_char_type(__c);
-                 ++__extracted;
-                 __c = __sb->snextc();
-               }
-
-             if (_Traits::eq_int_type(__c, __eof))
-               __err |= ios_base::eofbit;
-             else if (_Traits::eq_int_type(__c, __idelim))
-               {
-                 ++__extracted;                  
-                 __sb->sbumpc();
-               }
-             else
-               __err |= ios_base::failbit;
-           }
-         catch(...)
-           {
-             // _GLIBCXX_RESOLVE_LIB_DEFECTS
-             // 91. Description of operator>> and getline() for string<>
-             // might cause endless loop
-             __in._M_setstate(ios_base::badbit);
-           }
-       }
-      if (!__extracted)
-       __err |= ios_base::failbit;
-      if (__err)
-       __in.setstate(__err);
-      return __in;
-    }
-
-  template<class _CharT, class _Traits, class _Alloc>
-    inline basic_istream<_CharT,_Traits>&
-    getline(basic_istream<_CharT, _Traits>& __in,
-           basic_string<_CharT,_Traits,_Alloc>& __str)
-    { return getline(__in, __str, __in.widen('\n')); }
-
   // Inhibit implicit instantiations for required instantiations,
   // which are defined via explicit instantiations elsewhere.
-  // NB:  This syntax is a GNU extension.
 #if _GLIBCXX_EXTERN_TEMPLATE
   extern template class basic_istream<char>;
   extern template istream& ws(istream&);
@@ -1043,6 +1046,20 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
   extern template istream& operator>>(istream&, unsigned char*);
   extern template istream& operator>>(istream&, signed char*);
 
+  extern template istream& istream::_M_extract(unsigned short&);
+  extern template istream& istream::_M_extract(unsigned int&);  
+  extern template istream& istream::_M_extract(long&);
+  extern template istream& istream::_M_extract(unsigned long&);
+  extern template istream& istream::_M_extract(bool&);
+#ifdef _GLIBCXX_USE_LONG_LONG
+  extern template istream& istream::_M_extract(long long&);
+  extern template istream& istream::_M_extract(unsigned long long&);
+#endif
+  extern template istream& istream::_M_extract(float&);
+  extern template istream& istream::_M_extract(double&);
+  extern template istream& istream::_M_extract(long double&);
+  extern template istream& istream::_M_extract(void*&);
+
   extern template class basic_iostream<char>;
 
 #ifdef _GLIBCXX_USE_WCHAR_T
@@ -1051,10 +1068,25 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
   extern template wistream& operator>>(wistream&, wchar_t&);
   extern template wistream& operator>>(wistream&, wchar_t*);
 
+  extern template wistream& wistream::_M_extract(unsigned short&);
+  extern template wistream& wistream::_M_extract(unsigned int&);  
+  extern template wistream& wistream::_M_extract(long&);
+  extern template wistream& wistream::_M_extract(unsigned long&);
+  extern template wistream& wistream::_M_extract(bool&);
+#ifdef _GLIBCXX_USE_LONG_LONG
+  extern template wistream& wistream::_M_extract(long long&);
+  extern template wistream& wistream::_M_extract(unsigned long long&);
+#endif
+  extern template wistream& wistream::_M_extract(float&);
+  extern template wistream& wistream::_M_extract(double&);
+  extern template wistream& wistream::_M_extract(long double&);
+  extern template wistream& wistream::_M_extract(void*&);
+
   extern template class basic_iostream<wchar_t>;
 #endif
 #endif
 
-_GLIBCXX_END_NAMESPACE
+_GLIBCXX_END_NAMESPACE_VERSION
+} // namespace std
 
 #endif