From b3d9e68fa2c2ec9ebe7e3f08045d01db5b720eea Mon Sep 17 00:00:00 2001
From: Tyge Løvset <tylo@norceresearch.no>
Date: Sat, 30 Jan 2021 23:05:36 +0100
Subject: Internal changes: removed use of cmap_inits and set_inits. Use
 cmap_x_init() and cset_X_init(). Minor changes in cvec, csmap, cstr, crandom.

---
 benchmarks/cmap_benchmark.cpp  |  2 +-
 benchmarks/cmap_benchmark2.cpp | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'benchmarks')

diff --git a/benchmarks/cmap_benchmark.cpp b/benchmarks/cmap_benchmark.cpp
index 967c8abe..1f5c6fa1 100644
--- a/benchmarks/cmap_benchmark.cpp
+++ b/benchmarks/cmap_benchmark.cpp
@@ -33,7 +33,7 @@ stc64_t rng;
 #define RAND(N) (stc64_rand(&rng) & ((1 << N) - 1))
 
 
-#define CMAP_SETUP(X, Key, Value) cmap_##X map = cmap_inits \
+#define CMAP_SETUP(X, Key, Value) cmap_##X map = cmap_##X##_init() \
                                   ; cmap_##X##_set_load_factors(&map, 0.0, max_load_factor)
 #define CMAP_PUT(X, key, val)     cmap_##X##_put(&map, key, val).first->second
 #define CMAP_EMPLACE(X, key, val) cmap_##X##_emplace(&map, key, val).first->second
diff --git a/benchmarks/cmap_benchmark2.cpp b/benchmarks/cmap_benchmark2.cpp
index cda8c15b..8624b741 100644
--- a/benchmarks/cmap_benchmark2.cpp
+++ b/benchmarks/cmap_benchmark2.cpp
@@ -66,7 +66,7 @@ static void ctor_and_ins_one_cmap_i(picobench::state& s)
 
     picobench::scope scope(s);
     c_forrange (n, s.iterations()) {
-        cmap_i map = cmap_inits;
+        cmap_i map = cmap_i_init();
         cmap_i_emplace(&map, n, 0);
         result += cmap_i_size(map);
         cmap_i_del(&map);
@@ -109,7 +109,7 @@ static void ins_and_erase_i(picobench::state& s)
 
 static void ins_and_erase_cmap_i(picobench::state& s)
 {
-    cmap_i map = cmap_inits;
+    cmap_i map = cmap_i_init();
     cmap_i_set_load_factors(&map, 0.0, MaxLoadFactor100 / 100.0);
     stc64_srandom(seed);
 
@@ -158,7 +158,7 @@ static void ins_and_access_cmap_i(picobench::state& s)
 {
     uint64_t mask = (1ull << s.arg()) - 1;
     size_t result = 0;
-    cmap_i map = cmap_inits;
+    cmap_i map = cmap_i_init();
     cmap_i_set_load_factors(&map, 0.0, MaxLoadFactor100 / 100.0);
     stc64_srandom(seed);
 
@@ -214,7 +214,7 @@ static void ins_and_access_cmap_s(picobench::state& s)
 {
     cstr str = cstr_with_size(s.arg(), 'x');
     size_t result = 0;
-    cmap_s map = cmap_inits;
+    cmap_s map = cmap_s_init();
     cmap_s_set_load_factors(&map, 0.0, MaxLoadFactor100 / 100.0);
     stc64_srandom(seed);
 
@@ -278,7 +278,7 @@ static void iterate_x(picobench::state& s)
 
 static void iterate_cmap_x(picobench::state& s)
 {
-    cmap_x map = cmap_inits;
+    cmap_x map = cmap_x_init();
     cmap_x_set_load_factors(&map, 0.3, MaxLoadFactor100 / 100.0);
     uint64_t K = (1ull << s.arg()) - 1;
 
-- 
cgit v1.2.3