Changeset f9ce7cd in mainline

Timestamp:

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

Author:

Dzejrou <dzejrou@…>

Branches:

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

Children:

6d8a63a

Parents:

9019d85

git-author:

Dzejrou <dzejrou@…> (2018-04-17 20:07:16)

git-committer:

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

Message:

cpp: added erase

File:

• uspace/lib/cpp/include/impl/deque.hpp (modified) (2 diffs)

uspace/lib/cpp/include/impl/deque.hpp

@@ -157 +157 @@
                 operator deque_iterator<T, Allocator>()
                 {
-                    return deque_iterator{deq_, idx_};
+                    return deque_iterator{
+                        const_cast<deque<T, Allocator>&>(deq_), idx_
+                    };
                 }
 
@@ -865 +867 @@
             iterator erase(const_iterator position)
             {
-                // TODO: implement
+                auto idx = position.idx();
+                copy(
+                    iterator{*this, idx + 1},
+                    end(),
+                    iterator{*this, idx}
+                );
+
+                /**
+                 * Note: We need to not only decrement size,
+                 *       but also take care of any issues caused
+                 *       by decrement bucket indices, which pop_back
+                 *       does for us.
+                 */
+                pop_back();
+
+                return iterator{*this, idx};
             }
 
             iterator erase(const_iterator first, const_iterator last)
             {
-                // TODO: implement
+                if (first == last)
+                    return first;
+
+                auto first_idx = first.idx();
+                auto last_idx = last.idx();
+                auto count = distance(first, last);
+
+                copy(
+                    iterator{*this, last_idx},
+                    end(),
+                    iterator{*this, first_idx}
+                );
+
+                for (size_type i = 0; i < count; ++i)
+                    pop_back();
+
+                return iterator{*this, first_idx};
             }