From c37760c9fc6ee35af3b7fec7490aebc3fab8fd87 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Sun, 11 Oct 2020 21:41:10 +0200 Subject: [PATCH] Few more auto's. --- src/kernel/routing/NetZoneImpl.cpp | 2 +- src/plugins/link_energy_wifi.cpp | 4 ++-- src/plugins/link_load.cpp | 2 +- src/s4u/s4u_Host.cpp | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/kernel/routing/NetZoneImpl.cpp b/src/kernel/routing/NetZoneImpl.cpp index f41f37de5f..bd7ec01283 100644 --- a/src/kernel/routing/NetZoneImpl.cpp +++ b/src/kernel/routing/NetZoneImpl.cpp @@ -77,7 +77,7 @@ s4u::Link* NetZoneImpl::create_link(const std::string& name, const std::vectorcreate_link(name, bandwidths, latency, policy); + auto* l = surf_network_model->create_link(name, bandwidths, latency, policy); if (props) l->set_properties(*props); diff --git a/src/plugins/link_energy_wifi.cpp b/src/plugins/link_energy_wifi.cpp index 13a8f49604..b0d93f534c 100644 --- a/src/plugins/link_energy_wifi.cpp +++ b/src/plugins/link_energy_wifi.cpp @@ -299,7 +299,7 @@ void sg_wifi_energy_plugin_init() // verify the link is appropriate to WiFi energy computations if (link.get_sharing_policy() == simgrid::s4u::Link::SharingPolicy::WIFI) { XBT_DEBUG("Wifi Link: %s, initialization of wifi energy plugin", link.get_cname()); - LinkEnergyWifi* plugin = new LinkEnergyWifi(&link); + auto* plugin = new LinkEnergyWifi(&link); link.extension_set(plugin); } else { XBT_DEBUG("Not Wifi Link: %s, wifi energy on link not computed", link.get_cname()); @@ -330,7 +330,7 @@ void sg_wifi_energy_plugin_init() }); simgrid::s4u::Link::on_communicate.connect([](const simgrid::kernel::resource::NetworkAction& action) { - const simgrid::kernel::resource::NetworkWifiAction* actionWifi = dynamic_cast(&action); + auto const* actionWifi = dynamic_cast(&action); if (actionWifi == nullptr) return; diff --git a/src/plugins/link_load.cpp b/src/plugins/link_load.cpp index cfde59dc7a..5d99affe8e 100644 --- a/src/plugins/link_load.cpp +++ b/src/plugins/link_load.cpp @@ -172,7 +172,7 @@ using simgrid::plugin::LinkLoad; static void on_communicate(const simgrid::kernel::resource::NetworkAction& action) { XBT_DEBUG("on_communicate is called"); - for (simgrid::kernel::resource::LinkImpl* link : action.get_links()) { + for (auto* link : action.get_links()) { if (link == nullptr || link->get_sharing_policy() == simgrid::s4u::Link::SharingPolicy::WIFI) continue; diff --git a/src/s4u/s4u_Host.cpp b/src/s4u/s4u_Host.cpp index 04d1f581ef..846790fadf 100644 --- a/src/s4u/s4u_Host.cpp +++ b/src/s4u/s4u_Host.cpp @@ -152,7 +152,7 @@ void Host::route_to(const Host* dest, std::vector& links, double* latency { std::vector linkImpls; this->route_to(dest, linkImpls, latency); - for (kernel::resource::LinkImpl* const& l : linkImpls) + for (auto* l : linkImpls) links.push_back(l->get_iface()); } @@ -163,7 +163,7 @@ void Host::route_to(const Host* dest, std::vector& if (XBT_LOG_ISENABLED(surf_route, xbt_log_priority_debug)) { XBT_CDEBUG(surf_route, "Route from '%s' to '%s' (latency: %f):", get_cname(), dest->get_cname(), (latency == nullptr ? -1 : *latency)); - for (auto const& link : links) + for (auto const* link : links) XBT_CDEBUG(surf_route, " Link '%s'", link->get_cname()); } } -- 2.20.1