fstream.tcc (underflow): Minor tweaks in preparation for libstdc++/13217.

2003-11-29  Paolo Carlini  <pcarlini@suse.de>

	* include/bits/fstream.tcc (underflow): Minor tweaks in
	preparation for libstdc++/13217.

From-SVN: r74038

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 5e7d21f..931002b 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,10 @@
 2003-11-29  Paolo Carlini  <pcarlini@suse.de>
 
+       * include/bits/fstream.tcc (underflow): Minor tweaks in
+       preparation for libstdc++/13217.
+
+2003-11-29  Paolo Carlini  <pcarlini@suse.de>
+
        * testsuite/27_io/basic_filebuf/imbue/char/13171-2.cc:
        Tweak for a few small problems (fix timings, use VERIFY..)
 

diff --git a/libstdc++-v3/include/bits/fstream.tcc b/libstdc++-v3/include/bits/fstream.tcc
index db46588..fe72183 100644 (file)
--- a/libstdc++-v3/include/bits/fstream.tcc
+++ b/libstdc++-v3/include/bits/fstream.tcc
@@ -286,7 +286,7 @@ namespace std
 
                  __rlen = 1;
                }
-             while (!__got_eof && __ilen == 0);
+             while (__ilen == 0 && !__got_eof);
            }
 
          if (__ilen > 0)
@@ -307,7 +307,7 @@ namespace std
              if (__r == codecvt_base::partial)
                __throw_ios_failure("incomplete character in file");
            }
-         else if (__r == codecvt_base::error)
+         else
            __throw_ios_failure("invalid byte sequence in file");
        }
       return __ret;