add a solve() fun pointer to maxmin datatype (+minor cleanups)

[simgrid.git] / src / surf / maxmin.cpp

diff --git a/src/surf/maxmin.cpp b/src/surf/maxmin.cpp
index 40e186f..563a062 100644 (file)
--- a/src/surf/maxmin.cpp
+++ b/src/surf/maxmin.cpp
@@ -102,6 +102,8 @@ lmm_system_t lmm_system_new(int selective_update)
                                               lmm_variable_mallocator_free_f,
                                               lmm_variable_mallocator_reset_f);
 
+  l->solve_fun = &lmm_solve;
+
   return l;
 }
 
@@ -1241,7 +1243,7 @@ double lmm_constraint_get_usage(lmm_constraint_t cnst) {
        if (cnst->sharing_policy)
          usage += elem->value * elem->variable->value;
        else if (usage < elem->value * elem->variable->value)
-         usage = max(usage, elem->value * elem->variable->value);
+         usage = std::max(usage, elem->value * elem->variable->value);
      }
    }
   return usage;