X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/45c3f1cfee86fb48c96d53f8267f99b6db6e3d7a..a34d8237b8267686bbd259670f27da273ff5236e:/src/surf/surf_routing_cluster.hpp

diff --git a/src/surf/surf_routing_cluster.hpp b/src/surf/surf_routing_cluster.hpp
index 294fe2b5ab..c7fa8c805c 100644
--- a/src/surf/surf_routing_cluster.hpp
+++ b/src/surf/surf_routing_cluster.hpp
@@ -1,20 +1,21 @@
-/* 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_none.hpp"
-#include "network_interface.hpp"
-
 #ifndef SURF_ROUTING_CLUSTER_HPP_
 #define SURF_ROUTING_CLUSTER_HPP_
 
+#include <xbt/base.h>
+
+#include "surf_routing_none.hpp"
+#include "network_interface.hpp"
+
 /***********
  * Classes *
  ***********/
-class AsCluster;
-typedef AsCluster *AsClusterPtr;
+class XBT_PRIVATE AsCluster;
 
 
 /* ************************************************** */
@@ -24,24 +25,24 @@ class AsCluster: public AsNone {
 public:
   AsCluster();
 
-  virtual void getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_platf_route_cbarg_t into, double *latency);
+  virtual void getRouteAndLatency(RoutingEdge *src, RoutingEdge *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 */
-  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 create_links_for_node(sg_platf_cluster_cbarg_t cluster, int id, int rank, int position);
-  NetworkLinkPtr p_backbone;
+  Link* p_backbone;
   void *p_loopback;
-  RoutingEdgePtr p_router;
+  RoutingEdge *p_router;
   int p_has_limiter;
   int p_has_loopback;
   int p_nb_links_per_node;