X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5b867af718c91a3279c07e08ab9bcf164ff64466..7c480b01951b33f03d72ede0a47a45a88bd40b61:/src/surf/network_constant.cpp diff --git a/src/surf/network_constant.cpp b/src/surf/network_constant.cpp index 9424f5956e..ef66f50f7f 100644 --- a/src/surf/network_constant.cpp +++ b/src/surf/network_constant.cpp @@ -29,10 +29,10 @@ LinkImpl* NetworkConstantModel::createLink(const std::string& name, double bw, d return nullptr; } -double NetworkConstantModel::nextOccuringEvent(double /*now*/) +double NetworkConstantModel::next_occuring_event(double /*now*/) { double min = -1.0; - for (kernel::resource::Action const& action : *getRunningActionSet()) { + for (kernel::resource::Action const& action : *get_running_action_set()) { const NetworkConstantAction& net_action = static_cast(action); if (net_action.latency_ > 0 && (min < 0 || net_action.latency_ < min)) min = net_action.latency_; @@ -40,9 +40,9 @@ double NetworkConstantModel::nextOccuringEvent(double /*now*/) return min; } -void NetworkConstantModel::updateActionsState(double /*now*/, double delta) +void NetworkConstantModel::update_actions_state(double /*now*/, double delta) { - for (auto it = std::begin(*getRunningActionSet()); it != std::end(*getRunningActionSet());) { + for (auto it = std::begin(*get_running_action_set()); it != std::end(*get_running_action_set());) { NetworkConstantAction& action = static_cast(*it); ++it; // increment iterator here since the following calls to action.finish() may invalidate it if (action.latency_ > 0) {