Renamed emplace_put() to emplace_or_assign(). May add put() as alias to insert_or_assign().

3 files changed, 6 insertions, 6 deletions

diff --git a/benchmarks/cmap_benchmark2.cpp b/benchmarks/cmap_benchmark2.cpp
index 2678ac4d..158775d5 100644
--- a/benchmarks/cmap_benchmark2.cpp
+++ b/benchmarks/cmap_benchmark2.cpp
@@ -236,7 +236,7 @@ static void ins_and_access_cmap_s(picobench::state& s)
     picobench::scope scope(s);

     c_forrange (s.iterations()) {

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

-        cmap_str_emplace_put(&map, str.str, str.str);

+        cmap_str_emplace_or_assign(&map, str.str, str.str);

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

         cmap_str_iter_t it = cmap_str_find(&map, str.str);

         if (it.ref) {

@@ -303,7 +303,7 @@ static void iterate_cmap_x(picobench::state& s)
 

     // measure insert then iterate whole map

     c_forrange (n, s.iterations()) {

-        cmap_x_emplace_put(&map, stc64_random(), n);

+        cmap_x_emplace_or_assign(&map, stc64_random(), n);

         if (!(n & K)) c_foreach (i, cmap_x, map)

             result += i.ref->second;

     }

diff --git a/benchmarks/cmap_benchmark3.cpp b/benchmarks/cmap_benchmark3.cpp
index fa7edabd..13905a3f 100644
--- a/benchmarks/cmap_benchmark3.cpp
+++ b/benchmarks/cmap_benchmark3.cpp
@@ -35,7 +35,7 @@ stc64_t rng;
 

 #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##_emplace_put(&map, key, val).first->second

+#define CMAP_PUT(X, key, val)     cmap_##X##_emplace_or_assign(&map, key, val).first->second

 #define CMAP_EMPLACE(X, key, val) cmap_##X##_emplace(&map, key, val).first->second

 #define CMAP_ERASE(X, key)        cmap_##X##_erase(&map, key)

 #define CMAP_FIND(X, key)         (cmap_##X##_find(map, key) != NULL)

diff --git a/benchmarks/csmap_benchmark2.cpp b/benchmarks/csmap_benchmark2.cpp
index 08953868..02d25c51 100644
--- a/benchmarks/csmap_benchmark2.cpp
+++ b/benchmarks/csmap_benchmark2.cpp
@@ -127,7 +127,7 @@ static void ins_and_erase_csmap_i(picobench::state& s)
     csmap_i_clear(&map);

     stc64_srandom(seed);

     c_forrange (i, s.iterations())

-        csmap_i_emplace_put(&map, stc64_random() & mask, i);

+        csmap_i_emplace_or_assign(&map, stc64_random() & mask, i);

 

     stc64_srandom(seed);

     c_forrange (s.iterations())

@@ -222,7 +222,7 @@ static void ins_and_access_csmap_s(picobench::state& s)
     picobench::scope scope(s);

     c_forrange (s.iterations()) {

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

-        csmap_s_emplace_put(&map, str.str, cstr_clone(str));

+        csmap_s_emplace_or_assign(&map, str.str, cstr_clone(str));

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

         csmap_s_iter_t it = csmap_s_find(&map, str.str);

         if (it.ref) {

@@ -282,7 +282,7 @@ static void iterate_csmap_x(picobench::state& s)
 

     // measure insert then iterate whole map

     c_forrange (n, s.iterations()) {

-        csmap_x_emplace_put(&map, stc64_random(), n);

+        csmap_x_emplace_or_assign(&map, stc64_random(), n);

         if (!(n & K)) c_foreach (i, csmap_x, map)

             result += i.ref->second;

     }