From 1a1339da6b064b5cb910cbfe1350a8ac9e883cce Mon Sep 17 00:00:00 2001 From: Patrick Pelissier Date: Sat, 20 Nov 2021 13:05:50 +0100 Subject: [PATCH] Remove deprecated features --- m-array.h | 11 ----------- m-bitset.h | 6 ------ m-bptree.h | 10 ---------- m-concurrent.h | 10 ---------- m-deque.h | 6 ------ m-dict.h | 11 ----------- m-i-list.h | 6 ------ m-i-shared.h | 6 ------ m-list.h | 12 ------------ m-prioqueue.h | 6 ------ m-rbtree.h | 6 ------ m-shared.h | 6 ------ m-string.h | 12 ------------ m-tuple.h | 4 ---- m-variant.h | 5 ----- 15 files changed, 117 deletions(-) diff --git a/m-array.h b/m-array.h index 271c89a1..ea60e5e3 100644 --- a/m-array.h +++ b/m-array.h @@ -207,12 +207,6 @@ M_ARRA4_CONTRACT(v); \ } \ \ - static inline void M_ATTR_DEPRECATED \ - M_C(name, _clean)(array_t v) \ - { \ - M_C(name, _reset)(v); \ - } \ - \ static inline void \ M_C(name, _clear)(array_t v) \ { \ @@ -483,11 +477,6 @@ M_ARRA4_CONTRACT(v); \ return &v->ptr[idx]; \ } \ - static inline M_ATTR_DEPRECATED type * \ - M_C(name, _get_at)(array_t v, size_t idx) \ - { \ - return M_C(name, _safe_get)(v, idx); \ - } \ , /* No INIT */) \ \ M_IF_AT_LEAST_METHOD(SET, INIT_MOVE, oplist)( \ diff --git a/m-bitset.h b/m-bitset.h index 96ee1ca7..a69cc3b2 100644 --- a/m-bitset.h +++ b/m-bitset.h @@ -100,12 +100,6 @@ bitset_reset(bitset_t t) t->size = 0; } -static inline void M_ATTR_DEPRECATED -bitset_clean(bitset_t t) -{ - bitset_reset(t); -} - /* Clear a bitset (DESTRUCTOR) */ static inline void bitset_clear(bitset_t t) diff --git a/m-bptree.h b/m-bptree.h index 912975a1..20b62b08 100644 --- a/m-bptree.h +++ b/m-bptree.h @@ -475,11 +475,6 @@ M_BPTR33_CONTRACT(N, isMulti, key_oplist, b); \ } \ \ - static inline void M_ATTR_DEPRECATED M_C(name, _clean)(tree_t b) \ - { \ - M_C(name, _reset)(b); \ - } \ - \ static inline void M_C(name, _clear)(tree_t b) \ { \ M_BPTR33_CONTRACT(N, isMulti, key_oplist, b); \ @@ -782,11 +777,6 @@ ret = M_C(name, _get)(b, key); \ } \ return ret; \ - } \ - static inline M_ATTR_DEPRECATED value_t * \ - M_C(name, _get_at)(tree_t b, key_t const key) \ - { \ - return M_C(name, _safe_get)(b, key); \ } \ \ static inline int \ diff --git a/m-concurrent.h b/m-concurrent.h index a481d856..b7ac1914 100644 --- a/m-concurrent.h +++ b/m-concurrent.h @@ -423,11 +423,6 @@ M_CALL_RESET(oplist, out->data); \ M_C(name, _write_unlock)(out); \ } \ - static inline void M_ATTR_DEPRECATED \ - M_C(name, _clean)(concurrent_t out) \ - { \ - M_C(name,_reset)(out); \ - } \ ,) \ \ M_IF_METHOD(EMPTY_P, oplist)( \ @@ -494,11 +489,6 @@ M_CALL_SET(M_GET_VALUE_OPLIST oplist, *out_data, *p); \ M_C(name, _write_unlock)(out); \ } \ - static inline M_ATTR_DEPRECATED void \ - M_C(name, _get_at_copy)(M_GET_VALUE_TYPE oplist *out_data, concurrent_t out, M_GET_KEY_TYPE oplist const key) \ - { \ - M_C(name, _safe_get_copy)(out_data, out, key); \ - } \ ,) \ \ M_IF_METHOD(ERASE_KEY, oplist)( \ diff --git a/m-deque.h b/m-deque.h index f4c2ee9b..65df5e01 100644 --- a/m-deque.h +++ b/m-deque.h @@ -226,12 +226,6 @@ M_D3QU3_CONTRACT(d); \ } \ \ - static inline void M_ATTR_DEPRECATED \ - M_C(name, _clean)(deque_t d) \ - { \ - M_C(name, _reset)(d); \ - } \ - \ static inline void \ M_C(name, _clear)(deque_t d) \ { \ diff --git a/m-dict.h b/m-dict.h index af7e7827..6ba9835e 100644 --- a/m-dict.h +++ b/m-dict.h @@ -421,12 +421,6 @@ M_D1CT_CONTRACT(name, map); \ } \ \ - static inline void M_ATTR_DEPRECATED \ - M_C(name,_clean)(dict_t map) \ - { \ - M_C(name, _reset)(map); \ - } \ - \ static inline value_type * \ M_C(name, _get)(const dict_t map, key_type const key) \ { \ @@ -581,11 +575,6 @@ } \ M_D1CT_CONTRACT(name, map); \ return &(*ref)->M_IF(isSet)(key, value); \ - } \ - static inline M_ATTR_DEPRECATED value_type * \ - M_C(name, _get_at)(dict_t map, key_type const key) \ - { \ - return M_C(name, _safe_get)(map, key); \ } \ \ static inline bool \ diff --git a/m-i-list.h b/m-i-list.h index 63d0c6cc..76d26d6b 100644 --- a/m-i-list.h +++ b/m-i-list.h @@ -217,12 +217,6 @@ typedef struct m_ilist_head_s { M_IL1ST_CONTRACT(name, list); \ } \ \ - static inline void M_ATTR_DEPRECATED \ - M_C(name, _clean)(list_t list) \ - { \ - M_C(name,_reset)(list); \ - } \ - \ static inline void \ M_C(name, _clear)(list_t list) \ { \ diff --git a/m-i-shared.h b/m-i-shared.h index 736b8f6a..e17c45c6 100644 --- a/m-i-shared.h +++ b/m-i-shared.h @@ -219,12 +219,6 @@ M_BEGIN_PROTECTED_CODE *shared = NULL; \ } \ \ - static inline void M_ATTR_DEPRECATED \ - M_C(name, _clean)(shared_t *shared) \ - { \ - M_C(name, _reset)(shared); \ - } \ - \ static inline void \ M_C(name, _set)(shared_t *ptr, shared_t shared) \ { \ diff --git a/m-list.h b/m-list.h index 50a2e139..f179d80d 100644 --- a/m-list.h +++ b/m-list.h @@ -256,12 +256,6 @@ M_L1ST_CONTRACT(v); \ } \ \ - static inline void M_ATTR_DEPRECATED \ - M_C(name, _clean)(list_t v) \ - { \ - M_C(name, _reset)(v); \ - } \ - \ static inline void \ M_C(name, _clear)(list_t v) \ { \ @@ -974,12 +968,6 @@ M_L1ST_DUAL_PUSH_CONTRACT(v); \ } \ \ - static inline void M_ATTR_DEPRECATED \ - M_C(name, _clean)(list_t v) \ - { \ - M_C(name, _reset)(v); \ - } \ - \ static inline void \ M_C(name, _clear)(list_t v) \ { \ diff --git a/m-prioqueue.h b/m-prioqueue.h index 51da99d6..96c1f364 100644 --- a/m-prioqueue.h +++ b/m-prioqueue.h @@ -191,12 +191,6 @@ M_C(name, _array_reset)(p->array); \ } \ \ - static inline void M_ATTR_DEPRECATED \ - M_C(name, _clean)(prioqueue_t p) \ - { \ - M_C(name,_reset)(p); \ - } \ - \ static inline size_t \ M_C(name, _i_parent)(size_t i) \ { \ diff --git a/m-rbtree.h b/m-rbtree.h index 58667d56..b631ed3e 100644 --- a/m-rbtree.h +++ b/m-rbtree.h @@ -294,12 +294,6 @@ typedef enum { tree->size = 0; \ } \ \ - static inline void M_ATTR_DEPRECATED \ - M_C(name, _clean)(tree_t tree) \ - { \ - M_C(name,_reset)(tree); \ - } \ - \ static inline void \ M_C(name, _clear)(tree_t tree) \ { \ diff --git a/m-shared.h b/m-shared.h index cfc8fe49..6cd09587 100644 --- a/m-shared.h +++ b/m-shared.h @@ -277,12 +277,6 @@ static inline int m_shar3d_integer_cref(int *p) { return *p; } M_C(name, _clear)(dest); \ } \ \ - static inline void M_ATTR_DEPRECATED \ - M_C(name, _clean)(shared_t dest) \ - { \ - M_C(name, _reset)(dest); \ - } \ - \ static inline void \ M_C(name, _set)(shared_t dest, \ const shared_t shared) \ diff --git a/m-string.h b/m-string.h index 3beb53c5..4f0085d3 100644 --- a/m-string.h +++ b/m-string.h @@ -230,12 +230,6 @@ string_reset(string_t v) M_STR1NG_CONTRACT (v); } -static inline void M_ATTR_DEPRECATED -string_clean(string_t v) -{ - string_reset(v); -} - /* Return the selected character of the string */ static inline char string_get_char(const string_t v, size_t index) @@ -2051,12 +2045,6 @@ namespace m_lib { s->s[0] = 0; \ } \ \ - static inline void M_ATTR_DEPRECATED \ - M_C(name, _clean)(bounded_t s) \ - { \ - M_C(name, _reset)(s); \ - } \ - \ static inline size_t \ M_C(name, _size)(const bounded_t s) \ { \ diff --git a/m-tuple.h b/m-tuple.h index 9f6f9e8a..086c6d3f 100644 --- a/m-tuple.h +++ b/m-tuple.h @@ -633,10 +633,6 @@ namespace m_lib { M_TUPL3_CONTRACT(el1); \ M_MAP(M_TUPL3_DEFINE_RESET_FUNC , __VA_ARGS__) \ } \ - static inline void M_ATTR_DEPRECATED \ - M_C(name, _clean)(M_C(name,_ct) el1) { \ - M_C(name, _reset)(el1); \ - } #define M_TUPL3_DEFINE_RESET_FUNC(a) \ M_TUPL3_CALL_RESET(a, el1 -> M_TUPL3_GET_FIELD a); diff --git a/m-variant.h b/m-variant.h index 31da86bd..f876f84e 100644 --- a/m-variant.h +++ b/m-variant.h @@ -718,11 +718,6 @@ M_C(name, _clear)(my); \ M_C(name, _init)(my); \ } \ - static inline void M_ATTR_DEPRECATED \ - M_C(name, _clean)(M_C(name,_ct) my) \ - { \ - M_C(name, _reset)(my); \ - } /* deferred evaluation of the oplist */ #define M_VAR1ANT_OPLIST_P1(arg) M_VAR1ANT_OPLIST_P2 arg