X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0fe1137efda109ff1a402ab5f8317d3ec3a676dc..b35d70d6818026204833410d2e3917252fa35127:/src/surf/surf_routing_vivaldi.hpp

diff --git a/src/surf/surf_routing_vivaldi.hpp b/src/surf/surf_routing_vivaldi.hpp
index 6d1094c3d2..9ad8f53da4 100644
--- a/src/surf/surf_routing_vivaldi.hpp
+++ b/src/surf/surf_routing_vivaldi.hpp
@@ -18,6 +18,9 @@ XBT_PRIVATE AS_t model_vivaldi_create(void);      /* create structures for vival
 #define ROUTER_PEER(peername) bprintf("router_%s", peername)
 #define LINK_PEER(peername) bprintf("link_%s", peername)
 
+namespace simgrid {
+namespace surf {
+
 /***********
  * Classes *
  ***********/
@@ -30,7 +33,7 @@ public:
   AsVivaldi() : AsGeneric() {};
   ~AsVivaldi() {};
 
-  void getRouteAndLatency(RoutingEdge *src, RoutingEdge *dst, sg_platf_route_cbarg_t into, double *latency);
+  void getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t into, double *latency);
   //void getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges);
   //sg_platf_route_cbarg_t getBypassRoute(RoutingEdge *src, RoutingEdge *dst, double *lat);
 
@@ -38,11 +41,13 @@ public:
    * that a new element is added to the AS currently built.
    *
    * Of course, only the routing model of this AS is informed, not every ones */
-  int parsePU(RoutingEdge *elm); /* A host or a router, whatever */
+  int parsePU(NetCard *elm); /* A host or a router, whatever */
   //virtual int parseAS( RoutingEdge *elm)=0;
 
   //virtual void parseBypassroute(sg_platf_route_cbarg_t e_route)=0;
 };
 
+}
+}
 
 #endif /* SURF_ROUTING_VIVALDI_HPP_ */