X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1b4dc02411d79e4c367d331b85c1b295ec41edff..83f28c874af4faaeaaa19571afc2cd52c801da39:/src/surf/network_cm02.cpp diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp index f5caa3ad5f..3deb80ea8c 100644 --- a/src/surf/network_cm02.cpp +++ b/src/surf/network_cm02.cpp @@ -222,12 +222,13 @@ Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz "You're trying to send data from %s to %s but there is no connecting path between these two hosts.", src->get_cname(), dst->get_cname()); - bool failed = std::any_of(route.begin(), route.end(), [](LinkImpl* link) { return link->is_off(); }); + bool failed = std::any_of(route.begin(), route.end(), [](const LinkImpl* link) { return not link->is_on(); }); if (cfg_crosstraffic) { dst->route_to(src, back_route, nullptr); if (not failed) - failed = std::any_of(back_route.begin(), back_route.end(), [](LinkImpl* const& link) { return link->is_off(); }); + failed = + std::any_of(back_route.begin(), back_route.end(), [](const LinkImpl* link) { return not link->is_on(); }); } NetworkCm02Action *action = new NetworkCm02Action(this, size, failed); @@ -318,7 +319,7 @@ NetworkCm02Link::NetworkCm02Link(NetworkCm02Model* model, const std::string& nam simgrid::s4u::Link::on_creation(this->piface_); } -void NetworkCm02Link::apply_event(tmgr_trace_event_t triggered, double value) +void NetworkCm02Link::apply_event(kernel::profile::Event* triggered, double value) { /* Find out which of my iterators was triggered, and react accordingly */ if (triggered == bandwidth_.event) {