Changeset e5cf551 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:

eb3c271

Parents:

f62f1ee

git-author:

Dzejrou <dzejrou@…> (2018-04-20 15:34:03)

git-committer:

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

Message:

cpp: fixed ambiguities

Location:

uspace/lib/cpp/include

Files:

• impl/deque.hpp (modified) (1 diff)
• internal/insert_iterator.hpp (modified) (2 diffs)

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

@@ -782 +782 @@
                 return insert(
                     position,
-                    aux::insert_iterator{value},
+                    aux::insert_iterator{0u, value},
                     aux::insert_iterator{n}
                 );

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

@@ -60 +60 @@
     {
         public:
-            using difference_type   = unsigned;
+            using difference_type   = unsigned long long;
             using value_type        = T;
-            using iterator_category = forward_iterator_tag;
+            using iterator_category = input_iterator_tag;
             using reference         = value_type&;
             using pointer           = value_type*;
 
-            explicit insert_iterator(const value_type& val)
-                : value_{val}, count_{}
-            { /* DUMMY BODY */ }
-
-            explicit insert_iterator(difference_type count)
-                : value_{}, count_{count}
-            { /* DUMMY BODY */ }
-
-            explicit insert_iterator(const value_type& val, difference_type count)
+            explicit insert_iterator(difference_type count, const value_type& val = value_type{})
                 : value_{val}, count_{count}
             { /* DUMMY BODY */ }
@@ -105 +97 @@
                 ++count_;
 
-                return insert_iterator{value_, count_ - 1};
+                return insert_iterator{count_ - 1, value_};
             }