Merge branch 'add_remaining_comm_sync_bindings' into 'master'

[simgrid.git] / src / s4u / s4u_Actor.cpp

diff --git a/src/s4u/s4u_Actor.cpp b/src/s4u/s4u_Actor.cpp
index 751f333476fb267de344b013dfa5d3d71371dbac..7206d09c654f89952b9765be5b959b1cb150f543 100644 (file)
--- a/src/s4u/s4u_Actor.cpp
+++ b/src/s4u/s4u_Actor.cpp
@@ -112,7 +112,7 @@ void Actor::join(double timeout) const
   kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self();
   const kernel::actor::ActorImpl* target = pimpl_;
   kernel::actor::simcall_blocking([issuer, target, timeout] {
-    if (target->finished_) {
+    if (target->context_->wannadie()) {
       // The joined actor is already finished, just wake up the issuer right away
       issuer->simcall_answer();
     } else {
@@ -137,7 +137,7 @@ Actor* Actor::set_auto_restart(bool autorestart)
   });
   return this;
 }
-int Actor::get_restart_count()
+int Actor::get_restart_count() const
 {
   return pimpl_->get_restart_count();
 }