X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4dbc84f53aac793fc159d833090e421ec0025905..c7d4536a8384832da2a1d7b9bb9109100aaa0eb2:/src/surf/AsFull.cpp

diff --git a/src/surf/AsFull.cpp b/src/surf/AsFull.cpp
index dbe966e4f5..3b931a3866 100644
--- a/src/surf/AsFull.cpp
+++ b/src/surf/AsFull.cpp
@@ -11,13 +11,13 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_full, surf, "Routing part of surf");
 #define TO_ROUTE_FULL(i,j) routingTable_[(i)+(j)*table_size]
 
 namespace simgrid {
-namespace surf {
+namespace routing {
   AsFull::AsFull(const char*name)
     : AsRoutedGraph(name)
   {
   }
 
-void AsFull::Seal() {
+void AsFull::seal() {
   int i;
   sg_platf_route_cbarg_t e_route;
 
@@ -34,8 +34,8 @@ void AsFull::Seal() {
       e_route = TO_ROUTE_FULL(i, i);
       if (!e_route) {
         e_route = xbt_new0(s_sg_platf_route_cbarg_t, 1);
-        e_route->gw_src = NULL;
-        e_route->gw_dst = NULL;
+        e_route->gw_src = nullptr;
+        e_route->gw_dst = nullptr;
         e_route->link_list = new std::vector<Link*>();
         e_route->link_list->push_back(routing_platf->loopback_);
         TO_ROUTE_FULL(i, i) = e_route;
@@ -68,7 +68,7 @@ void AsFull::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg
   /* set utils vars */
   size_t table_size = xbt_dynar_length(vertices_);
 
-  sg_platf_route_cbarg_t e_route = NULL;
+  sg_platf_route_cbarg_t e_route = nullptr;
 
   e_route = TO_ROUTE_FULL(src->id(), dst->id());
 
@@ -85,10 +85,10 @@ void AsFull::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg
 
 void AsFull::addRoute(sg_platf_route_cbarg_t route)
 {
-  const char *src = route->src;
-  const char *dst = route->dst;
-  NetCard *src_net_elm = sg_netcard_by_name_or_null(src);
-  NetCard *dst_net_elm = sg_netcard_by_name_or_null(dst);
+  NetCard *src_net_elm = route->src;
+  NetCard *dst_net_elm = route->dst;
+  const char *src = src_net_elm->name();
+  const char *dst = dst_net_elm->name();
 
   addRouteCheckParams(route);
 
@@ -110,7 +110,7 @@ void AsFull::addRoute(sg_platf_route_cbarg_t route)
   TO_ROUTE_FULL(src_net_elm->id(), dst_net_elm->id()) = newExtendedRoute(hierarchy_, route, 1);
   TO_ROUTE_FULL(src_net_elm->id(), dst_net_elm->id())->link_list->shrink_to_fit();
 
-  if (route->symmetrical == TRUE && src_net_elm != dst_net_elm) {
+  if (route->symmetrical == true && src_net_elm != dst_net_elm) {
     if (route->gw_dst && route->gw_src) {
       NetCard* gw_tmp = route->gw_src;
       route->gw_src = route->gw_dst;