X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ae8140f19db6cb86f753e32499eab49190846d1f..967421ad9a8dcd567206f2c398a30c08c9507a81:/src/surf/network_constant.c

diff --git a/src/surf/network_constant.c b/src/surf/network_constant.c
index fc5580ddc6..e1be0fe41a 100644
--- a/src/surf/network_constant.c
+++ b/src/surf/network_constant.c
@@ -109,14 +109,14 @@ static void netcste_update_resource_state(void *id,
   DIE_IMPOSSIBLE;
 }
 
-static surf_action_t netcste_communicate(void *src,
-                                         void *dst, double size,
-                                         double rate)
+static surf_action_t netcste_communicate(sg_routing_edge_t src,
+                                         sg_routing_edge_t dst,
+                                         double size, double rate)
 {
   surf_action_network_Constant_t action = NULL;
 
-  char *src_name = ((network_element_t)src)->name;
-  char *dst_name = ((network_element_t)dst)->name;
+  char *src_name = src->name;
+  char *dst_name = dst->name;
 
   XBT_IN("(%s,%s,%g,%g)", src_name, dst_name, size, rate);
 
@@ -200,7 +200,7 @@ void surf_network_model_init_Constant()
   surf_network_model->action_unref = netcste_action_unref;
   surf_network_model->action_cancel = netcste_action_cancel;
   surf_network_model->action_recycle = net_action_recycle;
-  surf_network_model->get_remains = net_action_get_remains;
+  surf_network_model->get_remains = surf_action_get_remains;
 #ifdef HAVE_LATENCY_BOUND_TRACKING
   surf_network_model->get_latency_limited = net_get_link_latency_limited;
 #endif
@@ -217,7 +217,7 @@ void surf_network_model_init_Constant()
   surf_network_model->suspend = netcste_action_suspend;
   surf_network_model->resume = netcste_action_resume;
   surf_network_model->is_suspended = netcste_action_is_suspended;
-  surf_cpu_model->set_max_duration = net_action_set_max_duration;
+  surf_cpu_model->set_max_duration = surf_action_set_max_duration;
 
   surf_network_model->extension.network.communicate = netcste_communicate;
   surf_network_model->extension.network.get_link_bandwidth =
@@ -234,5 +234,5 @@ void surf_network_model_init_Constant()
   netcste_define_callbacks();
   xbt_dynar_push(model_list, &surf_network_model);
 
-  routing_model_create(sizeof(double), NULL);
+  routing_model_create(NULL);
 }