diff options
| author | Paolo Carlini <pcarlini@suse.de> | 2003-11-29 22:49:46 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2003-11-29 22:49:46 +0000 |
| commit | 4da2b96035b3922ac9421ac0dec9a975049c91d3 (patch) | |
| tree | fab051310fe537c8babe3e79baa7e3f7403049a7 | |
| parent | d71a8c3b200b60a796c260e6a3bd82d3435d9231 (diff) | |
| download | gcc-4da2b96035b3922ac9421ac0dec9a975049c91d3.zip gcc-4da2b96035b3922ac9421ac0dec9a975049c91d3.tar.gz gcc-4da2b96035b3922ac9421ac0dec9a975049c91d3.tar.bz2 | |
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
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/fstream.tcc | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 5e7d21f..931002bf 100644 --- 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 --- 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; |