From: Martin Quinson Date: Sat, 3 Oct 2020 10:33:11 +0000 (+0200) Subject: useless cosmetics X-Git-Tag: v3.26~390 X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/7751cd1e3ffe8bd90fe745a165db3a5aae429a4b useless cosmetics --- diff --git a/include/simgrid/kernel/routing/ClusterZone.hpp b/include/simgrid/kernel/routing/ClusterZone.hpp index f6ab794dfc..030fa6a2c4 100644 --- a/include/simgrid/kernel/routing/ClusterZone.hpp +++ b/include/simgrid/kernel/routing/ClusterZone.hpp @@ -74,7 +74,7 @@ public: std::map* edges) override; virtual void create_links_for_node(ClusterCreationArgs* cluster, int id, int rank, unsigned int position); - virtual void parse_specific_arguments(ClusterCreationArgs* cluster) + virtual void parse_specific_arguments(ClusterCreationArgs*) { /* this routing method does not require any specific argument */ } diff --git a/src/kernel/routing/NetZoneImpl.cpp b/src/kernel/routing/NetZoneImpl.cpp index ed7e84b12c..f3ee075cff 100644 --- a/src/kernel/routing/NetZoneImpl.cpp +++ b/src/kernel/routing/NetZoneImpl.cpp @@ -374,7 +374,7 @@ void NetZoneImpl::get_global_route(NetPoint* src, NetPoint* dst, /* Not in the same netzone, no bypass. We'll have to find our path between the netzones recursively */ common_ancestor->get_local_route(src_ancestor->netpoint_, dst_ancestor->netpoint_, &route, latency); - xbt_assert((route.gw_src != nullptr) && (route.gw_dst != nullptr), "bad gateways for route from \"%s\" to \"%s\"", + xbt_assert((route.gw_src != nullptr) && (route.gw_dst != nullptr), "Bad gateways for route from '%s' to '%s'.", src->get_cname(), dst->get_cname()); /* If source gateway is not our source, we have to recursively find our way up to this point */ diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index 9ae69acb6f..1a57123677 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -126,9 +126,8 @@ static void sg_platf_new_link(const simgrid::kernel::routing::LinkCreationArgs* simgrid::kernel::resource::LinkImpl* l = surf_network_model->create_link(link_name, link->bandwidths, link->latency, link->policy); - if (link->properties) { + if (link->properties) l->set_properties(*link->properties); - } if (link->latency_trace) l->set_latency_profile(link->latency_trace);