From 3b0e9402847be599b65df27f6a8075fcfcc42f6c Mon Sep 17 00:00:00 2001 From: Patrick Pelissier Date: Sun, 19 Aug 2018 17:58:23 +0200 Subject: [PATCH] Add missing _ptr & _srcptr alias. --- m-array.h | 2 ++ m-bptree.h | 2 ++ m-buffer.h | 2 ++ m-deque.h | 2 ++ m-dict.h | 4 ++++ m-i-list.h | 2 ++ m-list.h | 2 ++ m-prioqueue.h | 2 ++ m-rbtree.h | 2 ++ m-shared.h | 2 ++ m-snapshot.h | 2 ++ m-variant.h | 5 ++++- 12 files changed, 28 insertions(+), 1 deletion(-) diff --git a/m-array.h b/m-array.h index aef26c2b..659dd473 100644 --- a/m-array.h +++ b/m-array.h @@ -109,6 +109,8 @@ size_t size, alloc; \ type *ptr; \ } array_t[1]; \ + typedef struct M_C(name, _s) *M_C(name, _ptr); \ + typedef const struct M_C(name, _s) *M_C(name, _srcptr); \ \ typedef type M_C(name, _type_t); \ \ diff --git a/m-bptree.h b/m-bptree.h index c07f9a0d..0d6526c5 100644 --- a/m-bptree.h +++ b/m-bptree.h @@ -198,6 +198,8 @@ node_t root; \ size_t size; \ } tree_t[1]; \ + typedef struct M_C(name, _s) *M_C(name, _ptr); \ + typedef const struct M_C(name, _s) *M_C(name, _srcptr); \ \ /* Parent Iterator */ \ typedef struct M_C(name, _parent_it_s) { \ diff --git a/m-buffer.h b/m-buffer.h index 2fb2a99d..c6cf0998 100644 --- a/m-buffer.h +++ b/m-buffer.h @@ -112,6 +112,8 @@ typedef enum { /* If fixed size, array of elements, otherwise pointer to element */ \ BUFFERI_IF_CTE_SIZE(m_size)(type data[m_size], type *data); \ } buffer_t[1]; \ + typedef struct M_C(name, _s) *M_C(name, _ptr); \ + typedef const struct M_C(name, _s) *M_C(name, _srcptr); \ \ static inline void \ M_C(name, _init)(buffer_t v, size_t size) \ diff --git a/m-deque.h b/m-deque.h index 278ec8f9..df92fa33 100644 --- a/m-deque.h +++ b/m-deque.h @@ -97,6 +97,8 @@ size_t default_size; \ size_t count; \ } deque_t[1]; \ + typedef struct M_C(name, _s) *M_C(name, _ptr); \ + typedef const struct M_C(name, _s) *M_C(name, _srcptr); \ \ typedef struct M_C(name, _it_s) { \ node_t *node; \ diff --git a/m-dict.h b/m-dict.h index c34f8e17..af64aeec 100644 --- a/m-dict.h +++ b/m-dict.h @@ -190,6 +190,8 @@ size_t used, lower_limit, upper_limit; \ M_C(name, _array_list_pair_t) table; \ } dict_t[1]; \ + typedef struct M_C(name, _s) *M_C(name, _ptr); \ + typedef const struct M_C(name, _s) *M_C(name, _srcptr); \ \ typedef struct M_C(name, _it_s) { \ M_C(name, _array_list_pair_it_t) array_it; \ @@ -899,6 +901,8 @@ typedef enum { size_t upper_limit, lower_limit; \ M_C(name, _pair_t) *data; \ } dict_t[1]; \ + typedef struct M_C(name, _s) *M_C(name, _ptr); \ + typedef const struct M_C(name, _s) *M_C(name, _srcptr); \ \ typedef struct M_C(name, _it_s) { \ const struct M_C(name,_s) *dict; \ diff --git a/m-i-list.h b/m-i-list.h index edc6605f..f95bd995 100644 --- a/m-i-list.h +++ b/m-i-list.h @@ -132,6 +132,8 @@ typedef struct ilist_head_s { typedef struct M_C(name, _s) { \ struct ilist_head_s name; \ } list_t[1]; \ + typedef struct M_C(name, _s) *M_C(name, _ptr); \ + typedef const struct M_C(name, _s) *M_C(name, _srcptr); \ \ typedef type M_C(name, _type_t); \ \ diff --git a/m-list.h b/m-list.h index a61e4cb8..d4b05917 100644 --- a/m-list.h +++ b/m-list.h @@ -126,6 +126,8 @@ struct M_C(name, _s) *next; \ type data; \ } *list_t[1]; \ + typedef struct M_C(name, _s) *M_C(name, _ptr); \ + typedef const struct M_C(name, _s) *M_C(name, _srcptr); \ \ typedef type M_C(name, _type_t); \ \ diff --git a/m-prioqueue.h b/m-prioqueue.h index 3ffd45c9..a08deab7 100644 --- a/m-prioqueue.h +++ b/m-prioqueue.h @@ -74,6 +74,8 @@ typedef struct M_C(name, _s) { \ M_C(name, _array_t) array; \ } prioqueue_t[1]; \ + typedef struct M_C(name, _s) *M_C(name, _ptr); \ + typedef const struct M_C(name, _s) *M_C(name, _srcptr); \ \ typedef M_C(name, _array_it_t) it_t; \ \ diff --git a/m-rbtree.h b/m-rbtree.h index d4bfd305..93f3e692 100644 --- a/m-rbtree.h +++ b/m-rbtree.h @@ -140,6 +140,8 @@ typedef enum { size_t size; \ node_t *node; \ } tree_t[1]; \ + typedef struct M_C(name, _s) *M_C(name, _ptr); \ + typedef const struct M_C(name, _s) *M_C(name, _srcptr); \ \ typedef struct M_C(name, _it_s) { \ node_t *stack[RBTREEI_MAX_STACK]; \ diff --git a/m-shared.h b/m-shared.h index 05b9a59c..d9b5d90b 100644 --- a/m-shared.h +++ b/m-shared.h @@ -112,6 +112,8 @@ static inline int sharedi_integer_cref(int *p) { return *p; } M_GET_TYPE cpt_oplist cpt; /* Counter of how many points to the data */ \ bool combineAlloc; /* Does the data and the ptr share the slot? */ \ } *M_C(name, _t)[1]; \ + typedef struct M_C(name, _s) *M_C(name, _ptr); \ + typedef const struct M_C(name, _s) *M_C(name, _srcptr); \ \ typedef struct M_C(name, combine_s) { \ type data; \ diff --git a/m-snapshot.h b/m-snapshot.h index 169f1aaf..ccd4e129 100644 --- a/m-snapshot.h +++ b/m-snapshot.h @@ -127,6 +127,8 @@ M_C(name, _aligned_type_t) data[SNAPSHOTI_SPSC_MAX_BUFFER]; \ atomic_uchar flags; \ } M_C(name, _t)[1]; \ + typedef struct M_C(name, _s) *M_C(name, _ptr); \ + typedef const struct M_C(name, _s) *M_C(name, _srcptr); \ \ typedef type M_C(name, _type_t); \ \ diff --git a/m-variant.h b/m-variant.h index 756c9e96..04fd6f43 100644 --- a/m-variant.h +++ b/m-variant.h @@ -120,7 +120,10 @@ union { \ M_MAP(VARIANTI_DEFINE_TYPE_ELE , __VA_ARGS__) \ } value; \ - } M_C(name,_t)[1]; + } M_C(name,_t)[1]; \ + typedef struct M_C(name, _s) *M_C(name, _ptr); \ + typedef const struct M_C(name, _s) *M_C(name, _srcptr); + #define VARIANTI_DEFINE_UNION_ELE(name, a) \ , M_C3(name, _, VARIANTI_GET_FIELD a) #define VARIANTI_DEFINE_TYPE_ELE(a) \