diff options
| author | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-09-17 14:01:18 +0000 |
|---|---|---|
| committer | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-09-17 14:01:18 +0000 |
| commit | 260f69c2f519247cec2ce160fdc494de50363e49 (patch) | |
| tree | 1ddca9e607835e598c22f5aa16291b243f07b419 /libstdc++-v3 | |
| parent | 91acd86c1706c9202d2be725d75c2742f4ecf0a8 (diff) | |
| download | gcc-260f69c2f519247cec2ce160fdc494de50363e49.tar.gz | |
2004-09-17 Paolo Carlini <pcarlini@suse.de>
* include/bits/fstream.tcc (xsgetn): Slightly tweak conditional,
as per Nathan's original suggestion.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@87647 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3')
| -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 6dfa61ead49..f3f965d25e9 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 d3ea37ffab1..25a4d48cb72 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); |