]> 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 2e65b4847b96111fe5974db537c7036fff3a70cd..f50d7b30105133fb0146b2b3af811054937ead1e 100644 (file)
@@ -1,13 +1,11 @@
 // istream classes -*- C++ -*-
 
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-// 2006, 2007
-// 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 <cxxabi-forced.h>
+#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();
@@ -94,18 +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(__cxxabiv1::__forced_unwind&)
+           __catch(__cxxabiv1::__forced_unwind&)
              {
-               this->_M_setstate(ios_base::badbit);            
+               this->_M_setstate(ios_base::badbit);
                __throw_exception_again;
              }
-           catch(...)
+           __catch(...)
              { this->_M_setstate(ios_base::badbit); }
            if (__err)
              this->setstate(__err);
@@ -120,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 (__gnu_cxx::__numeric_traits<short>::__min <= __l
-             && __l <= __gnu_cxx::__numeric_traits<short>::__max)
-           __n = short(__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>::
@@ -140,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 (__gnu_cxx::__numeric_traits<int>::__min <= __l
-             && __l <= __gnu_cxx::__numeric_traits<int>::__max)
-           __n = int(__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;
     }
@@ -158,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))
@@ -170,12 +215,12 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
              if (__ineof)
                __err |= ios_base::eofbit;
            }
-         catch(__cxxabiv1::__forced_unwind&)
+         __catch(__cxxabiv1::__forced_unwind&)
            {
              this->_M_setstate(ios_base::failbit);
              __throw_exception_again;
            }
-         catch(...)
+         __catch(...)
            { this->_M_setstate(ios_base::failbit); }
        }
       else if (!__sbout)
@@ -193,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
@@ -206,12 +251,12 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
              else
                __err |= ios_base::eofbit;
            }
-         catch(__cxxabiv1::__forced_unwind&)
+         __catch(__cxxabiv1::__forced_unwind&)
            {
              this->_M_setstate(ios_base::badbit);
              __throw_exception_again;
            }
-         catch(...)
+         __catch(...)
            { this->_M_setstate(ios_base::badbit); }
        }
       if (!_M_gcount)
@@ -227,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
@@ -243,12 +288,12 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
              else
                __err |= ios_base::eofbit;
            }
-         catch(__cxxabiv1::__forced_unwind&)
+         __catch(__cxxabiv1::__forced_unwind&)
            {
              this->_M_setstate(ios_base::badbit);
              __throw_exception_again;
            }
-         catch(...)
+         __catch(...)
            { this->_M_setstate(ios_base::badbit); }
        }
       if (!_M_gcount)
@@ -264,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();
@@ -286,12 +331,12 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
              if (traits_type::eq_int_type(__c, __eof))
                __err |= ios_base::eofbit;
            }
-         catch(__cxxabiv1::__forced_unwind&)
+         __catch(__cxxabiv1::__forced_unwind&)
            {
              this->_M_setstate(ios_base::badbit);
              __throw_exception_again;
            }
-         catch(...)
+         __catch(...)
            { this->_M_setstate(ios_base::badbit); }
        }
       // _GLIBCXX_RESOLVE_LIB_DEFECTS
@@ -311,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();
@@ -334,12 +379,12 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
              if (traits_type::eq_int_type(__c, __eof))
                __err |= ios_base::eofbit;
            }
-         catch(__cxxabiv1::__forced_unwind&)
+         __catch(__cxxabiv1::__forced_unwind&)
            {
              this->_M_setstate(ios_base::badbit);
              __throw_exception_again;
            }
-         catch(...)
+         __catch(...)
            { this->_M_setstate(ios_base::badbit); }
        }
       if (!_M_gcount)
@@ -355,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();
@@ -387,12 +432,12 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
                     __err |= ios_base::failbit;
                 }
             }
-         catch(__cxxabiv1::__forced_unwind&)
+         __catch(__cxxabiv1::__forced_unwind&)
            {
              this->_M_setstate(ios_base::badbit);
              __throw_exception_again;
            }
-          catch(...)
+          __catch(...)
             { this->_M_setstate(ios_base::badbit); }
         }
       // _GLIBCXX_RESOLVE_LIB_DEFECTS
@@ -418,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();
@@ -429,12 +474,12 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
              else
                _M_gcount = 1;
            }
-         catch(__cxxabiv1::__forced_unwind&)
+         __catch(__cxxabiv1::__forced_unwind&)
            {
              this->_M_setstate(ios_base::badbit);
              __throw_exception_again;
            }
-         catch(...)
+         __catch(...)
            { this->_M_setstate(ios_base::badbit); }
          if (__err)
            this->setstate(__err);
@@ -451,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();
@@ -491,12 +536,12 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
              if (traits_type::eq_int_type(__c, __eof))
                 __err |= ios_base::eofbit;
             }
-         catch(__cxxabiv1::__forced_unwind&)
+         __catch(__cxxabiv1::__forced_unwind&)
            {
              this->_M_setstate(ios_base::badbit);
              __throw_exception_again;
            }
-          catch(...)
+          __catch(...)
             { this->_M_setstate(ios_base::badbit); }
           if (__err)
             this->setstate(__err);
@@ -513,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();
@@ -556,12 +601,12 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
                  __sb->sbumpc();
                }
             }
-         catch(__cxxabiv1::__forced_unwind&)
+         __catch(__cxxabiv1::__forced_unwind&)
            {
              this->_M_setstate(ios_base::badbit);
              __throw_exception_again;
            }
-          catch(...)
+          __catch(...)
             { this->_M_setstate(ios_base::badbit); }
           if (__err)
             this->setstate(__err);
@@ -579,19 +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(__cxxabiv1::__forced_unwind&)
+         __catch(__cxxabiv1::__forced_unwind&)
            {
              this->_M_setstate(ios_base::badbit);
              __throw_exception_again;
            }
-         catch(...)
+         __catch(...)
            { this->_M_setstate(ios_base::badbit); }
          if (__err)
            this->setstate(__err);
@@ -608,19 +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(__cxxabiv1::__forced_unwind&)
+         __catch(__cxxabiv1::__forced_unwind&)
            {
              this->_M_setstate(ios_base::badbit);
              __throw_exception_again;
            }
-         catch(...)
+         __catch(...)
            { this->_M_setstate(ios_base::badbit); }
          if (__err)
            this->setstate(__err);
@@ -637,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();
@@ -647,12 +692,12 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
              else if (__num == -1)
                __err |= ios_base::eofbit;
            }
-         catch(__cxxabiv1::__forced_unwind&)
+         __catch(__cxxabiv1::__forced_unwind&)
            {
              this->_M_setstate(ios_base::badbit);
              __throw_exception_again;
            }
-         catch(...)
+         __catch(...)
            { this->_M_setstate(ios_base::badbit); }
          if (__err)
            this->setstate(__err);
@@ -668,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();
@@ -680,12 +727,12 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
                  || traits_type::eq_int_type(__sb->sputbackc(__c), __eof))
                __err |= ios_base::badbit;
            }
-         catch(__cxxabiv1::__forced_unwind&)
+         __catch(__cxxabiv1::__forced_unwind&)
            {
              this->_M_setstate(ios_base::badbit);
              __throw_exception_again;
            }
-         catch(...)
+         __catch(...)
            { this->_M_setstate(ios_base::badbit); }
          if (__err)
            this->setstate(__err);
@@ -701,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();
@@ -713,12 +762,12 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
                  || traits_type::eq_int_type(__sb->sungetc(), __eof))
                __err |= ios_base::badbit;
            }
-         catch(__cxxabiv1::__forced_unwind&)
+         __catch(__cxxabiv1::__forced_unwind&)
            {
              this->_M_setstate(ios_base::badbit);
              __throw_exception_again;
            }
-         catch(...)
+         __catch(...)
            { this->_M_setstate(ios_base::badbit); }
          if (__err)
            this->setstate(__err);
@@ -737,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)
@@ -749,12 +798,12 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
                    __ret = 0;
                }
            }
-         catch(__cxxabiv1::__forced_unwind&)
+         __catch(__cxxabiv1::__forced_unwind&)
            {
              this->_M_setstate(ios_base::badbit);
              __throw_exception_again;
            }
-         catch(...)
+         __catch(...)
            { this->_M_setstate(ios_base::badbit); }
          if (__err)
            this->setstate(__err);
@@ -770,19 +819,23 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
       // _GLIBCXX_RESOLVE_LIB_DEFECTS
       // DR60.  Do not change _M_gcount.
       pos_type __ret = pos_type(-1);
-      try
-       {
-         if (!this->fail())
-           __ret = this->rdbuf()->pubseekoff(0, ios_base::cur,
-                                             ios_base::in);
-       }
-      catch(__cxxabiv1::__forced_unwind&)
+      sentry __cerb(*this, true);
+      if (__cerb)
        {
-         this->_M_setstate(ios_base::badbit);
-         __throw_exception_again;
+         __try
+           {
+             if (!this->fail())
+               __ret = this->rdbuf()->pubseekoff(0, ios_base::cur,
+                                                 ios_base::in);
+           }
+         __catch(__cxxabiv1::__forced_unwind&)
+           {
+             this->_M_setstate(ios_base::badbit);
+             __throw_exception_again;
+           }
+         __catch(...)
+           { this->_M_setstate(ios_base::badbit); }
        }
-      catch(...)
-       { this->_M_setstate(ios_base::badbit); }
       return __ret;
     }
 
@@ -793,29 +846,35 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
     {
       // _GLIBCXX_RESOLVE_LIB_DEFECTS
       // DR60.  Do not change _M_gcount.
-      ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-      try
+      // Clear eofbit per N3168.
+      this->clear(this->rdstate() & ~ios_base::eofbit);
+      sentry __cerb(*this, true);
+      if (__cerb)
        {
-         if (!this->fail())
+         ios_base::iostate __err = ios_base::goodbit;
+         __try
            {
-             // 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()
-             if (__p == pos_type(off_type(-1)))
-               __err |= ios_base::failbit;
+             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()
+                 if (__p == pos_type(off_type(-1)))
+                   __err |= ios_base::failbit;
+               }
            }
+         __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);
        }
-      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;
     }
 
@@ -826,29 +885,35 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
     {
       // _GLIBCXX_RESOLVE_LIB_DEFECTS
       // DR60.  Do not change _M_gcount.
-      ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-      try
+      // Clear eofbit per N3168.
+      this->clear(this->rdstate() & ~ios_base::eofbit);
+      sentry __cerb(*this, true);
+      if (__cerb)
        {
-         if (!this->fail())
+         ios_base::iostate __err = ios_base::goodbit;
+         __try
            {
-             // 136.  seekp, seekg setting wrong streams?
-             const pos_type __p = this->rdbuf()->pubseekoff(__off, __dir,
-                                                            ios_base::in);
+             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()
-             if (__p == pos_type(off_type(-1)))
-               __err |= ios_base::failbit;
+                 // 129.  Need error indication from seekp() and seekg()
+                 if (__p == pos_type(off_type(-1)))
+                   __err |= ios_base::failbit;
+               }
            }
+         __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);
        }
-      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;
     }
 
@@ -863,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()))
@@ -872,12 +937,12 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
              else
                __err |= (ios_base::eofbit | ios_base::failbit);
            }
-         catch(__cxxabiv1::__forced_unwind&)
+         __catch(__cxxabiv1::__forced_unwind&)
            {
              __in._M_setstate(ios_base::badbit);
              __throw_exception_again;
            }
-         catch(...)
+         __catch(...)
            { __in._M_setstate(ios_base::badbit); }
          if (__err)
            __in.setstate(__err);
@@ -896,11 +961,11 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
       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();
@@ -930,12 +995,12 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
              *__s = char_type();
              __in.width(0);
            }
-         catch(__cxxabiv1::__forced_unwind&)
+         __catch(__cxxabiv1::__forced_unwind&)
            {
              __in._M_setstate(ios_base::badbit);
              __throw_exception_again;
            }
-         catch(...)
+         __catch(...)
            { __in._M_setstate(ios_base::badbit); }
        }
       if (!__extracted)
@@ -971,7 +1036,6 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
 
   // 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&);
@@ -1022,6 +1086,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
 #endif
 #endif
 
-_GLIBCXX_END_NAMESPACE
+_GLIBCXX_END_NAMESPACE_VERSION
+} // namespace std
 
 #endif