X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a493dab29fff80a4d222c18c3057c811b8b06d3f..3be0396ca83e510e42adc8e3eb12f4befb2f1fff:/src/surf/network_ns3.cpp?ds=sidebyside diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp index 9255c7e6e1..35b1a0d932 100644 --- a/src/surf/network_ns3.cpp +++ b/src/surf/network_ns3.cpp @@ -145,7 +145,7 @@ static void zoneCreation_cb(simgrid::s4u::NetZone const& zone) double angle = 0; auto nb_stations = static_cast(wifizone->get_all_hosts().size() - 1); double step = 2 * M_PI / nb_stations; - for (auto station_host : wifizone->get_all_hosts()) { + for (const auto* station_host : wifizone->get_all_hosts()) { station_netpoint_ns3 = station_host->get_netpoint()->extension(); if (station_netpoint_ns3 == access_point_netpoint_ns3) continue; @@ -308,8 +308,7 @@ static simgrid::config::Flag ns3_seed( }); namespace simgrid { -namespace kernel { -namespace resource { +namespace kernel::resource { NetworkNS3Model::NetworkNS3Model(const std::string& name) : NetworkModel(name) { @@ -369,7 +368,7 @@ StandardLinkImpl* NetworkNS3Model::create_wifi_link(const std::string& name, con return link; } -Action* NetworkNS3Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) +Action* NetworkNS3Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate, bool /*streamed*/) { xbt_assert(rate == -1, "Communication over ns-3 links cannot specify a specific rate. Please use -1 as a value instead of %f.", @@ -570,8 +569,7 @@ void NetworkNS3Action::update_remains_lazy(double /*now*/) THROW_IMPOSSIBLE; } -} // namespace resource -} // namespace kernel +} // namespace kernel::resource ns3::Ptr get_ns3node_from_sghost(const simgrid::s4u::Host* host) {