From 6b8bb332212b6832c45e84a0af2564a79f8a20ad Mon Sep 17 00:00:00 2001 From: Patrick Pelissier Date: Sun, 15 Apr 2018 01:10:49 +0200 Subject: [PATCH] Convert unsigned long to size_t in function prototypes for 32 bits systems. --- bench/bench-collectionc.c | 4 ++-- bench/bench-densehashmap.cpp | 6 +++--- bench/bench-flathashmap.cpp | 6 +++--- bench/bench-glib.c | 4 ++-- bench/bench-hopscotchmap.cpp | 6 +++--- bench/bench-klib.c | 4 ++-- bench/bench-libdynamic.c | 4 ++-- bench/bench-nedtries.c | 4 ++-- bench/bench-qt.cpp | 6 +++--- bench/bench-sparsepp.cpp | 6 +++--- bench/bench-stl.cpp | 10 +++++----- bench/bench-tommyds.c | 4 ++-- bench/bench-uthash.c | 4 ++-- 13 files changed, 34 insertions(+), 34 deletions(-) diff --git a/bench/bench-collectionc.c b/bench/bench-collectionc.c index 45e5624b..db32d6d8 100644 --- a/bench/bench-collectionc.c +++ b/bench/bench-collectionc.c @@ -126,7 +126,7 @@ static int equal_func(const void *key1, const void *key2) } static void -test_dict(unsigned long n) +test_dict(size_t n) { HashTable *dict; enum cc_stat stat; @@ -178,7 +178,7 @@ static size_t char_hash(const void *a, int l, uint32_t seed) } static void -test_dict_big(unsigned long n) +test_dict_big(size_t n) { HashTable *dict; enum cc_stat stat; diff --git a/bench/bench-densehashmap.cpp b/bench/bench-densehashmap.cpp index 856b19b4..974e9f1e 100644 --- a/bench/bench-densehashmap.cpp +++ b/bench/bench-densehashmap.cpp @@ -25,7 +25,7 @@ using namespace std; /********************************************************************************************/ static void -test_dict2(unsigned long n) +test_dict2(size_t n) { dense_hash_map dict; dict.set_empty_key(-1); @@ -75,7 +75,7 @@ namespace std { } static void -test_dict_big(unsigned long n) +test_dict_big(size_t n) { dense_hash_map dict; struct char_array_s empty, del; @@ -104,7 +104,7 @@ test_dict_big(unsigned long n) /********************************************************************************************/ static void -test_dict_str(unsigned long n) +test_dict_str(size_t n) { dense_hash_map dict; string empty, del; diff --git a/bench/bench-flathashmap.cpp b/bench/bench-flathashmap.cpp index 075b3767..aa50b3c2 100644 --- a/bench/bench-flathashmap.cpp +++ b/bench/bench-flathashmap.cpp @@ -26,7 +26,7 @@ using namespace std; /********************************************************************************************/ static void -test_dict2(unsigned long n) +test_dict2(size_t n) { flat_hash_map dict; for (size_t i = 0; i < n; i++) { @@ -62,7 +62,7 @@ namespace std { } static void -test_dict_big(unsigned long n) +test_dict_big(size_t n) { flat_hash_map dict; @@ -86,7 +86,7 @@ test_dict_big(unsigned long n) /********************************************************************************************/ static void -test_dict_str(unsigned long n) +test_dict_str(size_t n) { flat_hash_map dict; diff --git a/bench/bench-glib.c b/bench/bench-glib.c index 11d27721..3c1d5f2b 100644 --- a/bench/bench-glib.c +++ b/bench/bench-glib.c @@ -97,7 +97,7 @@ static gboolean equal_func(gconstpointer a, gconstpointer b) } static void -test_dict(unsigned long n) +test_dict(size_t n) { GHashTable *dict = g_hash_table_new_full(hash_func, equal_func, free, free); for (size_t i = 0; i < n; i++) { @@ -140,7 +140,7 @@ static guint char_hash(gconstpointer a) } static void -test_dict_big(unsigned long n) +test_dict_big(size_t n) { GHashTable *dict = g_hash_table_new_full(char_hash, char_equal, free, free); for (size_t i = 0; i < n; i++) { diff --git a/bench/bench-hopscotchmap.cpp b/bench/bench-hopscotchmap.cpp index 907054f1..404cd900 100644 --- a/bench/bench-hopscotchmap.cpp +++ b/bench/bench-hopscotchmap.cpp @@ -25,7 +25,7 @@ using namespace std; /********************************************************************************************/ static void -test_dict2(unsigned long n) +test_dict2(size_t n) { tsl::hopscotch_map dict; @@ -63,7 +63,7 @@ namespace std { } static void -test_dict_big(unsigned long n) +test_dict_big(size_t n) { hopscotch_map dict; @@ -87,7 +87,7 @@ test_dict_big(unsigned long n) /********************************************************************************************/ static void -test_dict_str(unsigned long n) +test_dict_str(size_t n) { hopscotch_map dict; diff --git a/bench/bench-klib.c b/bench/bench-klib.c index 6334c1a7..78852e28 100644 --- a/bench/bench-klib.c +++ b/bench/bench-klib.c @@ -98,7 +98,7 @@ static void test_rbtree(size_t n) KHASH_INIT(iun, unsigned long, unsigned long, 1, hash_func, hash_eq) static void -test_dict(unsigned long n) +test_dict(size_t n) { khash_t(iun) *dict = kh_init(iun); @@ -137,7 +137,7 @@ static inline size_t char_hash(const char_array_t a) { KHASH_INIT(iub, char_array_t, char_array_t, 1, char_hash, char_equal_p) static void -test_dict_big(unsigned long n) +test_dict_big(size_t n) { khash_t(iub) *dict = kh_init(iub); diff --git a/bench/bench-libdynamic.c b/bench/bench-libdynamic.c index 80b24513..62762170 100644 --- a/bench/bench-libdynamic.c +++ b/bench/bench-libdynamic.c @@ -64,7 +64,7 @@ struct map_element }; static void -test_dict(unsigned long n) +test_dict(size_t n) { map dict; map_construct(&dict, sizeof(map_element), (map_element[]) {{.key = -1}}, set_func); @@ -115,7 +115,7 @@ struct big_map_element }; static void -test_dict_big(unsigned long n) +test_dict_big(size_t n) { map dict; big_map_element empty; diff --git a/bench/bench-nedtries.c b/bench/bench-nedtries.c index 03e62942..1e6d4801 100644 --- a/bench/bench-nedtries.c +++ b/bench/bench-nedtries.c @@ -26,7 +26,7 @@ static inline size_t fookeyfunct(const foo_t *r) NEDTRIE_GENERATE(static, foo_tree_s, foo_s, link, fookeyfunct, NEDTRIE_NOBBLEZEROS(foo_tree_s)) static void -test_dict(unsigned long n) +test_dict(size_t n) { foo_tree_t footree; NEDTRIE_INIT(&footree); @@ -58,7 +58,7 @@ test_dict(unsigned long n) } static void -test_dict_noalloc(unsigned long n) +test_dict_noalloc(size_t n) { foo_tree_t footree; NEDTRIE_INIT(&footree); diff --git a/bench/bench-qt.cpp b/bench/bench-qt.cpp index 2ac74f5d..47ff0567 100644 --- a/bench/bench-qt.cpp +++ b/bench/bench-qt.cpp @@ -72,7 +72,7 @@ static void test_rbtree(size_t n) /********************************************************************************************/ static void -test_dict1(unsigned long n) +test_dict1(size_t n) { QMap dict; @@ -92,7 +92,7 @@ test_dict1(unsigned long n) /********************************************************************************************/ static void -test_dict2(unsigned long n) +test_dict2(size_t n) { QHash dict; @@ -126,7 +126,7 @@ uint qHash(const char_array_s &k) }; static void -test_dict_big(unsigned long n) +test_dict_big(size_t n) { QHash dict; diff --git a/bench/bench-sparsepp.cpp b/bench/bench-sparsepp.cpp index 68326102..75619428 100644 --- a/bench/bench-sparsepp.cpp +++ b/bench/bench-sparsepp.cpp @@ -25,7 +25,7 @@ using namespace std; /********************************************************************************************/ static void -test_dict2(unsigned long n) +test_dict2(size_t n) { sparse_hash_map dict; @@ -63,7 +63,7 @@ namespace std { } static void -test_dict_big(unsigned long n) +test_dict_big(size_t n) { sparse_hash_map dict; @@ -87,7 +87,7 @@ test_dict_big(unsigned long n) /********************************************************************************************/ static void -test_dict_str(unsigned long n) +test_dict_str(size_t n) { sparse_hash_map dict; diff --git a/bench/bench-stl.cpp b/bench/bench-stl.cpp index ad9a0de6..d320e077 100644 --- a/bench/bench-stl.cpp +++ b/bench/bench-stl.cpp @@ -73,7 +73,7 @@ static void test_rbtree(size_t n) /********************************************************************************************/ static void -test_dict1(unsigned long n) +test_dict1(size_t n) { map dict; @@ -93,7 +93,7 @@ test_dict1(unsigned long n) /********************************************************************************************/ static void -test_dict2(unsigned long n) +test_dict2(size_t n) { unordered_map dict; @@ -131,7 +131,7 @@ namespace std { } static void -test_dict_big(unsigned long n) +test_dict_big(size_t n) { unordered_map dict; @@ -155,7 +155,7 @@ test_dict_big(unsigned long n) /********************************************************************************************/ static void -test_dict_str(unsigned long n) +test_dict_str(size_t n) { unordered_map dict; @@ -176,7 +176,7 @@ test_dict_str(unsigned long n) } static void -test_dict_str2(unsigned long n) +test_dict_str2(size_t n) { map dict; diff --git a/bench/bench-tommyds.c b/bench/bench-tommyds.c index b6972a6a..f05d719d 100644 --- a/bench/bench-tommyds.c +++ b/bench/bench-tommyds.c @@ -124,7 +124,7 @@ static int equal_func(const void* arg, const void *obj_p) } static void -test_dict(unsigned long n) +test_dict(size_t n) { tommy_hashlin dict; tommy_hashlin_init(&dict); @@ -174,7 +174,7 @@ static size_t char_hash(const char *s) } static void -test_dict_big(unsigned long n) +test_dict_big(size_t n) { tommy_hashlin dict; tommy_hashlin_init(&dict); diff --git a/bench/bench-uthash.c b/bench/bench-uthash.c index 8f8faa65..faa70c60 100644 --- a/bench/bench-uthash.c +++ b/bench/bench-uthash.c @@ -85,7 +85,7 @@ struct hash_i_node_s { }; static void -test_dict(unsigned long n) +test_dict(size_t n) { struct hash_i_node_s *dict = NULL; @@ -131,7 +131,7 @@ struct hash_b_node_s { }; static void -test_dict_big(unsigned long n) +test_dict_big(size_t n) { struct hash_b_node_s *dict = NULL;