X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/922fa4ad065ee6bdd206735ff8c0f8e13964be8c..b35d70d6818026204833410d2e3917252fa35127:/src/surf/surf_routing_dijkstra.hpp

diff --git a/src/surf/surf_routing_dijkstra.hpp b/src/surf/surf_routing_dijkstra.hpp
index 033e4f9aaa..9450b2e446 100644
--- a/src/surf/surf_routing_dijkstra.hpp
+++ b/src/surf/surf_routing_dijkstra.hpp
@@ -1,9 +1,11 @@
-/* Copyright (c) 2013-2014. The SimGrid Team.
+/* Copyright (c) 2013-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
+#include <xbt/base.h>
+
 #include "surf_routing_generic.hpp"
 
 #ifndef SURF_ROUTING_DIJKSTRA_HPP_
@@ -23,11 +25,14 @@ typedef struct route_cache_element {
   int size;
 } s_route_cache_element_t, *route_cache_element_t;
 
+namespace simgrid {
+namespace surf {
+
 /***********
  * Classes *
  ***********/
-class AsDijkstra;
-typedef AsDijkstra *AsDijkstraPtr;
+
+class XBT_PRIVATE AsDijkstra;
 
 class AsDijkstra : public AsGeneric {
 public:
@@ -50,7 +55,7 @@ public:
      * will have a loopback attached to it.
      */
 	void addLoopback();
-	void getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_platf_route_cbarg_t route, double *lat);
+	void getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t route, double *lat);
 	xbt_dynar_t getOnelinkRoutes();
 	void getRouteAndLatency(sg_platf_route_cbarg_t route, double *lat);
 	void parseASroute(sg_platf_route_cbarg_t route);
@@ -63,4 +68,7 @@ public:
   int m_cached;
 };
 
+}
+}
+
 #endif /* SURF_ROUTING_DIJKSTRA_HPP_ */