Reverted c_trivial_*() to c_default_*().

3 files changed, 14 insertions, 14 deletions

diff --git a/benchmarks/others/carray_v1.h b/benchmarks/others/carray_v1.h
index 4b1c71db..65777416 100644
--- a/benchmarks/others/carray_v1.h
+++ b/benchmarks/others/carray_v1.h
@@ -49,7 +49,7 @@ int main()
 #define using_carray2(...) c_MACRO_OVERLOAD(using_carray2, __VA_ARGS__)

 

 #define using_carray2_2(X, Value) \

-    using_carray2_4(X, Value, c_trivial_del, c_trivial_fromraw)

+    using_carray2_4(X, Value, c_default_del, c_default_fromraw)

 

 #define using_carray2_4(X, Value, valueDel, valueClone) \

 \

@@ -120,7 +120,7 @@ int main()
 #define using_carray3(...) c_MACRO_OVERLOAD(using_carray3, __VA_ARGS__)

 

 #define using_carray3_2(X, Value) \

-    using_carray3_4(X, Value, c_trivial_del, c_trivial_fromraw)

+    using_carray3_4(X, Value, c_default_del, c_default_fromraw)

 

 #define using_carray3_4(X, Value, valueDel, valueClone) \

 \

diff --git a/benchmarks/others/clist_v1.h b/benchmarks/others/clist_v1.h
index 80484dba..00e04e9b 100644
--- a/benchmarks/others/clist_v1.h
+++ b/benchmarks/others/clist_v1.h
@@ -60,11 +60,11 @@
 #define using_clist_2(X, Value) \

             using_clist_3(X, Value, c_default_compare)

 #define using_clist_3(X, Value, valueCompare) \

-            using_clist_5(X, Value, valueCompare, c_trivial_del, c_trivial_fromraw)

+            using_clist_5(X, Value, valueCompare, c_default_del, c_default_fromraw)

 #define using_clist_4(X, Value, valueCompare, valueDel) \

             using_clist_5(X, Value, valueCompare, valueDel, c_no_clone)

 #define using_clist_5(X, Value, valueCompare, valueDel, valueClone) \

-            _c_using_clist(clist_##X, Value, valueCompare, valueDel, valueClone, c_trivial_toraw, Value)

+            _c_using_clist(clist_##X, Value, valueCompare, valueDel, valueClone, c_default_toraw, Value)

 #define using_clist_7(X, Value, valueCompare, valueDel, valueFromRaw, valueToRaw, RawValue) \

             _c_using_clist(clist_##X, Value, valueCompare, valueDel, valueFromRaw, valueToRaw, RawValue)

 

diff --git a/benchmarks/others/csmap_v1.h b/benchmarks/others/csmap_v1.h
index fa86c91c..061b1dfe 100644
--- a/benchmarks/others/csmap_v1.h
+++ b/benchmarks/others/csmap_v1.h
@@ -48,17 +48,17 @@ int main(void) {
 #define using_csmap_3(X, Key, Mapped) \

             using_csmap_4(X, Key, Mapped, c_default_compare)

 #define using_csmap_4(X, Key, Mapped, keyCompare) \

-            using_csmap_6(X, Key, Mapped, keyCompare, c_trivial_del, c_trivial_fromraw)

+            using_csmap_6(X, Key, Mapped, keyCompare, c_default_del, c_default_fromraw)

 #define using_csmap_6(X, Key, Mapped, keyCompare, mappedDel, mappedClone) \

-            using_csmap_8(X, Key, Mapped, keyCompare, mappedDel, mappedClone, c_trivial_del, c_trivial_fromraw)

+            using_csmap_8(X, Key, Mapped, keyCompare, mappedDel, mappedClone, c_default_del, c_default_fromraw)

 #define using_csmap_8(X, Key, Mapped, keyCompare, mappedDel, mappedClone, keyDel, keyClone) \

             using_csmap_10(X, Key, Mapped, keyCompare, mappedDel, mappedClone, \

-                           keyDel, keyClone, c_trivial_toraw, Key)

+                           keyDel, keyClone, c_default_toraw, Key)

 

 #define using_csmap_10(X, Key, Mapped, keyCompareRaw, mappedDel, mappedClone, \

                        keyDel, keyFromRaw, keyToRaw, RawKey) \

             _c_using_aatree(csmap_##X, csmap_, Key, Mapped, keyCompareRaw, mappedDel, keyDel, \

-                            keyFromRaw, keyToRaw, RawKey, mappedClone, c_trivial_toraw, Mapped)

+                            keyFromRaw, keyToRaw, RawKey, mappedClone, c_default_toraw, Mapped)

 

 /* csset: */

 #define using_csset(...) c_MACRO_OVERLOAD(using_csset, __VA_ARGS__)

@@ -66,9 +66,9 @@ int main(void) {
 #define using_csset_2(X, Key) \

             using_csset_3(X, Key, c_default_compare)

 #define using_csset_3(X, Key, keyCompare) \

-            using_csset_5(X, Key, keyCompare, c_trivial_del, c_trivial_fromraw)

+            using_csset_5(X, Key, keyCompare, c_default_del, c_default_fromraw)

 #define using_csset_5(X, Key, keyCompare, keyDel, keyClone) \

-            using_csset_7(X, Key, keyCompare, keyDel, keyClone, c_trivial_toraw, Key)

+            using_csset_7(X, Key, keyCompare, keyDel, keyClone, c_default_toraw, Key)

 #define using_csset_7(X, Key, keyCompareRaw, keyDel, keyFromRaw, keyToRaw, RawKey) \

             _c_using_aatree(csset_##X, csset_, Key, Key, keyCompareRaw, @@, keyDel, \

                             keyFromRaw, keyToRaw, RawKey, @@, @@, void)

@@ -84,12 +84,12 @@ int main(void) {
 #define using_csmap_strkey(...) c_MACRO_OVERLOAD(using_csmap_strkey, __VA_ARGS__)

 

 #define using_csmap_strkey_2(X, Mapped) \

-            _c_using_aatree_strkey(X, csmap_, Mapped, c_trivial_del, c_trivial_fromraw)

+            _c_using_aatree_strkey(X, csmap_, Mapped, c_default_del, c_default_fromraw)

 #define using_csmap_strkey_4(X, Mapped, mappedDel, mappedClone) \

             _c_using_aatree_strkey(X, csmap_, Mapped, mappedDel, mappedClone)

 #define _c_using_aatree_strkey(X, C, Mapped, mappedDel, mappedClone) \

             _c_using_aatree(C##X, C, cstr, Mapped, c_rawstr_compare, mappedDel, cstr_del, \

-                            cstr_from, cstr_toraw, const char*, mappedClone, c_trivial_toraw, Mapped)

+                            cstr_from, cstr_toraw, const char*, mappedClone, c_default_toraw, Mapped)

 

 

 #define using_csmap_strval(...) c_MACRO_OVERLOAD(using_csmap_strval, __VA_ARGS__)

@@ -97,9 +97,9 @@ int main(void) {
 #define using_csmap_strval_2(X, Key) \

             using_csmap_strval_3(X, Key, c_default_compare)

 #define using_csmap_strval_3(X, Key, keyCompare) \

-            using_csmap_strval_5(X, Key, keyCompare, c_trivial_del, c_trivial_fromraw)

+            using_csmap_strval_5(X, Key, keyCompare, c_default_del, c_default_fromraw)

 #define using_csmap_strval_5(X, Key, keyCompare, keyDel, keyClone) \

-            using_csmap_strval_7(X, Key, keyCompare, keyDel, keyClone, c_trivial_toraw, Key)

+            using_csmap_strval_7(X, Key, keyCompare, keyDel, keyClone, c_default_toraw, Key)

 #define using_csmap_strval_7(X, Key, keyCompare, keyDel, keyFromRaw, keyToRaw, RawKey) \

             _c_using_aatree(csmap_##X, csmap_, Key, cstr, keyCompare, cstr_del, keyDel, \

                             keyFromRaw, keyToRaw, RawKey, cstr_from, cstr_toraw, const char*)