Fix a bug

diff --git a/src/surf/surf_routing.cpp b/src/surf/surf_routing.cpp
index 8f8a1d4..589c475 100644 (file)
--- a/src/surf/surf_routing.cpp
+++ b/src/surf/surf_routing.cpp
@@ -6,6 +6,7 @@
 
 #include "surf_routing.hpp"
 #include "surf_routing_private.hpp"
+#include "surf_routing_cluster.hpp"
 
 #include "simgrid/platf_interface.h"    // platform creation API internal interface
 #include "simgrid/sg_config.h"

diff --git a/src/surf/surf_routing_private.hpp b/src/surf/surf_routing_private.hpp
index 1697941..5528943 100644 (file)
--- a/src/surf/surf_routing_private.hpp
+++ b/src/surf/surf_routing_private.hpp
@@ -65,14 +65,6 @@ 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 */
 

diff --git a/src/surf/vm_workstation_interface.hpp b/src/surf/vm_workstation_interface.hpp
index 5624de0..7217b9f 100644 (file)
--- a/src/surf/vm_workstation_interface.hpp
+++ b/src/surf/vm_workstation_interface.hpp
@@ -31,7 +31,7 @@ typedef WorkstationVMLmm *WorkstationVMLmmPtr;
  * Model *
  *********/
 
-class WorkstationVMModel : virtual public WorkstationModel {
+class WorkstationVMModel : public WorkstationModel {
 public:
   WorkstationVMModel();
   ~WorkstationVMModel(){};

diff --git a/src/surf/workstation_clm03.hpp b/src/surf/workstation_clm03.hpp
index 56534ff..b747713 100644 (file)
--- a/src/surf/workstation_clm03.hpp
+++ b/src/surf/workstation_clm03.hpp
@@ -23,7 +23,7 @@ typedef WorkstationCLM03Action *WorkstationCLM03ActionPtr;
  * Model *
  *********/
 
-class WorkstationCLM03Model : virtual public WorkstationModel {
+class WorkstationCLM03Model : public WorkstationModel {
 public:
   WorkstationCLM03Model(const char *name);
   WorkstationCLM03Model();