X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/283236f8e2414d7c30d46e6d1aea0e8882699dd1..649ff8bac9ec72bc9321a7b21843cd41f7b7e7bc:/src/surf/surf_routing_generic.hpp

diff --git a/src/surf/surf_routing_generic.hpp b/src/surf/surf_routing_generic.hpp
index 756460b6fc..fd386a6cc7 100644
--- a/src/surf/surf_routing_generic.hpp
+++ b/src/surf/surf_routing_generic.hpp
@@ -1,37 +1,43 @@
+/* Copyright (c) 2013-2014. 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"
 
 #ifndef SURF_ROUTING_GENERIC_HPP_
 #define SURF_ROUTING_GENERIC_HPP_
 
 class AsGeneric;
-typedef AsGeneric *AsGenericPtr;
+
+void generic_free_route(sg_platf_route_cbarg_t route);
 
 class AsGeneric : public AsNone {
 public:
   AsGeneric();
   ~AsGeneric();
-  int test(){return 2;};
 
-  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);
   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 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 */
-  virtual int parsePU(RoutingEdgePtr elm); /* A host or a router, whatever */
-  virtual int parseAS( RoutingEdgePtr elm);
+  virtual int parsePU(RoutingEdge *elm); /* A host or a router, whatever */
+  virtual int parseAS(RoutingEdge *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 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 As *asExist(As *to_find);
+  virtual As *autonomousSystemExist(char *element);
+  virtual As *processingUnitsExist(char *element);
+  virtual void srcDstCheck(RoutingEdge *src, RoutingEdge *dst);
 };
 
 #endif /* SURF_ROUTING_GENERIC_HPP_ */