Changeset 21d97e8 in mainline for uspace/lib/cpp/include/internal/rbtree_iterators.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_iterators.hpp (modified) (6 diffs)

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

@@ -78 +78 @@
             rbtree_iterator& operator++()
             {
+                if (end_)
+                    return *this;
+
                 if (current_)
                 {
@@ -102 +105 @@
                 if (end_)
                 {
-                    try_undo_end_();
+                    end_ = false;
 
                     return *this;
@@ -145 +148 @@
             node_type* current_;
             bool end_;
-
-            void try_undo_end_()
-            {
-                if (!current_)
-                    return;
-
-                /**
-                 * We can do this if we are past end().
-                 * This means we are the largest.
-                 */
-                if (current_->find_largest() == current_)
-                    end_ = false;
-            }
     };
 
@@ -224 +214 @@
             rbtree_const_iterator& operator++()
             {
+                if (end_)
+                    return *this;
+
                 if (current_)
                 {
@@ -248 +241 @@
                 if (end_)
                 {
-                    try_undo_end_();
+                    end_ = false;
 
                     return *this;
@@ -286 +279 @@
             const node_type* current_;
             bool end_;
-
-            void try_undo_end_()
-            {
-                if (!current_)
-                    return;
-
-                /**
-                 * We can do this if we are past end().
-                 * This means we are the largest.
-                 */
-                if (current_->find_largest() == current_)
-                    end_ = false;
-            }
     };