Commit 726a4d6d by Laszlo Ersek Committed by Paolo Carlini

re PR libstdc++/8645 (unnecessary non-0 checks in stl_tree.h)

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.

Co-Authored-By: Paolo Carlini <pcarlini@unitus.it>

From-SVN: r59381
parent fc589541
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> 2002-11-21 Phil Edwards <pme@gcc.gnu.org>
* docs/html/documentation.html: Fix broken/thinko'd URL. * docs/html/documentation.html: Fix broken/thinko'd URL.
......
...@@ -457,7 +457,7 @@ namespace std ...@@ -457,7 +457,7 @@ namespace std
if (__w->_M_right == 0 if (__w->_M_right == 0
|| __w->_M_right->_M_color == _M_black) || __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; __w->_M_color = _M_red;
_Rb_tree_rotate_right(__w, __root); _Rb_tree_rotate_right(__w, __root);
__w = __x_parent->_M_right; __w = __x_parent->_M_right;
...@@ -494,7 +494,7 @@ namespace std ...@@ -494,7 +494,7 @@ namespace std
{ {
if (__w->_M_left == 0 || __w->_M_left->_M_color == _M_black) 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; __w->_M_color = _M_red;
_Rb_tree_rotate_left(__w, __root); _Rb_tree_rotate_left(__w, __root);
__w = __x_parent->_M_left; __w = __x_parent->_M_left;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment