From 124f1eaaa8c7e5dafad8f6ba1898b09b38bac9dc Mon Sep 17 00:00:00 2001
From: Tyge Løvset <60263450+tylo-work@users.noreply.github.com>
Date: Sun, 29 Mar 2020 20:18:57 +0200
Subject: Add files via upload

---
 EXAMPLE.md    |  3 +--
 README.md     | 10 +++++-----
 benchmark.cpp |  8 ++++----
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/EXAMPLE.md b/EXAMPLE.md
index 9c901995..48bc1cc1 100644
--- a/EXAMPLE.md
+++ b/EXAMPLE.md
@@ -56,10 +56,9 @@ declare_CMap(ex, struct Person, CString, cstring_destroy, person_hash, person_co
 
 int main()
 {
-  CMap_ex m6 = cmap_initializer;
+  CMap_ex m6 = cmap_ex_init;
   cmap_ex_put(&m6, person_make("John", "Doe", 12), cstring_make("example"));
   cmap_ex_put(&m6, person_make("Mary", "Sue", 21), cstring_make("another"));
-  
   // ...
   c_foreach (it, cmap_ex, m6) {
       if (cstring_equals(it.item->key.name, "John"))
diff --git a/README.md b/README.md
index e999214f..8e462c7a 100644
--- a/README.md
+++ b/README.md
@@ -40,7 +40,7 @@ Simple CVector of 64bit ints:
 declare_CVector(ix, int64_t); // ix is just an example tag name, use anything without underscore.
 
 int main() {
-    CVector_ix bignums = cvector_initializer; // use cvector_ix_init(); if initializing after declaration.
+    CVector_ix bignums = cvector_ix_init; // use cvector_ix_init(); if initializing after declaration.
     cvector_ix_reserve(&bignums, 100);
     for (size_t i = 0; i<100; ++i)
         cvector_ix_push(&bignums, i * i * i);
@@ -59,7 +59,7 @@ CVector of CString:
 declare_CVector(cs, CString, cstring_destroy); // supply inline destructor of values
 
 int main() {
-    CVector_cs names = cvector_initializer;
+    CVector_cs names = cvector_cs_init;
     cvector_cs_push(&names, cstring_make("Mary"));
     cvector_cs_push(&names, cstring_make("Joe"));
     cstring_assign(&names.data[1], cstring_make("Jake")); // replace Joe
@@ -74,7 +74,7 @@ Simple CMap, int -> int:
 declare_CMap(ii, int, int);
 
 int main() {
-    CMap_ii nums = cmap_initializer;
+    CMap_ii nums = cmap_ii_init;
     cmap_ii_put(&nums, 8, 64);
     cmap_ii_put(&nums, 11, 121);
 
@@ -90,7 +90,7 @@ declare_CMap_stringkey(si, int); // Shorthand macro for the general declare_CMap
 // CString keys are "magically" managed internally, although CMap is ignorant of CString.
 
 int main() {
-    CMap_si nums = cmap_initializer;
+    CMap_si nums = cmap_si_init;
     cmap_si_put(&nums, "Hello", 64);
     cmap_si_put(&nums, "Groovy", 121);
     cmap_si_put(&nums, "Groovy", 200); // overwrite previous
@@ -113,7 +113,7 @@ CMap, with CString -> CString. Temporary CString values are created by "make", a
 declare_CMap_stringkey(ss, CString, cstring_destroy); 
 
 int main() {
-    CMap_ss table = cmap_initializer;
+    CMap_ss table = cmap_ss_init;
     cmap_ss_put(&table, "Make", cstring_make("my"));
     cmap_ss_put(&table, "Sunny", cstring_make("day"));
     printf("Sunny: %s\n", cmap_ss_get(table, "Sunny")->value.str);
diff --git a/benchmark.cpp b/benchmark.cpp
index 03f43cbf..36d4c733 100644
--- a/benchmark.cpp
+++ b/benchmark.cpp
@@ -3,8 +3,8 @@
 #include <time.h>
 
 #include <unordered_map>
-#include <c_lib/cstring.h>
-#include <c_lib/cmap.h>
+#include "c_lib/cstring.h"
+#include "c_lib/cmap.h"
 #include "others/bytell_hash_map.hpp"
 #include "others/robin_hood.hpp"
 
@@ -16,7 +16,7 @@ const size_t seed = 123; // time(NULL);
 const double maxLoadFactor = 0.77;
 #define RAND() rand() * rand()
 
-#define CMAP_SETUP(tag, Key, Value) CMap_##tag map = cmap_initializer; \
+#define CMAP_SETUP(tag, Key, Value) CMap_##tag map = cmap_##tag##_init; \
                                     cmap_##tag##_setMaxLoadFactor(&map, maxLoadFactor)
 #define CMAP_PUT(tag, __key, __value)   cmap_##tag##_put(&map, __key, __value)->value
 #define CMAP_DEL(tag, key)          cmap_##tag##_erase(&map, key)
@@ -107,7 +107,7 @@ int main()
 
     printf("ix entry size %llu\n", sizeof(CMapEntry_ix));
 
-    CVector_s names = cvector_initializer;
+    CVector_s names = cvector_s_init;
     cvector_s_push(&names, cstring_make("Robert"));
     cvector_s_push(&names, cstring_make("Johnny"));
     cvector_s_push(&names, cstring_make("Anne"));
-- 
cgit v1.2.3