kill a bunch of warnings that prevented me from compiling

[simgrid.git] / src / include / surf / surfxml_parse_values.h

diff --git a/src/include/surf/surfxml_parse_values.h b/src/include/surf/surfxml_parse_values.h
index 1d9c5eb..673c810 100644 (file)
--- a/src/include/surf/surfxml_parse_values.h
+++ b/src/include/surf/surfxml_parse_values.h
@@ -38,15 +38,17 @@ typedef struct s_cluster {
        char* V_cluster_prefix;
        char* V_cluster_suffix;
        char* V_cluster_radical;
-       char* S_cluster_power;
-       char* S_cluster_core;
-       char* S_cluster_bw;
-       char* S_cluster_lat;
-       char* S_cluster_bb_bw;
-       char* S_cluster_bb_lat;
+       double S_cluster_power;
+       int S_cluster_core;
+       double S_cluster_bw;
+       double S_cluster_lat;
+       double S_cluster_bb_bw;
+       double S_cluster_bb_lat;
        char* S_cluster_router_id;
        int V_cluster_sharing_policy;
        int V_cluster_bb_sharing_policy;
+       char* V_cluster_availability_file;
+       char* V_cluster_state_file;
 } s_cluster_t;
 
 typedef struct s_router *router_t;
@@ -64,7 +66,7 @@ typedef struct s_hostSG {
        tmgr_trace_t V_host_power_trace;                                                                        //availability file
        e_surf_resource_state_t V_host_state_initial;                                           //state
        tmgr_trace_t V_host_state_trace;                                                                        //state file
-       char* V_host_coord;
+       const char* V_host_coord;
 } s_hostSG_t;
 
 extern hostSG_t struct_host;
@@ -73,4 +75,8 @@ extern cluster_t struct_cluster;
 extern peer_t struct_peer;
 extern link_t struct_lnk;
 
+void STag_surfxml_host_cluster(void);
+void STag_surfxml_link_cluster(void);
+
+
 #endif /* SURFXML_PARSE_VALUES_H_ */