Removed emplace functions if not i_valraw or i_keyraw is defined. Safety/optimize measure.

4 files changed, 20 insertions, 20 deletions

diff --git a/benchmarks/picobench/picobench_cmap.cpp b/benchmarks/picobench/picobench_cmap.cpp
index a045cb7c..f54b3d32 100644
--- a/benchmarks/picobench/picobench_cmap.cpp
+++ b/benchmarks/picobench/picobench_cmap.cpp
@@ -82,11 +82,11 @@ static void ins_and_erase_cmap_i(picobench::state& s)
 

     picobench::scope scope(s);

     c_forrange (s.iterations())

-        cmap_i_emplace(&map, stc64_random(), 0);

+        cmap_i_insert(&map, stc64_random(), 0);

     cmap_i_clear(&map);

     stc64_srandom(seed);

     c_forrange (s.iterations())

-        cmap_i_emplace(&map, stc64_random(), 0);

+        cmap_i_insert(&map, stc64_random(), 0);

     stc64_srandom(seed);

     c_forrange (s.iterations())

         cmap_i_erase(&map, stc64_random());

@@ -102,11 +102,11 @@ static void ins_and_erase_cmap_x(picobench::state& s)
 

     picobench::scope scope(s);

     c_forrange (s.iterations())

-        cmap_x_emplace(&map, stc64_random(), 0);

+        cmap_x_insert(&map, stc64_random(), 0);

     cmap_x_clear(&map);

     stc64_srandom(seed);

     c_forrange (s.iterations())

-        cmap_x_emplace(&map, stc64_random(), 0);

+        cmap_x_insert(&map, stc64_random(), 0);

     stc64_srandom(seed);

     c_forrange (s.iterations())

         cmap_x_erase(&map, stc64_random());

@@ -151,7 +151,7 @@ static void ins_and_access_cmap_i(picobench::state& s)
 

     picobench::scope scope(s);

     c_forrange (N1)

-        result += ++cmap_i_emplace(&map, stc64_random() & mask, 0).ref->second;

+        result += ++cmap_i_insert(&map, stc64_random() & mask, 0).ref->second;

     s.set_result(result);

     cmap_i_drop(&map);

 }

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

     // measure insert then iterate whole map

     c_forrange (n, s.iterations()) {

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

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

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

             result += i.ref->second;

     }

diff --git a/benchmarks/picobench/picobench_csmap.cpp b/benchmarks/picobench/picobench_csmap.cpp
index 90681cd5..71d54832 100644
--- a/benchmarks/picobench/picobench_csmap.cpp
+++ b/benchmarks/picobench/picobench_csmap.cpp
@@ -50,7 +50,7 @@ static void ctor_and_ins_one_csmap_i(picobench::state& s)
     picobench::scope scope(s);

     c_forrange (n, s.iterations()) {

         csmap_i map = csmap_i_init();

-        csmap_i_emplace(&map, n, 0);

+        csmap_i_insert(&map, n, 0);

         result += csmap_i_size(map);

         csmap_i_drop(&map);

     }

@@ -84,7 +84,7 @@ static void insert_csmap_i(picobench::state& s)
     stc64_srandom(seed);

     picobench::scope scope(s);

     c_forrange (n, s.iterations())

-        csmap_i_emplace(&map, stc64_random() & 0xfffffff, n);

+        csmap_i_insert(&map, stc64_random() & 0xfffffff, n);

     s.set_result(csmap_i_size(map));

     csmap_i_drop(&map);

 }

@@ -130,13 +130,13 @@ static void ins_and_erase_csmap_i(picobench::state& s)
 

     picobench::scope scope(s);

     c_forrange (i, s.iterations())

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

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

     result = csmap_i_size(map);

 

     csmap_i_clear(&map);

     stc64_srandom(seed);

     c_forrange (i, s.iterations())

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

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

 

     stc64_srandom(seed);

     c_forrange (s.iterations())

@@ -178,7 +178,7 @@ static void ins_and_access_csmap_i(picobench::state& s)
 

     picobench::scope scope(s);

     c_forrange (s.iterations()) {

-        result += ++csmap_i_emplace(&map, stc64_random() & mask, 0).ref->second;

+        result += ++csmap_i_insert(&map, stc64_random() & mask, 0).ref->second;

         const csmap_i_value* val = csmap_i_get(&map, stc64_random() & mask);

         if (val) csmap_i_erase(&map, val->first);

     }

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

     // measure insert then iterate whole map

     c_forrange (n, s.iterations()) {

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

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

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

             result += i.ref->second;

     }

diff --git a/benchmarks/plotbench/cmap_benchmark.cpp b/benchmarks/plotbench/cmap_benchmark.cpp
index 16aec8c0..d8d1c6ab 100644
--- a/benchmarks/plotbench/cmap_benchmark.cpp
+++ b/benchmarks/plotbench/cmap_benchmark.cpp
@@ -73,8 +73,8 @@ Sample test_stc_unordered_map() {
         stc64_srandom(seed);

         s.test[INSERT].t1 = clock();

         container con = cmap_x_init();

-        c_forrange (i, N/2) cmap_x_emplace(&con, stc64_random() & mask1, i);

-        c_forrange (i, N/2) cmap_x_emplace(&con, i, i);

+        c_forrange (i, N/2) cmap_x_insert(&con, stc64_random() & mask1, i);

+        c_forrange (i, N/2) cmap_x_insert(&con, i, i);

         s.test[INSERT].t2 = clock();

         s.test[INSERT].sum = cmap_x_size(con);

         stc64_srandom(seed);

@@ -86,8 +86,8 @@ Sample test_stc_unordered_map() {
      }{

         container con = cmap_x_init();

         stc64_srandom(seed);

-        c_forrange (i, N/2) cmap_x_emplace(&con, stc64_random() & mask1, i);

-        c_forrange (i, N/2) cmap_x_emplace(&con, i, i);

+        c_forrange (i, N/2) cmap_x_insert(&con, stc64_random() & mask1, i);

+        c_forrange (i, N/2) cmap_x_insert(&con, i, i);

         stc64_srandom(seed);

         s.test[FIND].t1 = clock();

         size_t sum = 0;

diff --git a/benchmarks/plotbench/csmap_benchmark.cpp b/benchmarks/plotbench/csmap_benchmark.cpp
index 4d1621e3..e7603b58 100644
--- a/benchmarks/plotbench/csmap_benchmark.cpp
+++ b/benchmarks/plotbench/csmap_benchmark.cpp
@@ -73,8 +73,8 @@ Sample test_stc_map() {
         stc64_srandom(seed);

         s.test[INSERT].t1 = clock();

         container con = csmap_x_init();

-        c_forrange (i, N/2) csmap_x_emplace(&con, stc64_random() & mask1, i);

-        c_forrange (i, N/2) csmap_x_emplace(&con, i, i);

+        c_forrange (i, N/2) csmap_x_insert(&con, stc64_random() & mask1, i);

+        c_forrange (i, N/2) csmap_x_insert(&con, i, i);

         s.test[INSERT].t2 = clock();

         s.test[INSERT].sum = csmap_x_size(con);

         stc64_srandom(seed);

@@ -86,8 +86,8 @@ Sample test_stc_map() {
      }{

         container con = csmap_x_init();

         stc64_srandom(seed);

-        c_forrange (i, N/2) csmap_x_emplace(&con, stc64_random() & mask1, i);

-        c_forrange (i, N/2) csmap_x_emplace(&con, i, i);

+        c_forrange (i, N/2) csmap_x_insert(&con, stc64_random() & mask1, i);

+        c_forrange (i, N/2) csmap_x_insert(&con, i, i);

         stc64_srandom(seed);

         s.test[FIND].t1 = clock();

         size_t sum = 0;