diff --git a/README.md b/README.md index 8224edf4..c9176493 100644 --- a/README.md +++ b/README.md @@ -2175,14 +2175,14 @@ This implementation is in general faster for small types of keys (like integer) but slower for larger types. -#### DICT\_SET\_DEF\_AS(name, name\_t, name\_it\_t, name\_itref\_t, key\_type[, key\_oplist]) +#### DICT\_SET\_DEF\_AS(name, name\_t, name\_it\_t, key\_type[, key\_oplist]) -Same as DICT\_SET\_DEF except the name of the types name\_t, name\_it\_t, name\_itref\_t, +Same as DICT\_SET\_DEF except the name of the types name\_t, name\_it\_t, are provided. -#### DICT\_OASET\_DEF\_AS(name, name\_t, name\_it\_t, name\_itref\_t, key\_type[, key\_oplist]) +#### DICT\_OASET\_DEF\_AS(name, name\_t, name\_it\_t, key\_type[, key\_oplist]) -Same as DICT\_OASET\_DEF except the name of the types name\_t, name\_it\_t, name\_itref\_t, +Same as DICT\_OASET\_DEF except the name of the types name\_t, name\_it\_t, are provided. diff --git a/m-dict.h b/m-dict.h index bccd6cae..cbe0c71b 100644 --- a/m-dict.h +++ b/m-dict.h @@ -140,13 +140,13 @@ /* Define a set of the key key_type and its associated functions. as the given name name_t with its associated functions. The set is unordered. - USAGE: DICT_SET_DEF_AS(name, name_it, it_t, itref_t, key_type[, key_oplist]) + USAGE: DICT_SET_DEF_AS(name, name_it, it_t, key_type[, key_oplist]) */ -#define DICT_SET_DEF_AS(name, name_it, it_t, itref_t, ...) \ +#define DICT_SET_DEF_AS(name, name_it, it_t, ...) \ M_BEGIN_PROTECTED_CODE \ DICTI_SET_DEF_P1(M_IF_NARGS_EQ1(__VA_ARGS__) \ - ((name, __VA_ARGS__, M_GLOBAL_OPLIST_OR_DEF(__VA_ARGS__)(), name_it, it_t, itref_t ), \ - (name, __VA_ARGS__, name_it, it_t, itref_t ))) \ + ((name, __VA_ARGS__, M_GLOBAL_OPLIST_OR_DEF(__VA_ARGS__)(), name_it, it_t, M_C(name, _itref_ct) ), \ + (name, __VA_ARGS__, name_it, it_t, M_C(name, _itref_ct) ))) \ M_END_PROTECTED_CODE @@ -167,13 +167,13 @@ with an Open Addressing implementation and its associated functions. as the given name name_t with its associated functions. The set is unordered. - USAGE: DICT_OASET_DEF_AS(name, name_it, it_t, itref_t, key_type[, key_oplist]) + USAGE: DICT_OASET_DEF_AS(name, name_it, it_t, key_type[, key_oplist]) */ -#define DICT_OASET_DEF_AS(name, name_it, it_t, itref_t, ...) \ +#define DICT_OASET_DEF_AS(name, name_it, it_t, ...) \ M_BEGIN_PROTECTED_CODE \ DICTI_OASET_DEF_P1(M_IF_NARGS_EQ1(__VA_ARGS__) \ - ((name, __VA_ARGS__, M_GLOBAL_OPLIST_OR_DEF(__VA_ARGS__)(), name_it, it_t, itref_t ), \ - (name, __VA_ARGS__, name_it, it_t, itref_t ))) \ + ((name, __VA_ARGS__, M_GLOBAL_OPLIST_OR_DEF(__VA_ARGS__)(), name_it, it_t, M_C(name, _itref_ct) ), \ + (name, __VA_ARGS__, name_it, it_t, M_C(name, _itref_ct) ))) \ M_END_PROTECTED_CODE