Some improvements and cleanup: CRegex, CMap.

2 files changed, 7 insertions, 6 deletions

diff --git a/benchmarks/picobench/picobench_cmap.cpp b/benchmarks/picobench/picobench_cmap.cpp
index f54b3d32..15ab2aa7 100644
--- a/benchmarks/picobench/picobench_cmap.cpp
+++ b/benchmarks/picobench/picobench_cmap.cpp
@@ -208,7 +208,8 @@ static void ins_and_access_cmap_s(picobench::state& s)
         randomize(str.str, cstr_size(str));

         //if (cstr_size(str) > 30) { printf("%s\n", str.str); exit(0); }

         cmap_str_emplace(&map, str.str, str.str);

-        //randomize(str.str, cstr_size(str));

+

+        randomize(str.str, cstr_size(str));

         result += cmap_str_erase(&map, str.str);

     }

     s.set_result(result + cmap_str_size(map));

diff --git a/benchmarks/shootout_hashmaps.cpp b/benchmarks/shootout_hashmaps.cpp
index 5307da0c..6c8c1f00 100644
--- a/benchmarks/shootout_hashmaps.cpp
+++ b/benchmarks/shootout_hashmaps.cpp
@@ -209,7 +209,7 @@ size_t seed;
         M##_PUT(X, RAND(keybits), i); \
     size_t x = 300000000/M##_SIZE(X); \
     clock_t difference, before = clock(); \
-    for (int k=0; k < x; k++) M##_FOR (X, it) \
+    for (size_t k=0; k < x; k++) M##_FOR (X, it) \
         sum += M##_ITEM(X, it); \
     difference = clock() - before; \
     printf(#M ": time: %5.02f, size: %zu, buckets: %8zu, repeats: %zu, sum: %zu\n", \
@@ -256,10 +256,10 @@ enum {
 
 int main(int argc, char* argv[])
 {
-    int n_mill = argc >= 2 ? atoi(argv[1]) : DEFAULT_N_MILL;
-    int keybits = argc >= 3 ? atoi(argv[2]) : DEFAULT_KEYBITS;
-    int n = n_mill * 1000000;
-    int N0 = n, N1 = n/2, N2 = n/2, N3 = n, N4 = n, N5 = n;
+    unsigned n_mill = argc >= 2 ? atoi(argv[1]) : DEFAULT_N_MILL;
+    unsigned keybits = argc >= 3 ? atoi(argv[2]) : DEFAULT_KEYBITS;
+    unsigned n = n_mill * 1000000;
+    unsigned N0 = n, N1 = n/2, N2 = n/2, N3 = n, N4 = n, N5 = n;
     seed = time(NULL); // 1636306010;
 
     printf("\nUnordered hash map shootout\n");