X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b56f5db19216ad6717f65e0c52383c87bad6e043..f95d001733819381a8b927263af8925c6cb581c4:/src/surf/surf_interface.cpp diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp index 632776c082..df9b6b136b 100644 --- a/src/surf/surf_interface.cpp +++ b/src/surf/surf_interface.cpp @@ -463,7 +463,8 @@ double Model::nextOccuringEventFull(double /*now*/) { maxminSystem_->solve_fun(maxminSystem_); double min = -1; - for (auto it(getRunningActionSet()->begin()), itend(getRunningActionSet()->end()); it != itend ; ++it) { + + for (auto it(getRunningActionSet()->begin()); it != getRunningActionSet()->end(); ++it) { Action *action = &*it; double value = lmm_variable_getvalue(action->getVariable()); if (value > 0) { @@ -774,7 +775,7 @@ bool Action::isSuspended() void Action::heapInsert(heap_type& heap, double key, enum heap_action_type hat) { hat_ = hat; - heapHandle_ = heap.emplace(key, this); + heapHandle_ = heap.emplace(std::make_pair(key, this)); } void Action::heapRemove(heap_type& heap) @@ -792,7 +793,7 @@ void Action::heapUpdate(heap_type& heap, double key, enum heap_action_type hat) if (heapHandle_) { heap.update(*heapHandle_, std::make_pair(key, this)); } else { - heapHandle_ = heap.emplace(key, this); + heapHandle_ = heap.emplace(std::make_pair(key, this)); } }