X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c1cefafb4bbcb85e9285d9172d12feefee4d4b18..83805c9c9180c1b65a20e169742375929ffaf87b:/src/surf/surf_routing_full.cpp

diff --git a/src/surf/surf_routing_full.cpp b/src/surf/surf_routing_full.cpp
index 85551c8d39..02a5168776 100644
--- a/src/surf/surf_routing_full.cpp
+++ b/src/surf/surf_routing_full.cpp
@@ -5,11 +5,9 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "surf_routing_full.hpp"
-#include "network.hpp"
+#include "network_interface.hpp"
 
-extern "C" {
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_full, surf, "Routing part of surf");
-}
 
 /* Global vars */
 extern routing_platf_t routing_platf;
@@ -62,8 +60,7 @@ AsFull::~AsFull(){
   for (i = 0; i < table_size; i++)
     for (j = 0; j < table_size; j++) {
       if (TO_ROUTE_FULL(i,j)){
-    	if (TO_ROUTE_FULL(i,j)->link_list)
-          xbt_dynar_free(&TO_ROUTE_FULL(i,j)->link_list);
+        xbt_dynar_free(&TO_ROUTE_FULL(i,j)->link_list);
         xbt_free(TO_ROUTE_FULL(i,j));
       }
     }
@@ -128,7 +125,7 @@ void AsFull::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_platf
     xbt_dynar_foreach(e_route->link_list, cpt, link) {
       xbt_dynar_push(res->link_list, &link);
       if (lat)
-        *lat += dynamic_cast<NetworkCm02LinkPtr>(static_cast<ResourcePtr>(link))->getLatency();
+        *lat += static_cast<NetworkLinkPtr>(link)->getLatency();
     }
   }
 }