X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/399e4077a352ec6e0ad4134e5645a29d0d241c88..6534c58a2afafe609a4671073f6b20f839e20fd7:/src/surf/surf_routing_generic.hpp

diff --git a/src/surf/surf_routing_generic.hpp b/src/surf/surf_routing_generic.hpp
index 7c99e58fdd..ce2c2876f4 100644
--- a/src/surf/surf_routing_generic.hpp
+++ b/src/surf/surf_routing_generic.hpp
@@ -1,36 +1,45 @@
+/* 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_none.hpp"
 
 #ifndef SURF_ROUTING_GENERIC_HPP_
 #define SURF_ROUTING_GENERIC_HPP_
 
-class AsGeneric;
-typedef AsGeneric *AsGenericPtr;
+namespace simgrid {
+namespace surf {
 
-class AsGeneric : public AsNone {
+class XBT_PRIVATE AsGeneric;
+
+class XBT_PRIVATE AsGeneric : public AsNone {
 public:
-  AsGeneric();
+  AsGeneric(const char*name);
   ~AsGeneric();
 
-  virtual void getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_platf_route_cbarg_t into, double *latency);
-  virtual xbt_dynar_t getOneLinkRoutes();
-  virtual void getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges);
-  virtual sg_platf_route_cbarg_t getBypassRoute(RoutingEdgePtr src, RoutingEdgePtr dst, double *lat);
+  virtual void getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t into, double *latency) override;
+  virtual void getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges) override;
+  virtual 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 */
-  virtual int parsePU(RoutingEdgePtr elm); /* A host or a router, whatever */
-  virtual int parseAS( RoutingEdgePtr elm);
-  virtual void parseRoute(sg_platf_route_cbarg_t route);
-  virtual void parseASroute(sg_platf_route_cbarg_t route);
-  virtual void parseBypassroute(sg_platf_route_cbarg_t e_route);
+  virtual int parsePU(NetCard *elm) override; /* A host or a router, whatever */
+  virtual int parseAS(NetCard *elm) override;
+  virtual void parseRoute(sg_platf_route_cbarg_t route) override;
+  virtual void parseASroute(sg_platf_route_cbarg_t route) override;
+  virtual void parseBypassroute(sg_platf_route_cbarg_t e_route) override;
 
   virtual sg_platf_route_cbarg_t newExtendedRoute(e_surf_routing_hierarchy_t hierarchy, sg_platf_route_cbarg_t routearg, int change_order);
-  virtual AsPtr asExist(AsPtr to_find);
-  virtual AsPtr autonomousSystemExist(char *element);
-  virtual AsPtr processingUnitsExist(char *element);
-  virtual void srcDstCheck(RoutingEdgePtr src, RoutingEdgePtr dst);
+  virtual void srcDstCheck(NetCard *src, NetCard *dst);
 };
 
+}
+}
+
 #endif /* SURF_ROUTING_GENERIC_HPP_ */