Fix clang warnings about mismatched declarations (struct vs. class).

diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h
index 67db839..07bda08 100644 (file)
--- a/src/include/surf/surf.h
+++ b/src/include/surf/surf.h
@@ -57,8 +57,8 @@ class Cpu;
 class Action;
 class ActionLmm;
 class StorageActionLmm;
-class As;
-class RoutingEdge;
+struct As;
+struct RoutingEdge;
 class RoutingPlatf;
 #else
 typedef struct Model Model;

diff --git a/src/surf/surf_routing.hpp b/src/surf/surf_routing.hpp
index 6f7a568..2c47691 100644 (file)
--- a/src/surf/surf_routing.hpp
+++ b/src/surf/surf_routing.hpp
@@ -14,13 +14,13 @@ xbt_edge_t new_xbt_graph_edge (xbt_graph_t graph, xbt_node_t s, xbt_node_t d, xb
 /***********
  * Classes *
  ***********/
-class As;
+struct As;
 typedef As *AsPtr;
 
 class RoutingModelDescription;
 typedef RoutingModelDescription *RoutingModelDescriptionPtr;
 
-class RoutingEdge;
+struct RoutingEdge;
 typedef RoutingEdge *RoutingEdgePtr;
 
 class Onelink;
@@ -37,7 +37,7 @@ typedef RoutingPlatf *RoutingPlatfPtr;
   void end(AsPtr as);
 };*/
 
-class As {
+struct As {
 public:
   xbt_dynar_t p_indexNetworkElm;
   xbt_dict_t p_bypassRoutes;    /* store bypass routes */
@@ -68,7 +68,7 @@ public:
   virtual void parseBypassroute(sg_platf_route_cbarg_t e_route)=0;
 };
 
-class RoutingEdge {
+struct RoutingEdge {
 public:
   AsPtr p_rcComponent;
   e_surf_network_element_type_t p_rcType;