DEPRECATED: c_forrange(): replaced with c_forloop(). This uses 'long long' as iter type, i.e. "%lld" printf format.

crange_from() renamed to crange_make().
More docs.

1 files changed, 17 insertions, 17 deletions

diff --git a/benchmarks/picobench/picobench_cmap.cpp b/benchmarks/picobench/picobench_cmap.cpp
index 7d114d30..afc3e3d1 100644
--- a/benchmarks/picobench/picobench_cmap.cpp
+++ b/benchmarks/picobench/picobench_cmap.cpp
@@ -54,14 +54,14 @@ static void ins_and_erase_i(picobench::state& s)
     csrandom(seed);
 
     picobench::scope scope(s);
-    c_forrange (s.iterations())
+    c_forloop (s.iterations())
         map[crandom()];
     map.clear();
     csrandom(seed);
-    c_forrange (s.iterations())
+    c_forloop (s.iterations())
         map[crandom()];
     csrandom(seed);
-    c_forrange (s.iterations())
+    c_forloop (s.iterations())
         map.erase(crandom());
     s.set_result(map.size());
 }
@@ -73,14 +73,14 @@ static void ins_and_erase_cmap_i(picobench::state& s)
     csrandom(seed);
 
     picobench::scope scope(s);
-    c_forrange (s.iterations())
+    c_forloop (s.iterations())
         cmap_i_insert(&map, crandom(), 0);
     cmap_i_clear(&map);
     csrandom(seed);
-    c_forrange (s.iterations())
+    c_forloop (s.iterations())
         cmap_i_insert(&map, crandom(), 0);
     csrandom(seed);
-    c_forrange (s.iterations())
+    c_forloop (s.iterations())
         cmap_i_erase(&map, crandom());
     s.set_result(cmap_i_size(&map));
     cmap_i_drop(&map);
@@ -93,14 +93,14 @@ static void ins_and_erase_cmap_x(picobench::state& s)
     csrandom(seed);
 
     picobench::scope scope(s);
-    c_forrange (s.iterations())
+    c_forloop (s.iterations())
         cmap_x_insert(&map, crandom(), 0);
     cmap_x_clear(&map);
     csrandom(seed);
-    c_forrange (s.iterations())
+    c_forloop (s.iterations())
         cmap_x_insert(&map, crandom(), 0);
     csrandom(seed);
-    c_forrange (s.iterations())
+    c_forloop (s.iterations())
         cmap_x_erase(&map, crandom());
     s.set_result(cmap_x_size(&map));
     cmap_x_drop(&map);
@@ -126,7 +126,7 @@ static void ins_and_access_i(picobench::state& s)
     csrandom(seed);
 
     picobench::scope scope(s);
-    c_forrange (N1)
+    c_forloop (N1)
         result += ++map[crandom() & mask];
     s.set_result(result);
 }
@@ -140,7 +140,7 @@ static void ins_and_access_cmap_i(picobench::state& s)
     csrandom(seed);
 
     picobench::scope scope(s);
-    c_forrange (N1)
+    c_forloop (N1)
         result += ++cmap_i_insert(&map, crandom() & mask, 0).ref->second;
     s.set_result(result);
     cmap_i_drop(&map);
@@ -174,7 +174,7 @@ static void ins_and_access_s(picobench::state& s)
     csrandom(seed);
 
     picobench::scope scope(s);
-    c_forrange (s.iterations()) {
+    c_forloop (s.iterations()) {
         randomize(&str[0], str.size());
         map.emplace(str, str);
         randomize(&str[0], str.size());
@@ -193,7 +193,7 @@ static void ins_and_access_cmap_s(picobench::state& s)
     csrandom(seed);
 
     picobench::scope scope(s);
-    c_forrange (s.iterations()) {
+    c_forloop (s.iterations()) {
         randomize(buf, s.arg());
         //if (s.arg() > 30) { printf("%s\n", buf); exit(0); }
         cmap_str_emplace(&map, buf, buf);
@@ -228,7 +228,7 @@ static void iterate_x(picobench::state& s)
     size_t result = 0;
 
     // measure insert then iterate whole map
-    c_forrange (n, s.iterations()) {
+    c_forloop (n, s.iterations()) {
         map[crandom()] = n;
         if (!(n & K)) for (auto const& keyVal : map)
             result += keyVal.second;
@@ -238,7 +238,7 @@ static void iterate_x(picobench::state& s)
     csrandom(seed);
 
     // measure erase then iterate whole map
-    c_forrange (n, s.iterations()) {
+    c_forloop (n, s.iterations()) {
         map.erase(crandom());
         if (!(n & K)) for (auto const& keyVal : map)
             result += keyVal.second;
@@ -257,7 +257,7 @@ static void iterate_cmap_x(picobench::state& s)
     size_t result = 0;
 
     // measure insert then iterate whole map
-    c_forrange (n, s.iterations()) {
+    c_forloop (n, s.iterations()) {
         cmap_x_insert_or_assign(&map, crandom(), n);
         if (!(n & K)) c_foreach (i, cmap_x, map)
             result += i.ref->second;
@@ -267,7 +267,7 @@ static void iterate_cmap_x(picobench::state& s)
     csrandom(seed);
 
     // measure erase then iterate whole map
-    c_forrange (n, s.iterations()) {
+    c_forloop (n, s.iterations()) {
         cmap_x_erase(&map, crandom());
         if (!(n & K)) c_foreach (i, cmap_x, map)
             result += i.ref->second;