From: Martin Quinson Date: Thu, 1 Sep 2016 15:55:35 +0000 (+0200) Subject: ahem. Fix compilation issues X-Git-Tag: v3_14~454^2~2 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/85d0633f25554d4998a594a49fe38e949ce07e44?hp=49f58c8f33388c6075f0fb48cb29f754f219d516 ahem. Fix compilation issues --- diff --git a/src/surf/maxmin.cpp b/src/surf/maxmin.cpp index 40e186f60d..a96e470de0 100644 --- a/src/surf/maxmin.cpp +++ b/src/surf/maxmin.cpp @@ -1241,7 +1241,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;