Merge pull request #12377 from Cradmon/quickFix
Small fix in core/set.h and similar fix in core/map.h
This commit is contained in:
commit
f74f27a66f
2 changed files with 0 additions and 2 deletions
|
@ -438,7 +438,6 @@ private:
|
||||||
|
|
||||||
Element *rp = ((p_node->left == _data._nil) || (p_node->right == _data._nil)) ? p_node : p_node->_next;
|
Element *rp = ((p_node->left == _data._nil) || (p_node->right == _data._nil)) ? p_node : p_node->_next;
|
||||||
Element *node = (rp->left == _data._nil) ? rp->right : rp->left;
|
Element *node = (rp->left == _data._nil) ? rp->right : rp->left;
|
||||||
node->parent = rp->parent;
|
|
||||||
|
|
||||||
Element *sibling;
|
Element *sibling;
|
||||||
if (rp == rp->parent->left) {
|
if (rp == rp->parent->left) {
|
||||||
|
|
|
@ -424,7 +424,6 @@ private:
|
||||||
|
|
||||||
Element *rp = ((p_node->left == _data._nil) || (p_node->right == _data._nil)) ? p_node : p_node->_next;
|
Element *rp = ((p_node->left == _data._nil) || (p_node->right == _data._nil)) ? p_node : p_node->_next;
|
||||||
Element *node = (rp->left == _data._nil) ? rp->right : rp->left;
|
Element *node = (rp->left == _data._nil) ? rp->right : rp->left;
|
||||||
node->parent = rp->parent;
|
|
||||||
|
|
||||||
Element *sibling;
|
Element *sibling;
|
||||||
if (rp == rp->parent->left) {
|
if (rp == rp->parent->left) {
|
||||||
|
|
Loading…
Reference in a new issue