From: Arnaud Giersch Date: Thu, 21 Nov 2013 10:51:01 +0000 (+0100) Subject: Fix clang warnings about mismatched declarations (struct vs. class). X-Git-Tag: v3_11_beta~241 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/6af809fdd97845671db6136b3903e0d543ab7217 Fix clang warnings about mismatched declarations (struct vs. class). --- diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h index 67db839fb5..07bda08049 100644 --- 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 6f7a5682fd..2c47691aeb 100644 --- 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;