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

libstdc++-v3/ChangeLog

 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..)
 

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;