1.1 --- a/src/cx/map.h Fri Apr 07 11:30:28 2023 +0200 1.2 +++ b/src/cx/map.h Sun Apr 09 19:03:58 2023 +0200 1.3 @@ -37,22 +37,13 @@ 1.4 #ifndef UCX_MAP_H 1.5 #define UCX_MAP_H 1.6 1.7 -#include "common.h" 1.8 -#include "allocator.h" 1.9 -#include "iterator.h" 1.10 +#include "collection.h" 1.11 #include "hash_key.h" 1.12 1.13 #ifdef __cplusplus 1.14 extern "C" { 1.15 #endif 1.16 1.17 -#ifndef CX_STORE_POINTERS 1.18 -/** 1.19 - * Special constant used for creating collections that are storing pointers. 1.20 - */ 1.21 -#define CX_STORE_POINTERS 0 1.22 -#endif 1.23 - 1.24 /** Type for the UCX map. */ 1.25 typedef struct cx_map_s CxMap; 1.26 1.27 @@ -73,7 +64,7 @@ 1.28 /** 1.29 * The size of an element. 1.30 */ 1.31 - size_t itemsize; 1.32 + size_t item_size; 1.33 /** 1.34 * True, if this map shall store pointers instead 1.35 * of copies of objects. 1.36 @@ -205,7 +196,7 @@ 1.37 __attribute__((__nonnull__)) 1.38 static inline void cxMapStorePointers(CxMap *map) { 1.39 map->store_pointers = true; 1.40 - map->itemsize = sizeof(void *); 1.41 + map->item_size = sizeof(void *); 1.42 } 1.43 1.44