1.1 --- a/src/cx/map.h Mon Apr 17 21:47:34 2023 +0200 1.2 +++ b/src/cx/map.h Tue Apr 18 18:01:41 2023 +0200 1.3 @@ -56,21 +56,9 @@ 1.4 1.5 /** Structure for the UCX map. */ 1.6 struct cx_map_s { 1.7 + CX_COLLECTION_MEMBERS 1.8 /** The map class definition. */ 1.9 cx_map_class *cl; 1.10 - /** An allocator that is used for the map elements. */ 1.11 - CxAllocator *allocator; 1.12 - /** The number of elements currently stored. */ 1.13 - size_t size; 1.14 - /** 1.15 - * The size of an element. 1.16 - */ 1.17 - size_t item_size; 1.18 - /** 1.19 - * True, if this map shall store pointers instead 1.20 - * of copies of objects. 1.21 - */ 1.22 - bool store_pointers; 1.23 }; 1.24 1.25 /** 1.26 @@ -179,7 +167,7 @@ 1.27 */ 1.28 __attribute__((__nonnull__)) 1.29 static inline void cxMapStoreObjects(CxMap *map) { 1.30 - map->store_pointers = false; 1.31 + map->store_pointer = false; 1.32 } 1.33 1.34 /** 1.35 @@ -196,7 +184,7 @@ 1.36 */ 1.37 __attribute__((__nonnull__)) 1.38 static inline void cxMapStorePointers(CxMap *map) { 1.39 - map->store_pointers = true; 1.40 + map->store_pointer = true; 1.41 map->item_size = sizeof(void *); 1.42 } 1.43