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

Move up control so that it is the first error reported by the compiler.

Browse Source
This commit is contained in:
Patrick Pelissier committed 2020-05-17 10:52:54 +02:00
1 parent d1ae26f0fd
commit a87cac84dd
1 file changed
+11 -6
Download Patch File Download Diff File Expand all files Collapse all files
m-dict.h
+11 -6
View File
@@ -136,6 +136,9 @@
#define DICTI_DEF2_P4(name, key_type, key_oplist, value_type, value_oplist) \ #define DICTI_DEF2_P4(name, key_type, key_oplist, value_type, value_oplist) \
\ \
M_CHECK_COMPATIBLE_OPLIST(name, 1, key_type, key_oplist) \
M_CHECK_COMPATIBLE_OPLIST(name, 2, value_type, value_oplist) \
\
TUPLE_DEF2(M_C(name, _pair), (key, key_type, key_oplist), (value, value_type, value_oplist)) \ TUPLE_DEF2(M_C(name, _pair), (key, key_type, key_oplist), (value, value_type, value_oplist)) \
\ \
M_IF_METHOD(MEMPOOL, key_oplist) \ M_IF_METHOD(MEMPOOL, key_oplist) \
@@ -176,6 +179,9 @@
#define DICTI_SHASH_DEF2_P4(name, key_type, key_oplist, value_type, value_oplist) \ #define DICTI_SHASH_DEF2_P4(name, key_type, key_oplist, value_type, value_oplist) \
\ \
M_CHECK_COMPATIBLE_OPLIST(name, 1, key_type, key_oplist) \
M_CHECK_COMPATIBLE_OPLIST(name, 2, value_type, value_oplist) \
\
TUPLE_DEF2(M_C(name, _pair), (hash, size_t, M_DEFAULT_OPLIST), (key, key_type, key_oplist), (value, value_type, value_oplist)) \ TUPLE_DEF2(M_C(name, _pair), (hash, size_t, M_DEFAULT_OPLIST), (key, key_type, key_oplist), (value, value_type, value_oplist)) \
\ \
M_IF_METHOD(MEMPOOL, key_oplist) \ M_IF_METHOD(MEMPOOL, key_oplist) \
@@ -210,6 +216,8 @@
#define DICTI_SET_DEF_P4(name, key_type, key_oplist) \ #define DICTI_SET_DEF_P4(name, key_type, key_oplist) \
\ \
M_CHECK_COMPATIBLE_OPLIST(name, 1, key_type, key_oplist) \
\
TUPLE_DEF2(M_C(name, _pair), (key, key_type, key_oplist)) \ TUPLE_DEF2(M_C(name, _pair), (key, key_type, key_oplist)) \
\ \
M_IF_METHOD(MEMPOOL, key_oplist) \ M_IF_METHOD(MEMPOOL, key_oplist) \
@@ -250,9 +258,6 @@
typedef key_type M_C(name, _key_type_t); \ typedef key_type M_C(name, _key_type_t); \
typedef value_type M_C(name, _value_type_t); \ typedef value_type M_C(name, _value_type_t); \
\ \
M_CHECK_COMPATIBLE_OPLIST(name, 1, key_type, key_oplist) \
M_CHECK_COMPATIBLE_OPLIST(name, 2, value_type, value_oplist) \
\
typedef struct M_C(name, _it_s) { \ typedef struct M_C(name, _it_s) { \
M_C(name, _array_list_pair_it_t) array_it; \ M_C(name, _array_list_pair_it_t) array_it; \
M_C(name, _list_pair_it_t) list_it; \ M_C(name, _list_pair_it_t) list_it; \
@@ -1172,6 +1177,9 @@ typedef enum {
typedef key_type M_C(name, _key_type_t); \ typedef key_type M_C(name, _key_type_t); \
typedef value_type M_C(name, _value_type_t); \ typedef value_type M_C(name, _value_type_t); \
\ \
M_CHECK_COMPATIBLE_OPLIST(name, 1, key_type, key_oplist) \
M_CHECK_COMPATIBLE_OPLIST(name, 2, value_type, value_oplist) \
\
/* NOTE: We don't want a real oplist for this sub type */ \ /* NOTE: We don't want a real oplist for this sub type */ \
ARRAY_DEF(M_C(name, _array_pair), M_C(name, _pair_t), \ ARRAY_DEF(M_C(name, _array_pair), M_C(name, _pair_t), \
(INIT(M_NOTHING_DEFAULT), SET(M_MEMCPY_DEFAULT), \ (INIT(M_NOTHING_DEFAULT), SET(M_MEMCPY_DEFAULT), \
@@ -1190,9 +1198,6 @@ typedef enum {
size_t index; \ size_t index; \
} dict_it_t[1]; \ } dict_it_t[1]; \
\ \
M_CHECK_COMPATIBLE_OPLIST(name, 1, key_type, key_oplist) \
M_CHECK_COMPATIBLE_OPLIST(name, 2, value_type, value_oplist) \
\
static inline void \ static inline void \
M_C(name,_int_limit)(dict_t dict, size_t size) \ M_C(name,_int_limit)(dict_t dict, size_t size) \
{ \ { \