Merge pull request #2 from mquinson/master

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

diff --git a/src/surf/surf_routing.cpp b/src/surf/surf_routing.cpp
index 4c8b00f..3028a23 100644 (file)
--- a/src/surf/surf_routing.cpp
+++ b/src/surf/surf_routing.cpp
@@ -8,10 +8,8 @@
 #include "surf_routing_private.hpp"
 #include "surf_routing_cluster.hpp"
 
-#include "simgrid/platf_interface.h"    // platform creation API internal interface
 #include "simgrid/sg_config.h"
 #include "storage_interface.hpp"
-#include "src/surf/platform.hpp"
 #include "surf/surfxml_parse_values.h"
 
 #include "src/surf/surf_routing_cluster_torus.hpp"
@@ -20,6 +18,7 @@
 #include "src/surf/surf_routing_floyd.hpp"
 #include "src/surf/surf_routing_full.hpp"
 #include "src/surf/surf_routing_vivaldi.hpp"
+#include "src/surf/xml/platf.hpp" // FIXME: move that back to the parsing area
 
 #include <vector>
 
@@ -79,7 +78,7 @@ namespace surf {
       char *route_name = bprintf("%s#%s", src->name(), dst->name());
       if (bypassRoutes_->find(route_name) != bypassRoutes_->end()) {
         bypassedRoute = bypassRoutes_->at(route_name);
-        XBT_DEBUG("Found a bypass route with %ld links",bypassedRoute->size());
+        XBT_DEBUG("Found a bypass route with %zu links",bypassedRoute->size());
       }
       free(route_name);
       return bypassedRoute;
@@ -514,14 +513,6 @@ static void _get_route_and_latency(simgrid::surf::NetCard *src, simgrid::surf::N
 
 }
 
-AS_t surf_platf_get_root(routing_platf_t platf){
-  return platf->root_;
-}
-
-e_surf_network_element_type_t surf_routing_edge_get_rc_type(sg_netcard_t netcard){
-  return netcard->getRcType();
-}
-
 namespace simgrid {
 namespace surf {