Changeset bd2baf8 in mainline

Timestamp:

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

Author:

Dzejrou <dzejrou@…>

Branches:

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

Children:

0893dd23

Parents:

784c8b6

git-author:

Dzejrou <dzejrou@…> (2018-04-30 20:20:42)

git-committer:

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

Message:

cpp: fixed return type of emplace/insert

File:

• uspace/lib/cpp/include/impl/unordered_set.hpp (modified) (3 diffs)

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

@@ -664 +664 @@
 
             template<class... Args>
-            pair<iterator, bool> emplace(Args&&... args)
+            iterator emplace(Args&&... args)
             {
                 return table_.emplace(forward<Args>(args)...);
@@ -672 +672 @@
             iterator emplace_hint(const_iterator, Args&&... args)
             {
-                return emplace(forward<Args>(args)...).first;
-            }
-
-            pair<iterator, bool> insert(const value_type& val)
+                return emplace(forward<Args>(args)...);
+            }
+
+            iterator insert(const value_type& val)
             {
                 return table_.insert(val);
             }
 
-            pair<iterator, bool> insert(value_type&& val)
+            iterator insert(value_type&& val)
             {
                 return table_.insert(forward<value_type>(val));
@@ -687 +687 @@
             iterator insert(const_iterator, const value_type& val)
             {
-                return insert(val).first;
+                return insert(val);
             }
 
             iterator insert(const_iterator, value_type&& val)
             {
-                return insert(forward<value_type>(val)).first;
+                return insert(forward<value_type>(val));
             }