Update copyright notices

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

diff --git a/src/surf/surf_routing_generic.hpp b/src/surf/surf_routing_generic.hpp
index 53928b1..7eed697 100644 (file)
--- a/src/surf/surf_routing_generic.hpp
+++ b/src/surf/surf_routing_generic.hpp
@@ -1,4 +1,4 @@
-/* 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
@@ -10,7 +10,6 @@
 #define SURF_ROUTING_GENERIC_HPP_
 
 class AsGeneric;
-typedef AsGeneric *AsGenericPtr;
 
 void generic_free_route(sg_platf_route_cbarg_t route);
 
@@ -19,26 +18,26 @@ public:
   AsGeneric();
   ~AsGeneric();
 
-  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_ */