cosmetics: variable&fields renaming

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

diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h
index 5162f68..d96ba82 100644 (file)
--- a/src/surf/surf_private.h
+++ b/src/surf/surf_private.h
@@ -130,7 +130,7 @@ typedef enum {
 typedef struct s_as {
   xbt_dict_t to_index;                 /* char* -> network_element_t */
   xbt_dict_t bypassRoutes;             /* store bypass routes */
-  routing_model_description_t routing;
+  routing_model_description_t model_desc;
   e_surf_routing_hierarchy_t hierarchy;
   char *name;
   struct s_as *routing_father;
@@ -140,7 +140,6 @@ typedef struct s_as {
   double(*get_latency) (AS_t as, const char *src,
                         const char *dst, route_extended_t e_route);
   xbt_dynar_t(*get_onelink_routes) (AS_t as);
-  e_surf_network_element_type_t(*get_network_element_type) (const char *name);
   route_extended_t(*get_bypass_route) (AS_t as,
                                        const char *src, const char *dst);
   void (*finalize) (AS_t as);
@@ -171,11 +170,8 @@ struct s_routing_global {
   size_t size_of_link;
   xbt_dynar_t(*get_route_no_cleanup) (const char *src, const char *dst);
   xbt_dynar_t(*get_onelink_routes) (void);
-  double (*get_latency) (const char *src, const char *dst);
   void (*get_route_latency)(const char *src, const char *dst,
                             xbt_dynar_t *route, double *latency, int cleanup);
-  e_surf_network_element_type_t(*get_network_element_type) (const char *name);
-  xbt_dynar_t last_route;
 };
 
 XBT_PUBLIC(void) routing_model_create(size_t size_of_link, void *loopback);