admin/mlib
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use of M_CONST_CAST for list.

Browse Source
This commit is contained in:
Patrick Pelissier committed 2017-05-26 15:44:18 +02:00
1 parent 081b9d7f6c
commit 7e517f35c5
1 file changed
+4 -16
Download Patch File Download Diff File Expand all files Collapse all files
m-list.h
+4 -16
View File
@@ -98,11 +98,6 @@
list_t l; \ list_t l; \
} list_it_t[1]; \ } list_it_t[1]; \
\ \
typedef union { \
type *ptr; \
const type *cptr; \
} M_C3(list_union_, name,_t); \
\
/* If MEMPOOL is required, we need to define it */ \ /* If MEMPOOL is required, we need to define it */ \
M_IF_METHOD(MEMPOOL, oplist)( \ M_IF_METHOD(MEMPOOL, oplist)( \
MEMPOOL_DEF(M_C(list_,name), struct M_C3(list_, name, _s)) \ MEMPOOL_DEF(M_C(list_,name), struct M_C3(list_, name, _s)) \
@@ -125,13 +120,6 @@
#define LISTI_DEF3(name, type, oplist, list_t, list_it_t) \ #define LISTI_DEF3(name, type, oplist, list_t, list_it_t) \
static inline const type * \
M_C3(list_, name, _const_cast)(type *ptr) \
{ \
M_C3(list_union_, name,_t) u; \
u.ptr = ptr; \
return u.cptr; \
} \
\ \
static inline void \ static inline void \
M_C3(list_, name, _init)(list_t v) \ M_C3(list_, name, _init)(list_t v) \
@@ -164,7 +152,7 @@
M_C3(list_, name, _back)(const list_t v) \ M_C3(list_, name, _back)(const list_t v) \
{ \ { \
assert(v != NULL && *v != NULL); \ assert(v != NULL && *v != NULL); \
return M_C3(list_, name, _const_cast)(&((*v)->data)); \ return M_CONST_CAST(type, &((*v)->data)); \
} \ } \
\ \
static inline type * \ static inline type * \
@@ -296,7 +284,7 @@
M_C3(list_, name, _cref)(const list_it_t v) \ M_C3(list_, name, _cref)(const list_it_t v) \
{ \ { \
assert(v != NULL && v[0].l[0] != NULL); \ assert(v != NULL && v[0].l[0] != NULL); \
return M_C3(list_, name, _const_cast)(&(v[0].l[0]->data)); \ return M_CONST_CAST(type, &(v[0].l[0]->data)); \
} \ } \
\ \
static inline size_t \ static inline size_t \
@@ -304,7 +292,7 @@
{ \ { \
assert (list != NULL); \ assert (list != NULL); \
size_t size = 0; \ size_t size = 0; \
/* FIXME: Store size field within the list to get faster? */ \ /* FIXME: Store size field within the list to be faster? */ \
struct M_C3(list_, name, _s) *it = *list; \ struct M_C3(list_, name, _s) *it = *list; \
while (it != NULL) { \ while (it != NULL) { \
size ++; \ size ++; \
@@ -346,7 +334,7 @@
static inline const type * \ static inline const type * \
M_C3(list_, name, _cget)(const list_t l, size_t i) \ M_C3(list_, name, _cget)(const list_t l, size_t i) \
{ \ { \
return M_C3(list_, name, _const_cast)(M_C3(list_, name, _get)(l,i)); \ return M_CONST_CAST(type, M_C3(list_, name, _get)(l,i)); \
} \ } \
\ \
static inline void \ static inline void \