diff options
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/fstream.tcc | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 6dfa61e..f3f965d 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,10 @@ 2004-09-17 Paolo Carlini <pcarlini@suse.de> + * include/bits/fstream.tcc (xsgetn): Slightly tweak conditional, + as per Nathan's original suggestion. + +2004-09-17 Paolo Carlini <pcarlini@suse.de> + * testsuite/ext/mt_allocator/tune-1.cc: Use VERIFY, clean up a bit. * testsuite/ext/mt_allocator/tune-2.cc: Likewise. diff --git a/libstdc++-v3/include/bits/fstream.tcc b/libstdc++-v3/include/bits/fstream.tcc index d3ea37f..25a4d48 100644 --- a/libstdc++-v3/include/bits/fstream.tcc +++ b/libstdc++-v3/include/bits/fstream.tcc @@ -527,7 +527,7 @@ namespace std { if (__avail == 1) *__s = *this->gptr(); - else if (__avail > 1) + else traits_type::copy(__s, this->gptr(), __avail); __s += __avail; this->gbump(__avail); |