X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/95f98f86ddeb28cea15e126929f48d196160a316..be4b540460e5f67714677c3ecf9ff54d2916f0d8:/src/surf/surf_routing_full.cpp

diff --git a/src/surf/surf_routing_full.cpp b/src/surf/surf_routing_full.cpp
index 9c74b224dd..835583fe96 100644
--- a/src/surf/surf_routing_full.cpp
+++ b/src/surf/surf_routing_full.cpp
@@ -24,12 +24,12 @@ AS_t model_full_create(void)
 
 void model_full_end(AS_t _routing)
 {
-  unsigned int i;
+  int i;
   sg_platf_route_cbarg_t e_route;
 
   /* set utils vars */
   AsFullPtr routing = ((AsFullPtr) _routing);
-  size_t table_size = xbt_dynar_length(routing->p_indexNetworkElm);
+  int table_size = (int)xbt_dynar_length(routing->p_indexNetworkElm);
 
   /* Create table if necessary */
   if (!routing->p_routingTable)
@@ -56,12 +56,16 @@ AsFull::AsFull(){
 }
 
 AsFull::~AsFull(){
-  size_t table_size = xbt_dynar_length(p_indexNetworkElm);
+  int table_size = (int)xbt_dynar_length(p_indexNetworkElm);
   int i, j;
   /* Delete routing table */
   for (i = 0; i < table_size; i++)
-    for (j = 0; j < table_size; j++)
-      delete TO_ROUTE_FULL(i,j);
+    for (j = 0; j < table_size; j++) {
+      if (TO_ROUTE_FULL(i,j)){
+        xbt_dynar_free(&TO_ROUTE_FULL(i,j)->link_list);
+        xbt_free(TO_ROUTE_FULL(i,j));
+      }
+    }
   xbt_free(p_routingTable);
 }