diff options
| author | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-11-22 18:53:53 +0000 |
|---|---|---|
| committer | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-11-22 18:53:53 +0000 |
| commit | 7ac96f5db9ddb52d42296ba2c3fbc2914a83b092 (patch) | |
| tree | 654dc79074e10dddccbd97c85f074c42eb904d97 | |
| parent | 7c1f1e393b7f33d2d1e140dd0664436171a94b24 (diff) | |
| download | gcc-7ac96f5db9ddb52d42296ba2c3fbc2914a83b092.tar.gz | |
2002-11-22 Laszlo Ersek <erseklaszlo@chello.hu>
Paolo Carlini <pcarlini@unitus.it>
PR libstdc++/8645
* include/bits/stl_tree.h (_Rb_tree_rebalance_for_erase):
Don't check that __w->_M_left != 0 and __w->_M_right != 0
when they can't be otherwise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@59381 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libstdc++-v3/ChangeLog | 8 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/stl_tree.h | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 826a327b352..c89b01e9243 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,11 @@ +2002-11-22 Laszlo Ersek <erseklaszlo@chello.hu> + Paolo Carlini <pcarlini@unitus.it> + + PR libstdc++/8645 + * include/bits/stl_tree.h (_Rb_tree_rebalance_for_erase): + Don't check that __w->_M_left != 0 and __w->_M_right != 0 + when they can't be otherwise. + 2002-11-21 Phil Edwards <pme@gcc.gnu.org> * docs/html/documentation.html: Fix broken/thinko'd URL. diff --git a/libstdc++-v3/include/bits/stl_tree.h b/libstdc++-v3/include/bits/stl_tree.h index ec218527c0c..1e7fdf5db2d 100644 --- a/libstdc++-v3/include/bits/stl_tree.h +++ b/libstdc++-v3/include/bits/stl_tree.h @@ -457,7 +457,7 @@ namespace std if (__w->_M_right == 0 || __w->_M_right->_M_color == _M_black) { - if (__w->_M_left) __w->_M_left->_M_color = _M_black; + __w->_M_left->_M_color = _M_black; __w->_M_color = _M_red; _Rb_tree_rotate_right(__w, __root); __w = __x_parent->_M_right; @@ -494,7 +494,7 @@ namespace std { if (__w->_M_left == 0 || __w->_M_left->_M_color == _M_black) { - if (__w->_M_right) __w->_M_right->_M_color = _M_black; + __w->_M_right->_M_color = _M_black; __w->_M_color = _M_red; _Rb_tree_rotate_left(__w, __root); __w = __x_parent->_M_left; |