make cluster routing a bit more flexible, to allow adding other kinds of clusters

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

diff --git a/src/surf/surf_routing_private.hpp b/src/surf/surf_routing_private.hpp
index e3d718b..54c50b7 100644 (file)
--- a/src/surf/surf_routing_private.hpp
+++ b/src/surf/surf_routing_private.hpp
@@ -10,7 +10,7 @@
 #include <float.h>
 #include "internal_config.h"
 
-#include "surf.hpp"
+#include "surf_interface.hpp"
 #include "xbt/dynar.h"
 #include "xbt/str.h"
 #include "xbt/config.h"
@@ -65,16 +65,10 @@ void model_floyd_parse_route(AS_t rc, sg_platf_route_cbarg_t route);
 
 /* ************************************************** */
 /* **************  Cluster ROUTING   **************** */
-class AsCluster : public As {
-public:
-  void *backbone;
-  void *loopback;
-  RoutingEdgePtr p_router;
-};
-typedef AsCluster *AsClusterPtr;
-//FIXME:remove} s_as_cluster_t, *as_cluster_t;
 
 AsPtr model_cluster_create(void);      /* create structures for cluster routing model */
+AsPtr model_torus_cluster_create(void);      /* create structures for cluster routing model */
+
 
 /* ************************************************** */
 /* **************  Vivaldi ROUTING   **************** */