From 3cb513a8f2cd12bc5b5b4d4611595c4b55f9b59a Mon Sep 17 00:00:00 2001 From: Al Date: Sun, 2 Apr 2017 23:28:14 -0400 Subject: [PATCH] [utils] hash_get is no longer a string-only function, can be used for generic hashtables --- src/collections.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/collections.h b/src/collections.h index 48c0f2ec..70f32de1 100644 --- a/src/collections.h +++ b/src/collections.h @@ -87,7 +87,7 @@ KSORT_INIT_STR KHASH_SORT_BY_VALUE(str_uint32, char *, uint32_t, uint32_array) KHASH_SORT_BY_VALUE(str_double, char *, double, double_array) -#define KHASH_STR_GET(name, key_type, val_type) \ +#define KHASH_GET(name, key_type, val_type) \ static bool name##_hash_get(khash_t(name) *h, key_type key, val_type *val) { \ khiter_t k; \ k = kh_get(name, h, (const key_type)key); \ @@ -98,7 +98,8 @@ KHASH_SORT_BY_VALUE(str_double, char *, double, double_array) return false; \ } -KHASH_STR_GET(str_uint32, kh_cstr_t, uint32_t) +KHASH_GET(str_uint32, kh_cstr_t, uint32_t) +KHASH_GET(int_uint32, khint32_t, uint32_t) #define KHASH_STR_INCR(name, val_type) \ static bool name##_hash_incr_by_exists(khash_t(name) *h, const char *key, val_type val, bool *exists) { \