Renamed public *_result_t struct member names in maps/sets for consistency with iterators.

3 files changed, 4 insertions, 4 deletions

diff --git a/benchmarks/shootout1_cmap.cpp b/benchmarks/shootout1_cmap.cpp
index f88d5ad6..7f75a242 100644
--- a/benchmarks/shootout1_cmap.cpp
+++ b/benchmarks/shootout1_cmap.cpp
@@ -145,7 +145,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).first->second;

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

     s.set_result(result);

     cmap_i_del(&map);

 }

diff --git a/benchmarks/shootout2_cmap.cpp b/benchmarks/shootout2_cmap.cpp
index 33d9dad8..cea7b6ec 100644
--- a/benchmarks/shootout2_cmap.cpp
+++ b/benchmarks/shootout2_cmap.cpp
@@ -32,8 +32,8 @@ 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_or_assign(&map, key, val).first->second

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

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

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

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

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

 #define CMAP_FOR(X, i)            c_foreach (i, cmap_##X, map)

diff --git a/benchmarks/shootout3_csmap.cpp b/benchmarks/shootout3_csmap.cpp
index d7072445..de14d4ba 100644
--- a/benchmarks/shootout3_csmap.cpp
+++ b/benchmarks/shootout3_csmap.cpp
@@ -169,7 +169,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).first->second;

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

         csmap_i_iter_t it = csmap_i_find(&map, stc64_random() & mask);

         if (it.ref) csmap_i_erase(&map, it.ref->first);

     }