better leaking than segfaulting

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

diff --git a/src/surf/surf_routing_none.hpp b/src/surf/surf_routing_none.hpp
index 042161e..a7f1cc9 100644 (file)
--- a/src/surf/surf_routing_none.hpp
+++ b/src/surf/surf_routing_none.hpp
@@ -1,34 +1,41 @@
-/* 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.hpp"
 
 #ifndef SURF_ROUTING_NONE_HPP_
 #define SURF_ROUTING_NONE_HPP_
 
-class AsNone : public As {
+namespace simgrid {
+namespace surf {
+
+class XBT_PRIVATE AsNone : public As {
 public:
   AsNone();
   ~AsNone();
 
-  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 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(NetCard *src, NetCard *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(NetCard *elm); /* A host or a router, whatever */
+  int parseAS( NetCard *elm);
   void parseRoute(sg_platf_route_cbarg_t route);
   void parseASroute(sg_platf_route_cbarg_t route);
   void parseBypassroute(sg_platf_route_cbarg_t e_route);
 };
 
+}
+}
 
 #endif /* SURF_ROUTING_NONE_HPP_ */