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
Kill deprecated private field ActorImpl::userdata_ (use Actor::get/set_data instead).
[simgrid.git]
/
src
/
kernel
/
actor
/
ActorImpl.hpp
diff --git
a/src/kernel/actor/ActorImpl.hpp
b/src/kernel/actor/ActorImpl.hpp
index
b8fc8ac
..
e9c6e4b
100644
(file)
--- a/
src/kernel/actor/ActorImpl.hpp
+++ b/
src/kernel/actor/ActorImpl.hpp
@@
-22,7
+22,6
@@
namespace actor {
class XBT_PUBLIC ActorImpl : public xbt::PropertyHolder {
s4u::Host* host_ = nullptr; /* the host on which the actor is running */
class XBT_PUBLIC ActorImpl : public xbt::PropertyHolder {
s4u::Host* host_ = nullptr; /* the host on which the actor is running */
- void* userdata_ = nullptr; /* XBT_ATTRIB_DEPRECATED_v329 kept for compatibility, should be replaced with moddata */
aid_t pid_ = 0;
aid_t ppid_ = -1;
bool daemon_ = false; /* Daemon actors are automatically killed when the last non-daemon leaves */
aid_t pid_ = 0;
aid_t ppid_ = -1;
bool daemon_ = false; /* Daemon actors are automatically killed when the last non-daemon leaves */
@@
-52,8
+51,6
@@
public:
// Accessors to private fields
s4u::Host* get_host() { return host_; }
void set_host(s4u::Host* dest);
// Accessors to private fields
s4u::Host* get_host() { return host_; }
void set_host(s4u::Host* dest);
- void* get_user_data() { return userdata_; } // XBT_ATTRIB_DEPRECATED_v329
- void set_user_data(void* data) { userdata_ = data; } // XBT_ATTRIB_DEPRECATED_v329
aid_t get_pid() const { return pid_; }
aid_t get_ppid() const { return ppid_; }
void set_ppid(aid_t ppid) { ppid_ = ppid; }
aid_t get_pid() const { return pid_; }
aid_t get_ppid() const { return ppid_; }
void set_ppid(aid_t ppid) { ppid_ = ppid; }
@@
-182,7
+179,7
@@
public:
explicit ProcessArg(s4u::Host* host, ActorImpl* actor)
: name(actor->get_name())
, code(actor->code_)
explicit ProcessArg(s4u::Host* host, ActorImpl* actor)
: name(actor->get_name())
, code(actor->code_)
- , data(actor->get_
user
_data())
+ , data(actor->get_
ciface()->get
_data())
, host(host)
, kill_time(actor->get_kill_time())
, auto_restart(actor->has_to_auto_restart())
, host(host)
, kill_time(actor->get_kill_time())
, auto_restart(actor->has_to_auto_restart())