Changeset 83aea53 in mainline

Timestamp:

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

Author:

Dzejrou <dzejrou@…>

Branches:

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

Children:

b4b01cb

Parents:

b946b052

git-author:

Jaroslav Jindrak <dzejrou@…> (2017-10-25 17:03:18)

git-committer:

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

Message:

cpp: fixed minor bugs in vector

File:

• uspace/lib/cpp/include/impl/vector.hpp (modified) (8 diffs)

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

@@ -394 +394 @@
                 auto pos = const_cast<iterator>(position);
 
-                shift_(pos, 1);
-                allocator_.construct(pos, std::forward<Args>(args)...);
+                pos = shift_(pos, 1);
+                allocator_.construct(pos, forward<Args>(args)...);
 
                 return pos;
@@ -404 +404 @@
                 auto pos = const_cast<iterator>(position);
 
-                shift_(pos, 1);
+                pos = shift_(pos, 1);
                 *pos = x;
 
-                ++size_;
                 return pos;
             }
@@ -415 +414 @@
                 auto pos = const_cast<iterator>(position);
 
-                shift_(pos, 1);
+                pos = shift_(pos, 1);
                 *pos = forward<value_type>(x);
 
-                ++size_;
                 return pos;
             }
@@ -426 +424 @@
                 auto pos = const_cast<iterator>(position);
 
-                shift_(pos, count);
+                pos = shift_(pos, count);
                 auto copy_target = pos;
                 for (size_type i = 0; i < count; ++i)
                     *copy_target++ = x;
 
-                size_ += count;
                 return pos;
             }
@@ -442 +439 @@
                 auto count = static_cast<size_type>(last - first);
 
-                shift_(pos, count);
-                std::copy(first, last, pos);
-
-                size_ += count;
+                pos = shift_(pos, count);
+                copy(first, last, pos);
+
                 return pos;
             }
@@ -453 +449 @@
                 auto pos = const_cast<iterator>(position);
 
-                shift_(pos, init.size());
-                std::copy(init.begin(), init.end(), pos);
-
-                size_ += init.size();
+                pos = shift_(pos, init.size());
+                copy(init.begin(), init.end(), pos);
+
                 return pos;
             }
@@ -550 +545 @@
             }
 
-            void shift_(iterator position, size_type count)
+            iterator shift_(iterator position, size_type count)
             {
                 if (size_ + count < capacity_)
-                    std::copy_backwards(pos, end(), end() + count);
+                {
+                    copy_backward(position, end(), end() + count);
+                    size_ += count;
+
+                    return position;
+                }
                 else
                 {
@@ -566 +566 @@
 
                     // Copy before insertion index.
-                    std::copy(tmp.begin(), tmp.begin() + start_idx, begin());
+                    copy(begin(), begin() + start_idx, tmp.begin());
 
                     // Copy after insertion index.
-                    std::copy(tmp.begin() + end_idx, tmp.end(), begin() + start_idx);
+                    copy(begin() + start_idx, end(), tmp.begin() + end_idx);
 
                     swap(tmp);
+
+                    // Position was invalidated!
+                    return begin() + start_idx;
                 }
             }