2006-04-29 Paolo Carlini <pcarlini@suse.de>

[pf3gnuchains/gcc-fork.git] / libstdc++-v3 / include / bits / fstream.tcc

diff --git a/libstdc++-v3/include/bits/fstream.tcc b/libstdc++-v3/include/bits/fstream.tcc
index 0228322..5520f9b 100644 (file)
--- a/libstdc++-v3/include/bits/fstream.tcc
+++ b/libstdc++-v3/include/bits/fstream.tcc
@@ -1,6 +1,6 @@
 // File based streams -*- C++ -*-
 
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 // Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
@@ -16,7 +16,7 @@
 
 // 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,
+// 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
@@ -42,8 +42,8 @@
 
 #pragma GCC system_header
 
-namespace std
-{
+_GLIBCXX_BEGIN_NAMESPACE(std)
+
   template<typename _CharT, typename _Traits>
     void
     basic_filebuf<_CharT, _Traits>::
@@ -740,12 +740,15 @@ namespace std
        {
          // Returns pos_type(off_type(-1)) in case of failure.
          __ret = pos_type(_M_file.seekoff(__off, __way));
-         _M_reading = false;
-         _M_writing = false;
-         _M_ext_next = _M_ext_end = _M_ext_buf;
-         _M_set_buffer(-1);
-         _M_state_cur = __state;
-         __ret.state(_M_state_cur);
+         if (__ret != pos_type(off_type(-1)))
+           {
+             _M_reading = false;
+             _M_writing = false;
+             _M_ext_next = _M_ext_end = _M_ext_buf;
+             _M_set_buffer(-1);
+             _M_state_cur = __state;
+             __ret.state(_M_state_cur);
+           }
        }
       return __ret;
     }
@@ -899,6 +902,7 @@ namespace std
   extern template class basic_fstream<wchar_t>;
 #endif
 #endif
-} // namespace std
+
+_GLIBCXX_END_NAMESPACE
 
 #endif