From d10d0478b6fd821b68c42a897b85ee9c42393778 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Tue, 14 Nov 2017 17:21:32 +0100 Subject: [PATCH] Add parentheses around macro parameters. --- src/surf/maxmin_private.hpp | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/src/surf/maxmin_private.hpp b/src/surf/maxmin_private.hpp index 976caa0308..10a1d0f58f 100644 --- a/src/surf/maxmin_private.hpp +++ b/src/surf/maxmin_private.hpp @@ -31,8 +31,8 @@ struct s_lmm_element_t { // - If network, then 1 in forward direction and 0.05 backward for the ACKs double consumption_weight; }; -#define make_elem_active(elem) xbt_swag_insert_at_head(elem,&(elem->constraint->active_element_set)) -#define make_elem_inactive(elem) xbt_swag_remove(elem,&(elem->constraint->active_element_set)) +#define make_elem_active(elem) xbt_swag_insert_at_head((elem), &((elem)->constraint->active_element_set)) +#define make_elem_inactive(elem) xbt_swag_remove((elem), &((elem)->constraint->active_element_set)) struct s_lmm_constraint_light_t { double remaining_over_usage; @@ -132,17 +132,25 @@ struct s_lmm_system_t { void (*solve_fun)(lmm_system_t self); }; -#define extract_variable(sys) xbt_swag_extract(&(sys->variable_set)) -#define extract_constraint(sys) xbt_swag_extract(&(sys->constraint_set)) -#define insert_constraint(sys,cnst) xbt_swag_insert(cnst,&(sys->constraint_set)) -#define remove_variable(sys,var) do {xbt_swag_remove(var,&(sys->variable_set));\ - 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 make_constraint_active(sys,cnst) xbt_swag_insert(cnst,&(sys->active_constraint_set)) -#define make_constraint_inactive(sys,cnst) \ - do { xbt_swag_remove(cnst, &sys->active_constraint_set); \ - xbt_swag_remove(cnst, &sys->modified_constraint_set); } while (0) +#define extract_variable(sys) xbt_swag_extract(&((sys)->variable_set)) +#define extract_constraint(sys) xbt_swag_extract(&((sys)->constraint_set)) +#define insert_constraint(sys, cnst) xbt_swag_insert((cnst), &((sys)->constraint_set)) +#define remove_variable(sys, var) \ + do { \ + xbt_swag_remove(var, &((sys)->variable_set)); \ + 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 make_constraint_active(sys, cnst) xbt_swag_insert((cnst), &((sys)->active_constraint_set)) +#define make_constraint_inactive(sys, cnst) \ + do { \ + xbt_swag_remove((cnst), &(sys)->active_constraint_set); \ + xbt_swag_remove((cnst), &(sys)->modified_constraint_set); \ + } while (0) /** @ingroup SURF_lmm * @brief Print information about a lmm system -- 2.20.1