merge conflict resolved

[simgrid.git] / include / simix / simix.h

diff --git a/include/simix/simix.h b/include/simix/simix.h
index 3e5d219..7dadf97 100644 (file)
--- a/include/simix/simix.h
+++ b/include/simix/simix.h
@@ -154,12 +154,15 @@ XBT_PUBLIC(e_smx_state_t) simcall_process_sleep(double duration);
 
 /************************** Comunication simcalls *****************************/
 /***** Rendez-vous points *****/
+
 XBT_PUBLIC(smx_rdv_t) simcall_rdv_create(const char *name);
 XBT_PUBLIC(void) simcall_rdv_destroy(smx_rdv_t rvp);
 XBT_PUBLIC(smx_rdv_t) simcall_rdv_get_by_name(const char *name);
 XBT_PUBLIC(int) simcall_rdv_comm_count_by_host(smx_rdv_t rdv, smx_host_t host);
 XBT_PUBLIC(smx_action_t) simcall_rdv_get_head(smx_rdv_t rdv);
 
+XBT_PUBLIC(xbt_dict_t) SIMIX_get_rdv_points(void);
+
 /***** Communication simcalls *****/
 
 XBT_PUBLIC(void) simcall_comm_send(smx_rdv_t rdv, double task_size,