Changeset 4f22d0c3 in mainline for uspace/lib/cpp/include/internal/rbtree.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:

cf573ec

Parents:

27f1bc0

git-author:

Dzejrou <dzejrou@…> (2018-05-13 23:27:05)

git-committer:

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

Message:

cpp: fixed end(), it was broken because of the change to node lists for multi tables

File:

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

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

@@ -125 +125 @@
             iterator end()
             {
-                return iterator{find_largest_(), true};
+                /**
+                 * In case we have lists of nodes
+                 * we need to get the actual end
+                 * from the largest node.
+                 */
+                auto res = find_largest_();
+                if (res)
+                    return iterator{res->get_end(), true};
+                else
+                    return iterator{res, true};
             }
 
@@ -160 +169 @@
             const_iterator cend() const
             {
-                return const_iterator{find_largest_(), true};
+                auto res = find_largest_();
+                if (res)
+                    return const_iterator{res->get_end(), true};
+                else
+                    return const_iterator{res, true};
             }