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

diff --git a/src/surf/surf_routing_none.hpp b/src/surf/surf_routing_none.hpp
index 042161ef72..b537f9d183 100644
--- 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 {
+
+/** No specific routing. Mainly useful with the constant network model */
+class XBT_PRIVATE AsNone : public As {
 public:
-  AsNone();
+  AsNone(const char*name);
+  void Seal() override {}; // nothing to do
   ~AsNone();
 
-  void getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr 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);
+  void getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t into, double *latency) override;
+  xbt_dynar_t getOneLinkRoutes() override;
+  void getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges) override;
+  sg_platf_route_cbarg_t getBypassRoute(NetCard *src, NetCard *dst, double *lat) override;
 
   /* 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);
-  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);
+  void parseRoute(sg_platf_route_cbarg_t route) override;
+  void parseASroute(sg_platf_route_cbarg_t route) override;
+  void parseBypassroute(sg_platf_route_cbarg_t e_route) override;
 };
 
+}
+}
 
 #endif /* SURF_ROUTING_NONE_HPP_ */