A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix ns3 and gtnets compilation
[simgrid.git]
/
src
/
surf
/
network_gtnets.c
diff --git
a/src/surf/network_gtnets.c
b/src/surf/network_gtnets.c
index
7cedacf
..
24d89c2
100644
(file)
--- a/
src/surf/network_gtnets.c
+++ b/
src/surf/network_gtnets.c
@@
-333,16
+333,16
@@
static void update_resource_state(void *id,
}
/* Max durations are not supported */
}
/* Max durations are not supported */
-static surf_action_t communicate(
void *
src_card,
-
void *dst_card, double size
,
- double rate)
+static surf_action_t communicate(
sg_routing_edge_t
src_card,
+
sg_routing_edge_t dst_card
,
+ double
size, double
rate)
{
surf_action_network_GTNETS_t action = NULL;
{
surf_action_network_GTNETS_t action = NULL;
- int src =
((network_element_t)src_card)
->id;
- int dst =
((network_element_t)dst_card)
->id;
- char *src_name =
((network_element_t)src_card)
->name;
- char *dst_name =
((network_element_t)dst_card)
->name;
+ int src =
src_card
->id;
+ int dst =
dst_card
->id;
+ char *src_name =
src_card
->name;
+ char *dst_name =
dst_card
->name;
xbt_assert((src >= 0
&& dst >= 0), "Either src or dst have invalid id (id<0)");
xbt_assert((src >= 0
&& dst >= 0), "Either src or dst have invalid id (id<0)");
@@
-438,7
+438,7
@@
static void surf_network_model_init_internal(void)
xbt_die("Impossible to initialize GTNetS interface");
}
xbt_die("Impossible to initialize GTNetS interface");
}
- routing_model_create(
sizeof(network_link_GTNETS_t),
NULL);
+ routing_model_create(NULL);
}
#ifdef HAVE_LATENCY_BOUND_TRACKING
}
#ifdef HAVE_LATENCY_BOUND_TRACKING