Mercurial > hg > ucx / file diff

--- a/src/cx/collection.h	Thu May 23 20:31:37 2024 +0200
+++ b/src/cx/collection.h	Thu May 23 20:43:04 2024 +0200
@@ -97,7 +97,7 @@
 /**
  * Use this macro to declare common members for a collection structure.
  */
-#define CX_COLLECTION_BASE struct cx_collection_s base
+#define CX_COLLECTION_BASE struct cx_collection_s collection
 
 /**
  * Invokes the simple destructor function for a specific element.
@@ -109,7 +109,7 @@
  * @param e the element
  */
 #define cx_invoke_simple_destructor(c, e) \
-    (c)->base.simple_destructor((c)->base.store_pointer ? (*((void **) (e))) : (e))
+    (c)->collection.simple_destructor((c)->collection.store_pointer ? (*((void **) (e))) : (e))
 
 /**
  * Invokes the advanced destructor function for a specific element.
@@ -121,8 +121,8 @@
  * @param e the element
  */
 #define cx_invoke_advanced_destructor(c, e) \
-    (c)->base.advanced_destructor((c)->base.destructor_data, \
-    (c)->base.store_pointer ? (*((void **) (e))) : (e))
+    (c)->collection.advanced_destructor((c)->collection.destructor_data, \
+    (c)->collection.store_pointer ? (*((void **) (e))) : (e))
 
 
 /**
@@ -135,8 +135,8 @@
  * @param e the element
  */
 #define cx_invoke_destructor(c, e) \
-    if ((c)->base.simple_destructor) cx_invoke_simple_destructor(c,e); \
-    if ((c)->base.advanced_destructor) cx_invoke_advanced_destructor(c,e)
+    if ((c)->collection.simple_destructor) cx_invoke_simple_destructor(c,e); \
+    if ((c)->collection.advanced_destructor) cx_invoke_advanced_destructor(c,e)
 
 #ifdef __cplusplus
 } // extern "C"