1 files changed, 18 insertions, 18 deletions
diff --git a/stc/csmap.h b/stc/csmap.h
index 0f9fcec2..7b6b04bd 100644
--- a/stc/csmap.h
+++ b/stc/csmap.h
@@ -49,15 +49,15 @@ int main(void) {
     using_csmap_4(X, Key, Mapped, c_default_compare)
 
 #define using_csmap_4(X, Key, Mapped, keyCompare) \
-    using_csmap_8(X, Key, Mapped, keyCompare, c_default_del, c_default_fromraw, c_default_toraw, Mapped)
+    using_csmap_8(X, Key, Mapped, keyCompare, c_plain_del, c_plain_fromraw, c_plain_toraw, Mapped)
 
-#define using_csmap_5(X, Key, Mapped, keyCompare, mappedDel) \
-    using_csmap_8(X, Key, Mapped, keyCompare, mappedDel, c_no_fromraw, c_default_toraw, Mapped)
+#define using_csmap_6(X, Key, Mapped, keyCompare, mappedDel, mappedClone) \
+    using_csmap_8(X, Key, Mapped, keyCompare, mappedDel, mappedClone, c_plain_toraw, Mapped)
 
 #define using_csmap_8(X, Key, Mapped, keyCompare, mappedDel, mappedFromRaw, mappedToRaw, RawMapped) \
     using_csmap_12(X, Key, Mapped, keyCompare, \
                       mappedDel, mappedFromRaw, mappedToRaw, RawMapped, \
-                      c_default_del, c_default_fromraw, c_default_toraw, Key)
+                      c_plain_del, c_plain_fromraw, c_plain_toraw, Key)
 
 #define using_csmap_12(X, Key, Mapped, keyCompareRaw, \
                           mappedDel, mappedFromRaw, mappedToRaw, RawMapped, \
@@ -67,13 +67,13 @@ int main(void) {
                      keyDel, keyFromRaw, keyToRaw, RawKey)
 
 #define using_csmap_keydef(...) c_MACRO_OVERLOAD(using_csmap_keydef, __VA_ARGS__)
-#define using_csmap_keydef_5(X, Key, Mapped, keyCompare, keyDel) \
+#define using_csmap_keydef_6(X, Key, Mapped, keyCompare, keyDel, keyClone) \
     using_csmap_keydef_8(X, Key, Mapped, keyCompare, \
-                            keyDel, c_no_fromraw, c_default_toraw, Key)
+                            keyDel, keyClone, c_plain_toraw, Key)
 #define using_csmap_keydef_8(X, Key, Mapped, keyCompareRaw, \
                                 keyDel, keyFromRaw, keyToRaw, RawKey) \
     _using_AATREE(X, csmap, Key, Mapped, keyCompareRaw, \
-                     c_default_del, c_default_fromraw, c_default_toraw, Mapped, \
+                     c_plain_del, c_plain_fromraw, c_plain_toraw, Mapped, \
                      keyDel, keyFromRaw, keyToRaw, RawKey)
 
 /* csset: */
@@ -84,10 +84,10 @@ int main(void) {
     using_csset_3(X, Key, c_default_compare)
 
 #define using_csset_3(X, Key, keyCompare) \
-    using_csset_7(X, Key, keyCompare, c_default_del, c_default_fromraw, c_default_toraw, Key)
+    using_csset_7(X, Key, keyCompare, c_plain_del, c_plain_fromraw, c_plain_toraw, Key)
 
-#define using_csset_4(X, Key, keyCompare, keyDel) \
-    using_csset_7(X, Key, keyCompare, keyDel, c_no_fromraw, c_default_toraw, Key)
+#define using_csset_5(X, Key, keyCompare, keyDel, keyClone) \
+    using_csset_7(X, Key, keyCompare, keyDel, keyClone, c_plain_toraw, Key)
 
 #define using_csset_7(X, Key, keyCompareRaw, keyDel, keyFromRaw, keyToRaw, RawKey) \
     _using_AATREE(X, csset, Key, Key, keyCompareRaw, \
@@ -106,10 +106,10 @@ int main(void) {
     c_MACRO_OVERLOAD(using_csmap_strkey, __VA_ARGS__)
 
 #define using_csmap_strkey_2(X, Mapped) \
-    _using_AATREE_strkey(X, csmap, Mapped, c_default_del, c_default_fromraw, c_default_toraw, Mapped)
+    _using_AATREE_strkey(X, csmap, Mapped, c_plain_del, c_plain_fromraw, c_plain_toraw, Mapped)
 
-#define using_csmap_strkey_3(X, Mapped, mappedDel) \
-    _using_AATREE_strkey(X, csmap, Mapped, mappedDel, c_no_fromraw, c_default_toraw, Mapped)
+#define using_csmap_strkey_4(X, Mapped, mappedDel, mappedClone) \
+    _using_AATREE_strkey(X, csmap, Mapped, mappedDel, mappedClone, c_plain_toraw, Mapped)
 
 #define using_csmap_strkey_6(X, Mapped, mappedDel, mappedFromRaw, mappedToRaw, RawMapped) \
     _using_AATREE_strkey(X, csmap, Mapped, mappedDel, mappedFromRaw, mappedToRaw, RawMapped)
@@ -126,13 +126,13 @@ int main(void) {
     using_csmap_strval_3(X, Key, c_default_compare)
 
 #define using_csmap_strval_3(X, Key, keyCompare) \
-    using_csmap_strval_7(X, Key, keyCompare, c_default_del, c_default_fromraw, c_default_toraw, Key)
+    using_csmap_strval_7(X, Key, keyCompare, c_plain_del, c_plain_fromraw, c_plain_toraw, Key)
 
-#define using_csmap_strval_4(X, Key, keyCompare, keyDel) \
-    using_csmap_strval_7(X, Key, keyCompare, keyDel, c_no_fromraw, c_default_toraw, Key)
+#define using_csmap_strval_5(X, Key, keyCompare, keyDel, keyClone) \
+    using_csmap_strval_7(X, Key, keyCompare, keyDel, keyClone, c_plain_toraw, Key)
 
-#define using_csmap_strval_7(X, Key, keyCompare, keyDel, keyFromRaw, keyToRaw, RawKey) \
-    _using_AATREE(X, csmap, Key, cstr_t, keyCompare, \
+#define using_csmap_strval_7(X, Key, keyCompareRaw, keyDel, keyFromRaw, keyToRaw, RawKey) \
+    _using_AATREE(X, csmap, Key, cstr_t, keyCompareRaw, \
                      cstr_del, cstr_from, cstr_c_str, const char*, \
                      keyDel, keyFromRaw, keyToRaw, RawKey)