Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
useless cosmetics
[simgrid.git] / src / surf / maxmin_private.h
index 6195bbe..e4fe040 100644 (file)
@@ -80,8 +80,8 @@ typedef struct lmm_system {
   xbt_mallocator_t variable_mallocator;
 } s_lmm_system_t;
 
-#define extract_variable(sys) xbt_swag_remove(xbt_swag_getFirst(&(sys->variable_set)),&(sys->variable_set))
-#define extract_constraint(sys) xbt_swag_remove(xbt_swag_getFirst(&(sys->constraint_set)),&(sys->constraint_set))
+#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)
@@ -92,7 +92,8 @@ typedef struct lmm_system {
 #define make_constraint_inactive(sys,cnst) remove_active_constraint(sys,cnst)
 
 static void lmm_var_free(lmm_system_t sys, lmm_variable_t var);
-static XBT_INLINE void lmm_cnst_free(lmm_system_t sys, lmm_constraint_t cnst);
+static XBT_INLINE void lmm_cnst_free(lmm_system_t sys,
+                                     lmm_constraint_t cnst);
 
 void lmm_print(lmm_system_t sys);
 
@@ -100,4 +101,4 @@ extern double (*func_f_def) (lmm_variable_t, double);
 extern double (*func_fp_def) (lmm_variable_t, double);
 extern double (*func_fpi_def) (lmm_variable_t, double);
 
-#endif /* _SURF_MAXMIN_PRIVATE_H */
+#endif                          /* _SURF_MAXMIN_PRIVATE_H */