X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b88233071eaaef45c854e84a8c7b460ab5793b7d..9b4ac8fd04e749d0737479e3b02074be4ad3f2ab:/src/kernel/routing/RoutedZone.cpp

diff --git a/src/kernel/routing/RoutedZone.cpp b/src/kernel/routing/RoutedZone.cpp
index 9ff45720de..dff7174aaf 100644
--- a/src/kernel/routing/RoutedZone.cpp
+++ b/src/kernel/routing/RoutedZone.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2009-2019. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -25,7 +25,6 @@ static const char* instr_node_name(xbt_node_t node)
 
 xbt_node_t new_xbt_graph_node(xbt_graph_t graph, const char* name, std::map<std::string, xbt_node_t>* nodes)
 {
-
   auto elm = nodes->find(name);
   if (elm == nodes->end()) {
     xbt_node_t ret = xbt_graph_new_node(graph, xbt_strdup(name));
@@ -59,7 +58,7 @@ namespace simgrid {
 namespace kernel {
 namespace routing {
 
-RoutedZone::RoutedZone(NetZoneImpl* father, std::string name, resource::NetworkModel* netmodel)
+RoutedZone::RoutedZone(NetZoneImpl* father, const std::string& name, resource::NetworkModel* netmodel)
     : NetZoneImpl(father, name, netmodel)
 {
 }
@@ -67,7 +66,7 @@ RoutedZone::RoutedZone(NetZoneImpl* father, std::string name, resource::NetworkM
 void RoutedZone::get_graph(xbt_graph_t graph, std::map<std::string, xbt_node_t>* nodes,
                            std::map<std::string, xbt_edge_t>* edges)
 {
-  std::vector<kernel::routing::NetPoint*> vertices = get_vertices();
+  std::vector<NetPoint*> vertices = get_vertices();
 
   for (auto const& my_src : vertices) {
     for (auto const& my_dst : vertices) {
@@ -121,9 +120,10 @@ void RoutedZone::get_graph(xbt_graph_t graph, std::map<std::string, xbt_node_t>*
 /* ************************************************************************** */
 /* ************************* GENERIC AUX FUNCTIONS ************************** */
 /* change a route containing link names into a route containing link entities */
-RouteCreationArgs* RoutedZone::new_extended_route(RoutingMode hierarchy, NetPoint* src, NetPoint* dst, NetPoint* gw_src,
-                                                  NetPoint* gw_dst, std::vector<resource::LinkImpl*>& link_list,
-                                                  bool symmetrical, bool change_order)
+RouteCreationArgs* RoutedZone::new_extended_route(RoutingMode hierarchy, NetPoint* /* src */, NetPoint* /* dst */,
+                                                  NetPoint* gw_src, NetPoint* gw_dst,
+                                                  std::vector<resource::LinkImpl*>& link_list, bool /* symmetrical */,
+                                                  bool change_order)
 {
   RouteCreationArgs* result = new RouteCreationArgs();
 
@@ -188,9 +188,9 @@ void RoutedZone::add_route_check_params(NetPoint* src, NetPoint* dst, NetPoint*
     xbt_assert(dst->is_netzone(), "When defining a NetzoneRoute, dst must be a netzone but '%s' is not", dstName);
 
     xbt_assert(gw_src->is_host() || gw_src->is_router(),
-               "When defining a NetzoneRoute, gw_src must be an host or a router but '%s' is not.", srcName);
+               "When defining a NetzoneRoute, gw_src must be a host or a router but '%s' is not.", srcName);
     xbt_assert(gw_dst->is_host() || gw_dst->is_router(),
-               "When defining a NetzoneRoute, gw_dst must be an host or a router but '%s' is not.", dstName);
+               "When defining a NetzoneRoute, gw_dst must be a host or a router but '%s' is not.", dstName);
 
     xbt_assert(gw_src != gw_dst, "Cannot define an NetzoneRoute from '%s' to itself", gw_src->get_cname());
 
@@ -202,8 +202,8 @@ void RoutedZone::add_route_check_params(NetPoint* src, NetPoint* dst, NetPoint*
                dstName, gw_dst->get_cname());
   }
 
-  get_iface()->on_route_creation(symmetrical, src, dst, gw_src, gw_dst, link_list);
-}
-}
-}
+  s4u::NetZone::on_route_creation(symmetrical, src, dst, gw_src, gw_dst, link_list);
 }
+} // namespace routing
+} // namespace kernel
+} // namespace simgrid