and now, blow up the routing_models table \o/

[simgrid.git] / src / surf / surf_routing_floyd.cpp

diff --git a/src/surf/surf_routing_floyd.cpp b/src/surf/surf_routing_floyd.cpp
index 7f2c653..bed7289 100644 (file)
--- a/src/surf/surf_routing_floyd.cpp
+++ b/src/surf/surf_routing_floyd.cpp
@@ -14,16 +14,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_floyd, surf, "Routing part of surf");
 #define TO_FLOYD_PRED(i,j) (p_predecessorTable)[(i)+(j)*table_size]
 #define TO_FLOYD_LINK(i,j) (p_linkTable)[(i)+(j)*table_size]
 
-AS_t model_floyd_create(void)
-{
-  return new simgrid::surf::AsFloyd();
-}
-
-void model_floyd_end(AS_t current_routing)
-{
-  static_cast<simgrid::surf::AsFloyd*>(current_routing)->end();
-}
-
 namespace simgrid {
 namespace surf {
 
@@ -42,7 +32,7 @@ AsFloyd::~AsFloyd(){
   /* Delete link_table */
   for (i = 0; i < table_size; i++)
     for (j = 0; j < table_size; j++) {
-      generic_free_route(TO_FLOYD_LINK(i, j));
+      routing_route_free(TO_FLOYD_LINK(i, j));
     }
   xbt_free(p_linkTable);
   /* Delete bypass dict */
@@ -269,7 +259,7 @@ void AsFloyd::parseRoute(sg_platf_route_cbarg_t route)
   xbt_dynar_free(&route->link_list);
 }
 
-void AsFloyd::end(){
+void AsFloyd::Seal(){
   unsigned int i, j, a, b, c;
 
   /* set the size of table routing */