X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=include%2Fhashtable.h;h=d0d12ae7c5b5ab8d80674371cf5bd8f51d55e09e;hb=5aa9223647fbb52fa8941d92c8896ebaf148b41c;hp=0a9ea209fe7ad5a8707fb1981b75235df8831e7d;hpb=329b5ab58cde015f4faec1879d3106f635294dd6;p=nbds

diff --git a/include/hashtable.h b/include/hashtable.h
index 0a9ea20..d0d12ae 100644
--- a/include/hashtable.h
+++ b/include/hashtable.h
@@ -7,18 +7,18 @@ typedef struct ht hashtable_t;
 typedef struct ht_iter ht_iter_t;
 
 hashtable_t * ht_alloc (const datatype_t *key_type);
-uint64_t ht_cas    (hashtable_t *ht, void *key, uint64_t expected_val, uint64_t val);
-uint64_t ht_get    (hashtable_t *ht, void *key);
-uint64_t ht_remove (hashtable_t *ht, void *key);
-uint64_t ht_count  (hashtable_t *ht);
-void     ht_print  (hashtable_t *ht);
-void     ht_free   (hashtable_t *ht);
+map_val_t ht_cas    (hashtable_t *ht, map_key_t key, map_val_t expected_val, map_val_t val);
+map_val_t ht_get    (hashtable_t *ht, map_key_t key);
+map_val_t ht_remove (hashtable_t *ht, map_key_t key);
+size_t    ht_count  (hashtable_t *ht);
+void      ht_print  (hashtable_t *ht);
+void      ht_free   (hashtable_t *ht);
 
-ht_iter_t * ht_iter_begin (hashtable_t *ht, void *key);
-uint64_t    ht_iter_next  (ht_iter_t *iter, void **key_ptr);
+ht_iter_t * ht_iter_begin (hashtable_t *ht, map_key_t key);
+map_val_t   ht_iter_next  (ht_iter_t *iter, map_key_t *key_ptr);
 void        ht_iter_free  (ht_iter_t *iter);
 
-static const map_impl_t ht_map_impl = { 
+static const map_impl_t MAP_IMPL_HT = { 
     (map_alloc_t)ht_alloc, (map_cas_t)ht_cas, (map_get_t)ht_get, (map_remove_t)ht_remove, 
     (map_count_t)ht_count, (map_print_t)ht_print, (map_free_t)ht_free, (map_iter_begin_t)ht_iter_begin,
     (map_iter_next_t)ht_iter_next, (map_iter_free_t)ht_iter_free