diff options
| author | Paolo Carlini <pcarlini@suse.de> | 2004-09-17 14:01:18 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2004-09-17 14:01:18 +0000 |
| commit | c93af6f23d57c9199a6f8e1346c449b29efb5b54 (patch) | |
| tree | 1ddca9e607835e598c22f5aa16291b243f07b419 | |
| parent | cd1a8088eb150e9836c675f8dd7f2950ea658e89 (diff) | |
| download | gcc-c93af6f23d57c9199a6f8e1346c449b29efb5b54.zip gcc-c93af6f23d57c9199a6f8e1346c449b29efb5b54.tar.gz gcc-c93af6f23d57c9199a6f8e1346c449b29efb5b54.tar.bz2 | |
fstream.tcc (xsgetn): Slightly tweak conditional, as per Nathan's original suggestion.
2004-09-17 Paolo Carlini <pcarlini@suse.de>
* include/bits/fstream.tcc (xsgetn): Slightly tweak conditional,
as per Nathan's original suggestion.
From-SVN: r87647
| -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); |