X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e2b07f653b8942d8d4cb4eab2f4ae15e9156b3ac..eac77828e5174e46ff0bffc3a17149aaefb62438:/src/surf/surf_routing_generic.hpp

diff --git a/src/surf/surf_routing_generic.hpp b/src/surf/surf_routing_generic.hpp
index 8418f673a1..073a2d4bc9 100644
--- a/src/surf/surf_routing_generic.hpp
+++ b/src/surf/surf_routing_generic.hpp
@@ -6,7 +6,7 @@
 
 #include <xbt/base.h>
 
-#include "surf_routing_none.hpp"
+#include "surf_routing.hpp"
 
 #ifndef SURF_ROUTING_GENERIC_HPP_
 #define SURF_ROUTING_GENERIC_HPP_
@@ -16,7 +16,7 @@ namespace surf {
 
 class XBT_PRIVATE AsGeneric;
 
-class XBT_PRIVATE AsGeneric : public AsNone {
+class XBT_PRIVATE AsGeneric : public As {
 public:
   AsGeneric(const char*name);
   ~AsGeneric();
@@ -29,8 +29,10 @@ public:
 
   virtual sg_platf_route_cbarg_t newExtendedRoute(e_surf_routing_hierarchy_t hierarchy, sg_platf_route_cbarg_t routearg, int change_order);
 protected:
-  void srcDstCheck(NetCard *src, NetCard *dst);
-  void parseRouteCheckParams(sg_platf_route_cbarg_t route);
+  void getRouteCheckParams(NetCard *src, NetCard *dst);
+  void addRouteCheckParams(sg_platf_route_cbarg_t route);
+private:
+  xbt_dict_t bypassRoutes_ = xbt_dict_new_homogeneous((void (*)(void *)) routing_route_free);
 };
 
 }