Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
ahem. Fix compilation issues
authorMartin Quinson <martin.quinson@loria.fr>
Thu, 1 Sep 2016 15:55:35 +0000 (17:55 +0200)
committerMartin Quinson <martin.quinson@loria.fr>
Thu, 1 Sep 2016 15:55:35 +0000 (17:55 +0200)
src/surf/maxmin.cpp

index 40e186f..a96e470 100644 (file)
@@ -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)
        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;
      }
    }
   return usage;