better leaking than segfaulting

[simgrid.git] / src / surf / surf_routing_cluster.hpp

diff --git a/src/surf/surf_routing_cluster.hpp b/src/surf/surf_routing_cluster.hpp
index f87953e..4cdb430 100644 (file)
--- a/src/surf/surf_routing_cluster.hpp
+++ b/src/surf/surf_routing_cluster.hpp
@@ -1,20 +1,25 @@
-/* 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. */
 
+#ifndef SURF_ROUTING_CLUSTER_HPP_
+#define SURF_ROUTING_CLUSTER_HPP_
+
+#include <xbt/base.h>
+
 #include "surf_routing_none.hpp"
 #include "network_interface.hpp"
 
-#ifndef SURF_ROUTING_CLUSTER_HPP_
-#define SURF_ROUTING_CLUSTER_HPP_
+namespace simgrid {
+namespace surf {
 
 /***********
  * Classes *
  ***********/
-class AsCluster;
 
+class XBT_PRIVATE AsCluster;
 
 /* ************************************************** */
 /* **************  Cluster ROUTING   **************** */
@@ -23,7 +28,7 @@ class AsCluster: public AsNone {
 public:
   AsCluster();
 
-  virtual void getRouteAndLatency(RoutingEdge *src, RoutingEdge *dst, sg_platf_route_cbarg_t into, double *latency);
+  virtual 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);
@@ -35,17 +40,19 @@ 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 parseAS(RoutingEdge *elm);
+  int parsePU(NetCard *elm); /* A host or a router, whatever */
+  int parseAS(NetCard *elm);
   virtual void create_links_for_node(sg_platf_cluster_cbarg_t cluster, int id, int rank, int position);
   Link* p_backbone;
   void *p_loopback;
-  RoutingEdge *p_router;
+  NetCard *p_router;
   int p_has_limiter;
   int p_has_loopback;
   int p_nb_links_per_node;
 
 };
 
+}
+}
 
 #endif /* SURF_ROUTING_CLUSTER_HPP_ */