Undeprecate SIMIX_process_self_{get,set}_data.

It's used by user code (e.g. StarPU) and the suggested replacement cannot work
since ActorImpl is not part of the public API.

diff --git a/include/simgrid/simix.h b/include/simgrid/simix.h
index db8f5dc..296d707 100644 (file)
--- a/include/simgrid/simix.h
+++ b/include/simgrid/simix.h
@@ -133,9 +133,8 @@ SG_BEGIN_DECL()
 XBT_PUBLIC int SIMIX_process_count();
 XBT_PUBLIC smx_actor_t SIMIX_process_self();
 XBT_PUBLIC const char* SIMIX_process_self_get_name();
-XBT_ATTRIB_DEPRECATED_v325("Please use ActorImpl::set_user_data()") XBT_PUBLIC
-    void SIMIX_process_self_set_data(void* data);
-XBT_ATTRIB_DEPRECATED_v325("Please use ActorImpl::get_user_data()") XBT_PUBLIC void* SIMIX_process_self_get_data();
+XBT_PUBLIC void SIMIX_process_self_set_data(void* data);
+XBT_PUBLIC void* SIMIX_process_self_get_data();
 XBT_ATTRIB_DEPRECATED_v325("Please manifest if you actually need this function") XBT_PUBLIC
     int SIMIX_process_has_pending_comms(smx_actor_t process);
 XBT_ATTRIB_DEPRECATED_v325("Please use SIMIX_process_on_exit(smx_actor_t, const std::function<void(bool)>&)") XBT_PUBLIC

diff --git a/src/kernel/actor/ActorImpl.cpp b/src/kernel/actor/ActorImpl.cpp
index 4c83228..a599e87 100644 (file)
--- a/src/kernel/actor/ActorImpl.cpp
+++ b/src/kernel/actor/ActorImpl.cpp
@@ -557,7 +557,7 @@ int SIMIX_process_count()
   return simix_global->process_list.size();
 }
 
-void* SIMIX_process_self_get_data() // deprecated
+void* SIMIX_process_self_get_data()
 {
   smx_actor_t self = SIMIX_process_self();
 
@@ -567,7 +567,7 @@ void* SIMIX_process_self_get_data() // deprecated
   return self->get_user_data();
 }
 
-void SIMIX_process_self_set_data(void* data) // deprecated
+void SIMIX_process_self_set_data(void* data)
 {
   SIMIX_process_self()->set_user_data(data);
 }