Changeset adb7dfe1 in mainline

Timestamp:

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

Author:

Dzejrou <dzejrou@…>

Branches:

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

Children:

7ca0410f

Parents:

55d6223

git-author:

Dzejrou <dzejrou@…> (2018-04-30 21:21:00)

git-committer:

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

Message:

cpp: insert_node now does nothing if nothing is passed to it, also paints root black if needed

File:

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

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

@@ -61 +61 @@
             using node_type = rbtree_node<value_type>;
 
-            // TODO: make find/bounds etc templated with key type
-            //       for transparent comparators and leave their management for the
-            //       outer containers
-
             rbtree(const key_compare& kcmp = key_compare{})
                 : root_{nullptr}, size_{}, key_compare_{},
@@ -382 +378 @@
             void insert_node(node_type* node, node_type* parent)
             {
+                if (!node)
+                    return;
+
                 ++size_;
                 if (!parent)
+                {
+                    node->color = rbcolor::black;
                     root_ = node;
+                }
                 else
                 {