Add #include <simgrid/config.h>.

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

diff --git a/include/simgrid/actor.h b/include/simgrid/actor.h
index 3640e26..6fb3693 100644 (file)
--- a/include/simgrid/actor.h
+++ b/include/simgrid/actor.h
@@ -56,7 +56,7 @@ XBT_ATTRIB_DEPRECATED_v329("Please use sg_actor_set_host() instead") XBT_PUBLIC
 #endif
 
 XBT_PUBLIC void sg_actor_set_host(sg_actor_t actor, sg_host_t host);
-XBT_PUBLIC void sg_actor_join(sg_actor_t actor, double timeout);
+XBT_PUBLIC void sg_actor_join(const_sg_actor_t actor, double timeout);
 XBT_PUBLIC void sg_actor_kill(sg_actor_t actor);
 XBT_PUBLIC void sg_actor_kill_all();
 XBT_PUBLIC void sg_actor_set_kill_time(sg_actor_t actor, double kill_time);
@@ -69,16 +69,23 @@ XBT_PUBLIC sg_actor_t sg_actor_self();
 XBT_PUBLIC aid_t sg_actor_self_get_pid();
 XBT_PUBLIC aid_t sg_actor_self_get_ppid();
 XBT_PUBLIC const char* sg_actor_self_get_name();
-XBT_PUBLIC void* sg_actor_self_data();
-XBT_PUBLIC void sg_actor_self_data_set(void* data);
+XBT_PUBLIC void* sg_actor_self_get_data();
+XBT_PUBLIC void sg_actor_self_set_data(void* data);
+XBT_ATTRIB_DEPRECATED_v330("Please use sg_actor_self_get_data() instead") XBT_PUBLIC void* sg_actor_self_data();
+XBT_ATTRIB_DEPRECATED_v330("Please use sg_actor_self_set_data() instead") XBT_PUBLIC
+    void sg_actor_self_data_set(void* data);
 XBT_ATTRIB_DEPRECATED_v330("Please use sg_actor_execute() instead") XBT_PUBLIC void sg_actor_self_execute(double flops);
 XBT_PUBLIC void sg_actor_execute(double flops);
 XBT_PUBLIC void sg_actor_execute_with_priority(double flops, double priority);
 void sg_actor_parallel_execute(int host_nb, sg_host_t* host_list, double* flops_amount, double* bytes_amount);
 XBT_PUBLIC void sg_actor_ref(const_sg_actor_t actor);
 XBT_PUBLIC void sg_actor_unref(const_sg_actor_t actor);
-XBT_PUBLIC void* sg_actor_data(const_sg_actor_t actor);
-XBT_PUBLIC void sg_actor_data_set(sg_actor_t actor, void* userdata);
+XBT_PUBLIC void* sg_actor_get_data(const_sg_actor_t actor);
+XBT_PUBLIC void sg_actor_set_data(sg_actor_t actor, void* userdata);
+XBT_ATTRIB_DEPRECATED_v330("Please use sg_actor_get_data() instead") XBT_PUBLIC
+    void* sg_actor_data(const_sg_actor_t actor);
+XBT_ATTRIB_DEPRECATED_v330("Please use sg_actor_set_data() instead") XBT_PUBLIC
+    void sg_actor_data_set(sg_actor_t actor, void* userdata);
 
 XBT_PUBLIC sg_exec_t sg_actor_exec_init(double computation_amount);
 XBT_PUBLIC sg_exec_t sg_actor_parallel_exec_init(int host_nb, const sg_host_t* host_list, double* flops_amount,