OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Laszlo Ersek 2002-11-22 19:53:53 +01:00 committed by Paolo Carlini
parent fc589541ad
commit 726a4d6d5e
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libstdc++-v3/ChangeLog
View File

@ -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.

4
libstdc++-v3/include/bits/stl_tree.h
View File

@ -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;