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

diff --git a/src/surf/surf_routing_full.hpp b/src/surf/surf_routing_full.hpp
index e3500c750b..4a6676f926 100644
--- a/src/surf/surf_routing_full.hpp
+++ b/src/surf/surf_routing_full.hpp
@@ -1,13 +1,23 @@
-#include "surf_routing_generic.hpp"
+/* 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. */
 
 #ifndef SURF_ROUTING_FULL_HPP_
 #define SURF_ROUTING_FULL_HPP_
 
+#include <xbt/base.h>
+
+#include "surf_routing_generic.hpp"
+
+namespace simgrid {
+namespace surf {
+
 /***********
  * Classes *
  ***********/
-class AsFull;
-typedef AsFull *AsFullPtr;
+class XBT_PRIVATE AsFull;
 
 class AsFull: public AsGeneric {
 public:
@@ -16,23 +26,25 @@ public:
   AsFull();
   ~AsFull();
 
-  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 parseRoute(sg_platf_route_cbarg_t route);
   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 */
-  //virtual int parsePU(RoutingEdgePtr elm)=0; /* A host or a router, whatever */
-  //virtual int parseAS( RoutingEdgePtr elm)=0;
+  //virtual int parsePU(RoutingEdge *elm)=0; /* 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_FULL_HPP_ */