X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ba9a4cfeba4eb00e84cd17603fc9654e81445655..27915da6b357d043681f745c4574699ff0db0146:/src/surf/xml/platf_private.hpp diff --git a/src/surf/xml/platf_private.hpp b/src/surf/xml/platf_private.hpp index 260e117c49..f57f02c8a8 100644 --- a/src/surf/xml/platf_private.hpp +++ b/src/surf/xml/platf_private.hpp @@ -105,7 +105,7 @@ typedef struct s_sg_platf_route_cbarg { const char *dst; sg_netcard_t gw_src; sg_netcard_t gw_dst; - xbt_dynar_t link_list; + std::vector *link_list; } s_sg_platf_route_cbarg_t; #define SG_PLATF_ROUTE_INITIALIZER {1,NULL,NULL,NULL,NULL,NULL} @@ -244,10 +244,7 @@ typedef struct s_sg_platf_AS_cbarg { typedef struct probabilist_event_generator *probabilist_event_generator_t; /********** Routing **********/ -void routing_AS_begin(sg_platf_AS_cbarg_t AS); -void routing_AS_end(void); void routing_cluster_add_backbone(Link* bb); -surf_As* routing_get_current(); /*** END of the parsing cruft ***/ XBT_PUBLIC(void) sg_platf_begin(void); // Start a new platform @@ -305,8 +302,8 @@ XBT_PRIVATE void sg_instr_AS_end(void); typedef struct s_surf_parsing_link_up_down *surf_parsing_link_up_down_t; typedef struct s_surf_parsing_link_up_down { - void* link_up; - void* link_down; + Link* link_up; + Link* link_down; } s_surf_parsing_link_up_down_t;