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

784c8b6

Parents:

7644d6e

git-author:

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

git-committer:

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

Message:

cpp: fixed return type on multi policy insert and made return type on insert/emplace in hash_table dependent on the policy

Location:

uspace/lib/cpp/include/internal

Files:

• hash_table.hpp (modified) (1 diff)
• hash_table_policies.hpp (modified) (5 diffs)

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

@@ -190 +190 @@
 
             template<class... Args>
-            pair<iterator, bool> emplace(Args&&... args)
+            auto emplace(Args&&... args)
             {
                 return Policy::emplace(*this, forward<Args>(args)...);
             }
 
-            pair<iterator, bool> insert(const value_type& val)
+            auto insert(const value_type& val)
             {
                 return Policy::insert(*this, val);
             }
 
-            pair<iterator, bool> insert(value_type&& val)
+            auto insert(value_type&& val)
             {
                 return Policy::insert(*this, forward<value_type>(val));

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

@@ -366 +366 @@
 
         template<class Table, class... Args>
-        static pair<
-            typename Table::iterator, bool
-        > emplace(Table& table, Args&&... args)
+        static typename Table::iterator emplace(Table& table, Args&&... args)
         {
             using node_type  = typename Table::node_type;
@@ -378 +376 @@
 
         template<class Table, class Value>
-        static pair<
-            typename Table::iterator, bool
-        > insert(Table& table, const Value& val)
+        static typename Table::iterator insert(Table& table, const Value& val)
         {
             using node_type  = typename Table::node_type;
@@ -390 +386 @@
 
         template<class Table, class Value>
-        static pair<
-            typename Table::iterator, bool
-        > insert(Table& table, Value&& val)
+        static typename Table::iterator insert(Table& table, Value&& val)
         {
             using value_type = typename Table::value_type;
@@ -403 +397 @@
 
         template<class Table>
-        static pair<
-            typename Table::iterator, bool
-        > insert(Table& table, typename Table::node_type* node)
+        static typename Table::iterator insert(Table& table, typename Table::node_type* node)
         {
             using iterator   = typename Table::iterator;
@@ -422 +414 @@
                 bucket->prepend(node);
 
-            return make_pair(iterator{
+            return iterator{
                 table.table(), idx,
                 table.bucket_count(),
                 node
-            }, true);
+            };
         }
     };