From e409499a7aa4d85a458fabdae9cdb5fb3ac7c302 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Thu, 8 Dec 2011 16:31:19 +0100 Subject: [PATCH] Kill duplicated macro. --- src/surf/maxmin.c | 2 +- src/surf/maxmin_private.h | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/surf/maxmin.c b/src/surf/maxmin.c index cf9b27d31b..0a00e66cf5 100644 --- a/src/surf/maxmin.c +++ b/src/surf/maxmin.c @@ -117,7 +117,7 @@ static XBT_INLINE void lmm_cnst_free(lmm_system_t sys, { /* xbt_assert(xbt_swag_size(&(cnst->element_set)), */ /* "This list should be empty!"); */ - remove_active_constraint(sys, cnst); + make_constraint_inactive(sys, cnst); free(cnst); } diff --git a/src/surf/maxmin_private.h b/src/surf/maxmin_private.h index 31743cdf99..30f1589c72 100644 --- a/src/surf/maxmin_private.h +++ b/src/surf/maxmin_private.h @@ -87,9 +87,8 @@ typedef struct lmm_system { xbt_swag_remove(var,&(sys->saturated_variable_set));} while(0) #define remove_constraint(sys,cnst) do {xbt_swag_remove(cnst,&(sys->constraint_set));\ xbt_swag_remove(cnst,&(sys->saturated_constraint_set));} while(0) -#define remove_active_constraint(sys,cnst) xbt_swag_remove(cnst,&(sys->active_constraint_set)) #define make_constraint_active(sys,cnst) xbt_swag_insert(cnst,&(sys->active_constraint_set)) -#define make_constraint_inactive(sys,cnst) remove_active_constraint(sys,cnst) +#define make_constraint_inactive(sys,cnst) xbt_swag_remove(cnst,&(sys->active_constraint_set)) static void lmm_var_free(lmm_system_t sys, lmm_variable_t var); static XBT_INLINE void lmm_cnst_free(lmm_system_t sys, -- 2.20.1