Changeset 21d97e8 in mainline for uspace/lib/cpp/include/internal/rbtree.hpp

Timestamp:

2018-07-05T21:41:23Z (7 years ago)

Author:

Dzejrou <dzejrou@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

0fe0f32

Parents:

5608106c

git-author:

Dzejrou <dzejrou@…> (2018-05-14 17:03:57)

git-committer:

Dzejrou <dzejrou@…> (2018-07-05 21:41:23)

Message:

cpp: fixed bugs found by the map tests

File:

• uspace/lib/cpp/include/internal/rbtree.hpp (modified) (3 diffs)

uspace/lib/cpp/include/internal/rbtree.hpp

@@ -353 +353 @@
                 if (!node)
                     return nullptr;
+
+                --size_;
+
+                auto succ = node->successor();
                 if (auto tmp = node->get_node_for_deletion(); tmp != nullptr)
                 {
@@ -359 +363 @@
                      * we popped one node from a list of nodes
                      * with equivalent keys and we can delete it
-                     * and return the original as it is still
-                     * in place.
+                     * and return the successor which was the next
+                     * in the list.
                      */
                     delete tmp;
 
-                    return node;
-                }
-
-                --size_;
-
-                if (node == root_)
-                {
+                    update_root_(succ); // Incase the first in list was root.
+                    return succ;
+                }
+                else if (node == root_)
+                { // Only executed if root_ is unique.
+                    root_ = nullptr;
                     delete node;
-                    root_ = nullptr;
 
                     return nullptr;
                 }
 
-                auto succ = node->successor();
                 if (node->left() && node->right())
                 {
@@ -407 +408 @@
                     else if (node->is_right_child())
                         child->parent()->right(child);
+                    node->parent(nullptr);
+                    node->left(nullptr);
+                    node->right(nullptr);
 
                     // Repair if needed.