From 726a4d6d5e056501f909f6e6a9122483a44028ad Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Fri, 22 Nov 2002 19:53:53 +0100 Subject: [PATCH] re PR libstdc++/8645 (unnecessary non-0 checks in stl_tree.h) 2002-11-22 Laszlo Ersek Paolo Carlini 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 From-SVN: r59381 --- libstdc++-v3/ChangeLog | 8 ++++++++ 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 + Paolo Carlini + + 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 * 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;