X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b6e74c9611f84ac904a3658026cafab614c7d081..661e64114641721802e309fc277b081ea01078c8:/src/kernel/activity/SynchroRaw.cpp

diff --git a/src/kernel/activity/SynchroRaw.cpp b/src/kernel/activity/SynchroRaw.cpp
index 3b56ef8ff5..facb9d00ac 100644
--- a/src/kernel/activity/SynchroRaw.cpp
+++ b/src/kernel/activity/SynchroRaw.cpp
@@ -34,7 +34,7 @@ RawImpl& RawImpl::set_timeout(double timeout)
 RawImpl* RawImpl::start()
 {
   surf_action_ = host_->pimpl_cpu->sleep(timeout_);
-  surf_action_->set_data(this);
+  surf_action_->set_activity(this);
   return this;
 }
 
@@ -73,9 +73,7 @@ void RawImpl::finish()
     XBT_DEBUG("RawImpl::finish(): host '%s' failed", simcall->issuer->get_host()->get_cname());
     simcall->issuer->context_->iwannadie = true;
     simcall->issuer->exception_ = std::make_exception_ptr(HostFailureException(XBT_THROW_POINT, "Host failed"));
-  } else if (state_ == SIMIX_SRC_TIMEOUT) {
-    simcall->issuer->exception_ = std::make_exception_ptr(TimeoutError(XBT_THROW_POINT, "Synchronization timeout"));
-  } else {
+  } else if (state_ != SIMIX_SRC_TIMEOUT) {
     xbt_die("Internal error in RawImpl::finish() unexpected synchro state %d", static_cast<int>(state_));
   }