Changeset 0e5e8bf9 in mainline

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:

8f8f1d1e

Parents:

46cf7bf

git-author:

Dzejrou <dzejrou@…> (2018-05-12 01:08:06)

git-committer:

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

Message:

cpp: fixed bugs found by deque tests

Location:

uspace/lib/cpp/include/impl

Files:

• deque.hpp (modified) (5 diffs)
• iterator.hpp (modified) (1 diff)

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

@@ -460 +460 @@
                 swap(other);
                 other.clear();
+
+                return *this;
             }
 
@@ -577 +579 @@
                 if (sz <= size_)
                 {
-                    for (size_type i = 0; i < size_ - sz; ++i)
+                    auto count = size_ - sz;
+                    for (size_type i = 0; i < count; ++i)
                         pop_back();
                 }
@@ -583 +586 @@
                 {
                     value_type value{};
-                    for (size_type i = 0; i < sz - size_; ++i)
+                    auto count = sz - size_;
+                    for (size_type i = 0; i < count; ++i)
                         push_back(value);
                 }
@@ -592 +596 @@
                 if (sz <= size_)
                 {
-                    for (size_type i = 0; i < size_ - sz; ++i)
+                    auto count = size_ - sz;
+                    for (size_type i = 0; i < count; ++i)
                         pop_back();
                 }
                 else
                 {
-                    for (size_type i = 0; i < sz - size_; ++i)
+                    auto count = sz - size_;
+                    for (size_type i = 0; i < count; ++i)
                         push_back(value);
                 }
@@ -782 +788 @@
                 return insert(
                     position,
-                    aux::insert_iterator{0u, value},
-                    aux::insert_iterator{n}
+                    aux::insert_iterator<int>{0u, value},
+                    aux::insert_iterator<int>{n}
                 );
             }

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

@@ -132 +132 @@
         {
             diff_t diff{};
-            while (++first != last)
+            while (first++ != last)
                 ++diff;