Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot//simgrid/simgrid

[simgrid.git] / src / surf / surf_routing_none.c

diff --git a/src/surf/surf_routing_none.c b/src/surf/surf_routing_none.c
index cc1ef3cc067270b01a138476ca7066579b1097aa..6a53d45d74d598cfe87366742eb3ee3062272d2a 100644 (file)
--- a/src/surf/surf_routing_none.c
+++ b/src/surf/surf_routing_none.c
@@ -12,28 +12,28 @@ static xbt_dynar_t none_get_onelink_routes(AS_t rc) {
   return NULL;
 }
 
-static void none_get_route_and_latency(AS_t rc, network_element_t src, network_element_t dst,
+static void none_get_route_and_latency(AS_t rc, sg_routing_edge_t src, sg_routing_edge_t dst,
                                        route_t res,double *lat)
 {
   *lat = 0.0;
 }
 
 static route_t none_get_bypass_route(AS_t rc,
-    network_element_t src,
-    network_element_t dst) {
+    sg_routing_edge_t src,
+    sg_routing_edge_t dst, double *lat) {
   return NULL;
 }
 
-static int none_parse_PU(AS_t rc, network_element_t elm) {
+static int none_parse_PU(AS_t rc, sg_routing_edge_t elm) {
   XBT_DEBUG("Load process unit \"%s\"", elm->name);
-  xbt_dynar_push_as(rc->index_network_elm,network_element_t,elm);
+  xbt_dynar_push_as(rc->index_network_elm,sg_routing_edge_t,elm);
   /* don't care about PUs */
   return -1;
 }
 
-static int none_parse_AS(AS_t rc, network_element_t elm) {
+static int none_parse_AS(AS_t rc, sg_routing_edge_t elm) {
   XBT_DEBUG("Load Autonomous system \"%s\"", elm->name);
-  xbt_dynar_push_as(rc->index_network_elm,network_element_t,elm);
+  xbt_dynar_push_as(rc->index_network_elm,sg_routing_edge_t,elm);
   /* even don't care about sub-ASes -- I'm as nihilist as an old punk*/
   return -1;
 }