Merge pull request #34 from tylov/iter_exp_dont_use

VERSION 4.0 RC

2 files changed, 4 insertions, 4 deletions

diff --git a/benchmarks/misc/string_bench_STC.cpp b/benchmarks/misc/string_bench_STC.cpp
index 648cb1f3..ae8e4c38 100644
--- a/benchmarks/misc/string_bench_STC.cpp
+++ b/benchmarks/misc/string_bench_STC.cpp
@@ -38,7 +38,7 @@ cvec_str read_file(const char* name)
 {
     cvec_str data = cvec_str_init();
     c_auto (cstr, line)
-    c_autovar (FILE* f = fopen(name, "r"), fclose(f))
+    c_with (FILE* f = fopen(name, "r"), fclose(f))
         while (cstr_getline(&line, f))
             cvec_str_emplace_back(&data, cstr_str(&line));
     return data;
@@ -101,7 +101,7 @@ void initShortStringVec(cvec_str* vs, cvec_sv* vsv)
     c_foreach (i, cvec_str, *vs)
     {
         cvec_sv_push_back(vsv, cstr_sv(i.ref));
-        num += cstr_size(*i.ref);
+        num += cstr_size(i.ref);
     }
     std::cout << "num strings: " << cvec_sv_size(vsv) << std::endl;
     std::cout << "avg str len: " << num / (float)cvec_sv_size(vsv) << std::endl;
@@ -147,7 +147,7 @@ void initLongStringVec(cvec_str* vs, cvec_sv* vsv)
     c_foreach (i, cvec_str, *vs)
     {
         cvec_sv_push_back(vsv, cstr_sv(i.ref));
-        num += cstr_size(*i.ref);
+        num += cstr_size(i.ref);
     }
     std::cout << "num strings: " << cvec_sv_size(vsv) << std::endl;
     std::cout << "avg str len: " << num / (float)cvec_sv_size(vsv) << std::endl;
diff --git a/benchmarks/misc/string_bench_STD.cpp b/benchmarks/misc/string_bench_STD.cpp
index 5f033ca1..8bb87937 100644
--- a/benchmarks/misc/string_bench_STD.cpp
+++ b/benchmarks/misc/string_bench_STD.cpp
@@ -17,7 +17,7 @@ std::vector<std::string> read_file(const char* name)
 {
     std::vector<std::string> data;
     c_auto (cstr, line)
-    c_autovar (FILE* f = fopen(name, "r"), fclose(f))
+    c_with (FILE* f = fopen(name, "r"), fclose(f))
         while (cstr_getline(&line, f))
             data.emplace_back(cstr_str(&line));
     return data;