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

Timestamp:

2018-07-05T21:41:23Z (6 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_policies.hpp (modified) (3 diffs)

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

@@ -277 +277 @@
 
             size_type res{};
-            while (tree.keys_equal(tree.get_key(*it), key))
+            while (it != tree.end() && tree.keys_equal(tree.get_key(*it), key))
             {
                 ++res;
@@ -291 +291 @@
             auto it = lower_bound_const(tree, key);
 
-            return typename Tree::iterator{it.node(), it.end()};
+            return typename Tree::iterator{
+                const_cast<typename Tree::node_type*>(it.node()), it.end()
+            };
         }
 
@@ -328 +330 @@
             auto it = upper_bound_const(tree, key);
 
-            return typename Tree::iterator{it.node(), it.end()};
+            return typename Tree::iterator{
+                const_cast<typename Tree::node_type*>(it.node()), it.end()
+            };
         }