diff options
| author | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-10-07 22:44:30 +0000 |
|---|---|---|
| committer | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-10-07 22:44:30 +0000 |
| commit | f2db739d5a3acfcbb7b4681225bfcbdaca288b3f (patch) | |
| tree | 8770b92a416d48ccbf993cff61f603f46a705a44 | |
| parent | f57df4299bbb7431e387840884bbb72fd7d1cc22 (diff) | |
| download | ppe42-gcc-f2db739d5a3acfcbb7b4681225bfcbdaca288b3f.tar.gz ppe42-gcc-f2db739d5a3acfcbb7b4681225bfcbdaca288b3f.zip | |
2004-10-07 Paolo Carlini <pcarlini@suse.de>
* include/bits/list.tcc (operator=): Avoid iterator postincrement.
* include/bits/stl_tree.h (erase(iterator, iterator)): Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@88715 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/list.tcc | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/stl_tree.h | 3 |
3 files changed, 10 insertions, 3 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index daae169960e..6f7891214d4 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2004-10-07 Paolo Carlini <pcarlini@suse.de> + + * include/bits/list.tcc (operator=): Avoid iterator postincrement. + * include/bits/stl_tree.h (erase(iterator, iterator)): Likewise. + 2004-10-07 Benjamin Kosnik <bkoz@redhat.com> * include/tr1: New. diff --git a/libstdc++-v3/include/bits/list.tcc b/libstdc++-v3/include/bits/list.tcc index 851c4ad70cc..59f9d1ad703 100644 --- a/libstdc++-v3/include/bits/list.tcc +++ b/libstdc++-v3/include/bits/list.tcc @@ -125,8 +125,9 @@ namespace _GLIBCXX_STD iterator __last1 = end(); const_iterator __first2 = __x.begin(); const_iterator __last2 = __x.end(); - while (__first1 != __last1 && __first2 != __last2) - *__first1++ = *__first2++; + for (; __first1 != __last1 && __first2 != __last2; + ++__first1, ++__first2) + *__first1 = *__first2; if (__first2 == __last2) erase(__first1, __last1); else diff --git a/libstdc++-v3/include/bits/stl_tree.h b/libstdc++-v3/include/bits/stl_tree.h index 5e21ccdbb42..0b47dd2de73 100644 --- a/libstdc++-v3/include/bits/stl_tree.h +++ b/libstdc++-v3/include/bits/stl_tree.h @@ -1087,7 +1087,8 @@ namespace std if (__first == begin() && __last == end()) clear(); else - while (__first != __last) erase(__first++); + for (; __first != __last; ++__first) + erase(__first); } template<typename _Key, typename _Val, typename _KeyOfValue, |
