Renamed c_default_clone to c_default_from (mostly used internally).

2 files changed, 5 insertions, 6 deletions

diff --git a/include/stc/ccommon.h b/include/stc/ccommon.h
index ce5346e2..3bdc35c4 100644
--- a/include/stc/ccommon.h
+++ b/include/stc/ccommon.h
@@ -103,8 +103,7 @@ typedef const char              c_strlit[];
 #define c_default_eq(x, y)      (*(x) == *(y))

 #define c_memcmp_eq(x, y)       (memcmp(x, y, sizeof *(x)) == 0)

 

-#define c_default_clone(x)      (x)

-#define c_default_fromraw(x)    (x) // [deprecated]

+#define c_default_from(x)       (x)

 #define c_default_toraw(ptr)    (*(ptr))

 #define c_default_drop(ptr)     ((void) (ptr))

 

diff --git a/include/stc/template.h b/include/stc/template.h
index 7d5c70b9..77748fc1 100644
--- a/include/stc/template.h
+++ b/include/stc/template.h
@@ -159,10 +159,10 @@
     #define i_tag i_key  

   #endif

   #if !defined _i_has_internal_clone && defined i_keydrop && !defined i_keyfrom && !c_option(c_no_clone)

-    #error "i_keydrop defined but not i_keyfrom (e.g. as c_default_clone), or no 'i_opt c_no_clone'"

+    #error "i_keydrop defined but not i_keyfrom (e.g. as c_default_from), or no 'i_opt c_no_clone'"

   #endif

   #if !defined i_keyfrom

-    #define i_keyfrom c_default_clone

+    #define i_keyfrom c_default_from

   #endif

   #ifndef i_keyraw

     #define _i_no_keyraw

@@ -185,10 +185,10 @@
   #define i_tag i_val

 #endif

 #if !defined _i_has_internal_clone && defined i_valdrop && !defined i_valfrom && !c_option(c_no_clone)

-  #error "i_valdrop/i_drop defined but not i_valfrom (e.g. as c_default_clone), or no 'i_opt c_no_clone'"

+  #error "i_valdrop/i_drop defined but not i_valfrom (e.g. as c_default_from), or no 'i_opt c_no_clone'"

 #endif

 #if !defined i_valfrom

-  #define i_valfrom c_default_clone

+  #define i_valfrom c_default_from

 #endif

 #ifndef i_valraw

   #if !defined i_key || defined _i_no_keyraw