From b701fe8228bc08831e0bac6625fc174c8f49b14b Mon Sep 17 00:00:00 2001 From: Patrick Pelissier Date: Sat, 12 Aug 2017 18:40:00 +0200 Subject: [PATCH] Fix bug --- m-deque.h | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/m-deque.h b/m-deque.h index e83937c9..9515aaa4 100644 --- a/m-deque.h +++ b/m-deque.h @@ -122,19 +122,6 @@ } \ \ static inline void \ - M_C(name, _clear)(deque_t d) \ - { \ - DEQUEI_CONTRACT(d); \ - /* BUG: clear on the objects of the node not called!!!! */ \ - /* We registered the delete operator to clear all objects */ \ - M_C(name, _node_list_clear)(d->list); \ - /* It is safer to clean some variables*/ \ - d->front->node = NULL; \ - d->back->node = NULL; \ - d->count = 0; \ - } \ - \ - static inline void \ M_C(name, _clean)(deque_t d) \ { \ DEQUEI_CONTRACT(d); \ @@ -160,6 +147,19 @@ } \ \ static inline void \ + M_C(name, _clear)(deque_t d) \ + { \ + DEQUEI_CONTRACT(d); \ + M_C(name, _clean)(d); \ + /* We registered the delete operator to clear all objects */ \ + M_C(name, _node_list_clear)(d->list); \ + /* It is safer to clean some variables*/ \ + d->front->node = NULL; \ + d->back->node = NULL; \ + d->count = 0; \ + } \ + \ + static inline void \ M_C(name, _push_back)(deque_t d, type const x) \ { \ DEQUEI_CONTRACT(d); \