Changeset 48f09f2f in mainline

Timestamp:

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

Author:

Dzejrou <dzejrou@…>

Branches:

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

Children:

e8ebed9

Parents:

bb02129

git-author:

Dzejrou <dzejrou@…> (2018-05-01 20:48:53)

git-committer:

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

Message:

cpp: rbtree::find_parent_for_insertion now uses key_type instead of value_type, this caused problems with map::operator[]

Location:

uspace/lib/cpp/include/internal

Files:

• rbtree.hpp (modified) (2 diffs)
• rbtree_policies.hpp (modified) (4 diffs)

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

@@ -313 +313 @@
             }
 
-            node_type* find_parent_for_insertion(const value_type& val) const
+            node_type* find_parent_for_insertion(const key_type& key) const
             {
                 auto current = root_;
@@ -321 +321 @@
                 {
                     parent = current;
-                    if (key_compare_(key_extractor_(val), key_extractor_(current->value)))
+                    if (key_compare_(key, key_extractor_(current->value)))
                         current = current->left;
                     else

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

@@ -170 +170 @@
 
             auto val = value_type{forward<Args>(args)...};
-            auto parent = tree.find_parent_for_insertion(val);
+            auto parent = tree.find_parent_for_insertion(tree.get_key(val));
 
             if (parent && tree.keys_equal(tree.get_key(parent->value), tree.get_key(val)))
@@ -189 +189 @@
             using node_type = typename Tree::node_type;
 
-            auto parent = tree.find_parent_for_insertion(val);
+            auto parent = tree.find_parent_for_insertion(tree.get_key(val));
             if (parent && tree.keys_equal(tree.get_key(parent->value), tree.get_key(val)))
                 return make_pair(iterator{parent, false}, false);
@@ -207 +207 @@
             using node_type = typename Tree::node_type;
 
-            auto parent = tree.find_parent_for_insertion(val);
+            auto parent = tree.find_parent_for_insertion(tree.get_key(val));
             if (parent && tree.keys_equal(tree.get_key(parent->value), tree.get_key(val)))
                 return make_pair(iterator{parent, false}, false);
@@ -388 +388 @@
             using iterator  = typename Tree::iterator;
 
-            auto parent = tree.find_parent_for_insertion(node->value);
+            auto parent = tree.find_parent_for_insertion(tree.get_key(node->value));
             tree.insert_node(node, parent);