Merge branch 'bmf' into 'master'

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

diff --git a/src/kernel/activity/MailboxImpl.cpp b/src/kernel/activity/MailboxImpl.cpp
index 3cb2e1cf4572f13fc21aebf73034fe20fcb318e0..7af7743a77dac4bb9427290154e24b31c3ea9fe6 100644 (file)
--- a/src/kernel/activity/MailboxImpl.cpp
+++ b/src/kernel/activity/MailboxImpl.cpp
@@ -80,7 +80,7 @@ void MailboxImpl::clear()
   // CommImpl::cancel() will remove the comm from the mailbox..
   while (not comm_queue_.empty()) {
     auto comm = comm_queue_.back();
-    if (comm->get_state() == State::WAITING && not comm->detached()) {
+    if (comm->get_state() == State::WAITING && not comm->is_detached()) {
       comm->cancel();
       comm->set_state(State::DST_HOST_FAILURE);
     } else
@@ -142,9 +142,6 @@ CommImplPtr MailboxImpl::find_matching_comm(CommImplType type, bool (*match_fun)
 
   const CommImplPtr& comm = *iter;
   XBT_DEBUG("Found a matching communication synchro %p", comm.get());
-#if SIMGRID_HAVE_MC
-  comm->mbox_cpy = comm->get_mailbox();
-#endif
   comm->set_mailbox(nullptr);
   CommImplPtr comm_cpy = comm;
   if (remove_matching)