X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6de03ecc4e630732984a0673512a5d15fd75e270..ec4e2d87d99b8ad76c9096033eb858e9052b09fa:/src/surf/surf_routing_floyd.hpp

diff --git a/src/surf/surf_routing_floyd.hpp b/src/surf/surf_routing_floyd.hpp
index 57fca5eb95..1302a84e9b 100644
--- a/src/surf/surf_routing_floyd.hpp
+++ b/src/surf/surf_routing_floyd.hpp
@@ -1,27 +1,31 @@
-/* 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 "surf_routing_generic.hpp"
 
 #ifndef SURF_ROUTING_FLOYD_HPP_
 #define SURF_ROUTING_FLOYD_HPP_
 
+#include <xbt/base.h>
+
+#include "surf_routing_generic.hpp"
+
+namespace simgrid {
+namespace surf {
 
 /***********
  * Classes *
  ***********/
-class AsFloyd;
-typedef AsFloyd *AsFloydPtr;
+class XBT_PRIVATE AsFloyd;
 
 class AsFloyd: public AsGeneric {
 public:
   AsFloyd();
   ~AsFloyd();
 
-  void getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_platf_route_cbarg_t into, double *latency);
+  void getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t into, double *latency);
   xbt_dynar_t getOneLinkRoutes();
   void parseASroute(sg_platf_route_cbarg_t route);
   void parseRoute(sg_platf_route_cbarg_t route);
@@ -29,14 +33,14 @@ public:
   //void parseASroute(sg_platf_route_cbarg_t route);
 
   //void getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges);
-  //sg_platf_route_cbarg_t getBypassRoute(RoutingEdgePtr src, RoutingEdgePtr dst, double *lat);
+  //sg_platf_route_cbarg_t getBypassRoute(RoutingEdge *src, RoutingEdge *dst, double *lat);
 
   /* The parser calls the following functions to inform the routing models
    * 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(RoutingEdgePtr elm); /* A host or a router, whatever */
-  //int parseAS(RoutingEdgePtr elm);
+  //int parsePU(RoutingEdge *elm); /* A host or a router, whatever */
+  //int parseAS(RoutingEdge *elm);
 
   //virtual void parseBypassroute(sg_platf_route_cbarg_t e_route)=0;
 
@@ -46,6 +50,7 @@ public:
   sg_platf_route_cbarg_t *p_linkTable;
 };
 
-
+}
+}
 
 #endif /* SURF_ROUTING_FLOYD_HPP_ */