tommy/libpostal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[utils] fixing key_type in hash_get, adding int64_double map

Browse Source
This commit is contained in:
Al
2017-02-15 22:20:36 -05:00
parent be6f48f109
commit 0196fe8736
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/collections.h
View File

@@ -19,6 +19,7 @@
KHASH_MAP_INIT_INT(int_uint32, uint32_t) KHASH_MAP_INIT_INT(int_uint32, uint32_t)
KHASH_MAP_INIT_INT64(int64_uint32, uint32_t) KHASH_MAP_INIT_INT64(int64_uint32, uint32_t)
KHASH_MAP_INIT_INT64(int64_double, double)
#define kh_char_hash_func(key) (uint32_t)(key) #define kh_char_hash_func(key) (uint32_t)(key)
#define kh_char_hash_equal(a, b) ((a) == (b)) #define kh_char_hash_equal(a, b) ((a) == (b))
@@ -87,7 +88,7 @@ KHASH_SORT_BY_VALUE(str_uint32, char *, uint32_t, uint32_array)
KHASH_SORT_BY_VALUE(str_double, char *, double, double_array) KHASH_SORT_BY_VALUE(str_double, char *, double, double_array)
#define KHASH_STR_GET(name, key_type, val_type) \ #define KHASH_STR_GET(name, key_type, val_type) \
static bool name##_hash_get(khash_t(name) *h, key_type *key, val_type *val) { \ static bool name##_hash_get(khash_t(name) *h, key_type key, val_type *val) { \
khiter_t k; \ khiter_t k; \
k = kh_get(name, h, (const key_type)key); \ k = kh_get(name, h, (const key_type)key); \
if (k != kh_end(h)) { \ if (k != kh_end(h)) { \
@@ -196,5 +197,6 @@ KHASH_STR_TO_ID(str_uint32, uint32_t)
KHASH_INCR(int_uint32, khint32_t, uint32_t) KHASH_INCR(int_uint32, khint32_t, uint32_t)
KHASH_INCR(int64_uint32, khint64_t, uint32_t) KHASH_INCR(int64_uint32, khint64_t, uint32_t)
KHASH_INCR(int64_double, khint64_t, double)
#endif #endif