X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/080127e6354948e2b8d68399bc064253972c1644..48296e83ce3ba1fa3658a3a74d10a536e33b3849:/src/surf/sg_platf.cpp diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index e6d95fd01e..f7f483788a 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -31,13 +31,9 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse); -namespace simgrid { -namespace kernel { -namespace routing { +namespace simgrid::kernel::routing { xbt::signal on_cluster_creation; -} // namespace routing -} // namespace kernel -} // namespace simgrid +} // namespace simgrid::kernel::routing static simgrid::kernel::routing::ClusterZoneCreationArgs zone_cluster; /* temporary store data for irregular clusters, created with */ @@ -244,13 +240,12 @@ static void sg_platf_new_cluster_hierarchical(const simgrid::kernel::routing::Cl static void sg_platf_new_cluster_flat(simgrid::kernel::routing::ClusterCreationArgs* cluster) { auto* zone = simgrid::s4u::create_star_zone(cluster->id); - simgrid::s4u::NetZone const* parent = current_routing ? current_routing->get_iface() : nullptr; - if (parent) + if (const auto* parent = current_routing ? current_routing->get_iface() : nullptr) zone->set_parent(parent); /* set properties */ - for (auto const& elm : cluster->properties) - zone->set_property(elm.first, elm.second); + for (auto const& [key, value] : cluster->properties) + zone->set_property(key, value); /* Make the backbone */ const simgrid::s4u::Link* backbone = nullptr;