X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b3b356352e87ae00a20f737c48e19b0c8413455a..e47d2126ee520f8d88107618c42b84544e91a32c:/src/surf/surf_routing_full.cpp diff --git a/src/surf/surf_routing_full.cpp b/src/surf/surf_routing_full.cpp index d373f23c04..2855d52f10 100644 --- a/src/surf/surf_routing_full.cpp +++ b/src/surf/surf_routing_full.cpp @@ -9,14 +9,11 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_full, surf, "Routing part of surf"); -/* Global vars */ -extern routing_platf_t routing_platf; - #define TO_ROUTE_FULL(i,j) p_routingTable[(i)+(j)*table_size] AS_t model_full_create(void) { - return new AsFull(); + return new simgrid::surf::AsFull(); } void model_full_end(AS_t _routing) @@ -25,7 +22,7 @@ void model_full_end(AS_t _routing) sg_platf_route_cbarg_t e_route; /* set utils vars */ - AsFull *routing = static_cast(_routing); + simgrid::surf::AsFull *routing = static_cast(_routing); int table_size = (int)xbt_dynar_length(routing->p_indexNetworkElm); /* Create table if necessary */ @@ -48,6 +45,9 @@ void model_full_end(AS_t _routing) } } +namespace simgrid { +namespace surf { + AsFull::AsFull(){ p_routingTable = 0; } @@ -267,6 +267,5 @@ void AsFull::parseRoute(sg_platf_route_cbarg_t route) xbt_dynar_free(&route->link_list); } - - - +} +}