Merge branch 'master' into depencencies

[simgrid.git] / src / kernel / activity / ActivityImpl.cpp

diff --git a/src/kernel/activity/ActivityImpl.cpp b/src/kernel/activity/ActivityImpl.cpp
index c5f3524..baa4dc0 100644 (file)
--- a/src/kernel/activity/ActivityImpl.cpp
+++ b/src/kernel/activity/ActivityImpl.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2020. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -21,7 +21,7 @@ ActivityImpl::~ActivityImpl()
 void ActivityImpl::register_simcall(smx_simcall_t simcall)
 {
   simcalls_.push_back(simcall);
-  simcall->issuer->waiting_synchro = this;
+  simcall->issuer_->waiting_synchro = this;
 }
 
 void ActivityImpl::clean_action()
@@ -60,7 +60,7 @@ void ActivityImpl::cancel()
   XBT_VERB("Activity %p is canceled", this);
   if (surf_action_ != nullptr)
     surf_action_->cancel();
-  state_ = SIMIX_CANCELED;
+  state_ = State::CANCELED;
 }
 
 // boost::intrusive_ptr<Activity> support: