From a8620c3aff409592dd3f7e3f894956e2f2f61321 Mon Sep 17 00:00:00 2001 From: Patrick Pelissier Date: Sun, 25 Nov 2018 18:00:47 +0100 Subject: [PATCH] Export method _size for operator GET_SIZE --- m-array.h | 1 + m-bitset.h | 1 + m-buffer.h | 2 ++ m-deque.h | 1 + m-dict.h | 2 ++ m-prioqueue.h | 2 ++ m-rbtree.h | 1 + 7 files changed, 10 insertions(+) diff --git a/m-array.h b/m-array.h index 0aeff9d5..d4023de3 100644 --- a/m-array.h +++ b/m-array.h @@ -85,6 +85,7 @@ ,GET_KEY(M_C(name, _get)) \ ,M_IF_METHOD(INIT, oplist)(GET_SET_KEY(M_C(name, _get_at)) ,) \ ,ERASE_KEY(M_C(name, _erase)) \ + ,GET_SIZE(M_C(name, _size)) \ ,PUSH(M_C(name,_push_back)) \ ,POP(M_C(name,_pop_back)) \ ,PUSH_MOVE(M_C(name,_push_move)) \ diff --git a/m-bitset.h b/m-bitset.h index 62806d42..54ca9b25 100644 --- a/m-bitset.h +++ b/m-bitset.h @@ -689,6 +689,7 @@ bitset_clz(const bitset_t set) ,TYPE(bitset_t) \ ,SUBTYPE(bool) \ ,TEST_EMPTY(bitset_empty_p), \ + ,GET_SIZE(bitset_size) \ ,IT_TYPE(bitset_it_t) \ ,IT_FIRST(bitset_it) \ ,IT_SET(bitset_it_set) \ diff --git a/m-buffer.h b/m-buffer.h index 39650c5b..55171083 100644 --- a/m-buffer.h +++ b/m-buffer.h @@ -581,6 +581,8 @@ M_C(name, _init)(buffer_t v, size_t size) \ ,PUSH(M_C(name,_push)) \ ,POP(M_C(name,_pop)) \ ,OPLIST(oplist) \ + ,TEST_EMPTY(M_C(name, _empty_p)), \ + ,GET_SIZE(M_C(name, _size)) \ ) diff --git a/m-deque.h b/m-deque.h index 6e50a2f7..07341bc3 100644 --- a/m-deque.h +++ b/m-deque.h @@ -888,6 +888,7 @@ ,IT_REF(M_C(name,_ref)) \ ,IT_CREF(M_C(name,_cref)) \ ,CLEAN(M_C(name,_clean)) \ + ,GET_SIZE(M_C(name, _size)) \ ,PUSH(M_C(name,_push_back)) \ ,POP(M_C(name,_pop_back)) \ ,OPLIST(oplist) \ diff --git a/m-dict.h b/m-dict.h index 5c7d4a02..4b26b1e2 100644 --- a/m-dict.h +++ b/m-dict.h @@ -842,6 +842,7 @@ ,ERASE_KEY(M_C(name, _erase)) \ ,KEY_OPLIST(key_oplist) \ ,VALUE_OPLIST(value_oplist) \ + ,GET_SIZE(M_C(name, _size)) \ ,M_IF_METHOD_BOTH(GET_STR, key_oplist, value_oplist)(GET_STR(M_C(name, _get_str)),) \ ,M_IF_METHOD_BOTH(PARSE_STR, key_oplist, value_oplist)(PARSE_STR(M_C(name, _parse_str)),) \ ,M_IF_METHOD_BOTH(OUT_STR, key_oplist, value_oplist)(OUT_STR(M_C(name, _out_str)),) \ @@ -875,6 +876,7 @@ ERASE_KEY(M_C(name, _erase)), \ KEY_OPLIST(oplist), \ VALUE_OPLIST(oplist), \ + GET_SIZE(M_C(name, _size)), \ IT_TYPE(M_C(name, _it_t)), \ IT_FIRST(M_C(name,_it)), \ IT_SET(M_C(name, _it_set)), \ diff --git a/m-prioqueue.h b/m-prioqueue.h index e9f40ee2..d96b11a7 100644 --- a/m-prioqueue.h +++ b/m-prioqueue.h @@ -65,6 +65,8 @@ ,PUSH(M_C(name,_push)) \ ,POP(M_C(name,_pop)) \ ,OPLIST(oplist) \ + ,TEST_EMPTY(M_C(name, _empty_p)), \ + ,GET_SIZE(M_C(name, _size)) \ ) #define PRIOQUEUEI_DEF2(name, type, oplist, prioqueue_t, it_t) \ diff --git a/m-rbtree.h b/m-rbtree.h index 9aac5bea..95edf5fd 100644 --- a/m-rbtree.h +++ b/m-rbtree.h @@ -61,6 +61,7 @@ TYPE(M_C(name,_t)), \ SUBTYPE(M_C(name, _type_t)), \ TEST_EMPTY(M_C(name,_empty_p)), \ + GET_SIZE(M_C(name, _size)), \ IT_TYPE(M_C(name, _it_t)), \ IT_FIRST(M_C(name,_it)), \ IT_SET(M_C(name,_it_set)), \