Changeset bc73be3 in mainline for kernel/generic/include/adt/hash_table.h

Timestamp:

2019-06-27T08:51:20Z (7 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

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

Children:

8add15e0

Parents:

ad40b74b (diff), aeba767 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

cpp: merge and resolve conflicts

File:

• kernel/generic/include/adt/hash_table.h (modified) (3 diffs)

kernel/generic/include/adt/hash_table.h

@@ -53 +53 @@
 
         /** Returns the hash of the key. */
-        size_t (*key_hash)(void *key);
+        size_t (*key_hash)(const void *key);
 
         /** True if the items are equal (have the same lookup keys). */
@@ -59 +59 @@
 
         /** Returns true if the key is equal to the item's lookup key. */
-        bool (*key_equal)(void *key, const ht_link_t *item);
+        bool (*key_equal)(const void *key, const ht_link_t *item);
 
         /** Hash table item removal callback.
@@ -94 +94 @@
 extern void hash_table_insert(hash_table_t *, ht_link_t *);
 extern bool hash_table_insert_unique(hash_table_t *, ht_link_t *);
-extern ht_link_t *hash_table_find(const hash_table_t *, void *);
+extern ht_link_t *hash_table_find(const hash_table_t *, const void *);
 extern ht_link_t *hash_table_find_next(const hash_table_t *, ht_link_t *,
     ht_link_t *);
-extern size_t hash_table_remove(hash_table_t *, void *);
+extern size_t hash_table_remove(hash_table_t *, const void *);
 extern void hash_table_remove_item(hash_table_t *, ht_link_t *);
 extern void hash_table_apply(hash_table_t *, bool (*)(ht_link_t *, void *),