Ouups, forgot those two files, bummer

[simgrid.git] / src / surf / network_gtnets_private.h

diff --git a/src/surf/network_gtnets_private.h b/src/surf/network_gtnets_private.h
index 96fd252..6dc0a41 100644 (file)
--- a/src/surf/network_gtnets_private.h
+++ b/src/surf/network_gtnets_private.h
@@ -12,15 +12,13 @@
 #include "xbt/dict.h"
 
 typedef struct network_link_GTNETS {
-  surf_model_t model;  /* Any such object, added in a trace
-                                  should start by this field!!! */
+  s_surf_resource_t generic_resource; /* Must remain first to allow casting */
   /* Using this object with the public part of
      model does not make sense */
-  char *name;
   double bw_current;
   double lat_current;
   int id;
-  /*holds the properties associated witht the link*/
+  /*holds the properties associated witht the link */
   xbt_dict_t properties;
 } s_network_link_GTNETS_t, *network_link_GTNETS_t;
 
@@ -28,7 +26,7 @@ typedef struct network_link_GTNETS {
 typedef struct network_card_GTNETS {
   char *name;
   int id;
-  /*holds the properties associated witht the card*/
+  /*holds the properties associated witht the card */
   xbt_dict_t properties;
 } s_network_card_GTNETS_t, *network_card_GTNETS_t;
 
@@ -43,9 +41,7 @@ typedef struct surf_action_network_GTNETS {
   network_card_GTNETS_t dst;
 } s_surf_action_network_GTNETS_t, *surf_action_network_GTNETS_t;
 
-extern xbt_dict_t network_card_set;
-
-
-#endif                         /* _SURF_NETWORK_PRIVATE_H */
+//extern xbt_dict_t network_card_set;
 
 
+#endif /* _SURF_NETWORK_PRIVATE_H */