Changeset 947ad139 in mainline

Timestamp:

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

Author:

Dzejrou <dzejrou@…>

Branches:

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

Children:

39e468f

Parents:

04fa158

git-author:

Dzejrou <dzejrou@…> (2018-04-27 15:01:48)

git-committer:

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

Message:

cpp: fixed hash_table::head and changed hint_type to a more descriptive typedef called place_type

File:

• uspace/lib/cpp/include/internal/hash_table.hpp (modified) (6 diffs)

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

@@ -152 +152 @@
 
         template<class Table, class Key>
-        static typename Table::hint_type find_insertion_spot(const Table& table, const Key& key)
+        static typename Table::place_type find_insertion_spot(const Table& table, const Key& key)
         {
             auto idx = table.get_bucket_idx_(key);
@@ -374 +374 @@
 
         template<class Table, class Key>
-        static typename Table::hint_type find_insertion_spot(const Table& table, const Key& key)
+        static typename Table::place_type find_insertion_spot(const Table& table, const Key& key)
         {
             auto idx = table.get_bucket_idx_(key);
@@ -973 +973 @@
             using node_type = list_node<value_type>;
 
-            using hint_type = tuple<
+            using place_type = tuple<
                 hash_table_bucket<value_type, size_type>*,
                 list_node<value_type>*, size_type
@@ -1346 +1346 @@
             }
 
-            bool is_eq_to(const hash_table& other)
+            bool is_eq_to(const hash_table& other) const
             {
                 // TODO: implement
@@ -1359 +1359 @@
             }
 
-            hint_type find_insertion_spot(const key_type& key)
+            place_type find_insertion_spot(const key_type& key) const
             {
                 return Policy::find_insertion_spot(*this, key);
             }
 
-            hint_type find_insertion_spot(key_type&& key)
+            place_type find_insertion_spot(key_type&& key) const
             {
                 return Policy::find_insertion_spot(*this, key);
             }
 
-            const key_type& get_key(const value_type& val)
+            const key_type& get_key(const value_type& val) const
             {
                 return key_extractor_(val);
@@ -1392 +1392 @@
             {
                 if (idx < bucket_count_)
-                    return &table_[idx];
+                    return table_[idx]->head;
                 else
                     return nullptr;