X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e526ad06508e0193155f0591b43d7d9e9e92f6c7..4e1034f2699881431dbd65b0d4d1af6131a60302:/src/surf/storage_n11.cpp diff --git a/src/surf/storage_n11.cpp b/src/surf/storage_n11.cpp index d61b538940..722968594a 100644 --- a/src/surf/storage_n11.cpp +++ b/src/surf/storage_n11.cpp @@ -76,11 +76,11 @@ double StorageN11Model::nextOccuringEvent(double now) void StorageN11Model::updateActionsState(double /*now*/, double delta) { ActionList *actionSet = getRunningActionSet(); - for (ActionList::iterator it(actionSet->begin()), itNext = it, itend(actionSet->end()); it != itend; it = itNext) { - ++itNext; - + ActionList::iterator it(actionSet->begin()); + ActionList::iterator itend(actionSet->end()); + while (it != itend) { StorageAction *action = static_cast(&*it); - + ++it; double current_progress = lrint(lmm_variable_getvalue(action->getVariable()) * delta); action->updateRemains(current_progress); @@ -89,8 +89,8 @@ void StorageN11Model::updateActionsState(double /*now*/, double delta) action->file_->incrPosition(current_progress); action->file_->setSize(action->file_->tell()); - action->storage_->getContent()->erase(action->file_->cname()); - action->storage_->getContent()->insert({action->file_->cname(), action->file_->size()}); + action->storage_->getContent()->erase(action->file_->getCname()); + action->storage_->getContent()->insert({action->file_->getCname(), action->file_->size()}); } if (action->getMaxDuration() > NO_MAX_DURATION)