try to clean and uniformize Activity Impls

[simgrid.git] / src / mc / mc_state.cpp

diff --git a/src/mc/mc_state.cpp b/src/mc/mc_state.cpp
index 68440e0..035c8d7 100644 (file)
--- a/src/mc/mc_state.cpp
+++ b/src/mc/mc_state.cpp
@@ -113,7 +113,7 @@ static inline smx_simcall_t MC_state_get_request_for_process(simgrid::mc::State*
       simgrid::kernel::activity::CommImpl* act = temp_act.getBuffer();
       if (act->src_actor_.get() && act->dst_actor_.get())
         state->transition.argument = 0;
-      else if (act->src_actor_.get() == nullptr && act->type == simgrid::kernel::activity::CommImpl::Type::READY &&
+      else if (act->src_actor_.get() == nullptr && act->type_ == simgrid::kernel::activity::CommImpl::Type::READY &&
                act->detached == 1)
         state->transition.argument = 0;
       else
@@ -152,11 +152,10 @@ static inline smx_simcall_t MC_state_get_request_for_process(simgrid::mc::State*
   switch (req->call) {
   case SIMCALL_COMM_WAITANY: {
     state->internal_req.call = SIMCALL_COMM_WAIT;
-    simgrid::kernel::activity::ActivityImpl* remote_comm;
+    simgrid::kernel::activity::CommImpl* remote_comm;
     remote_comm =
-        mc_model_checker->process().read(remote(simcall_comm_waitany__getraw__comms(req) + state->transition.argument));
-    mc_model_checker->process().read(state->internal_comm,
-                                     remote(static_cast<simgrid::kernel::activity::CommImpl*>(remote_comm)));
+        mc_model_checker->process().read(remote(simcall_comm_waitany__get__comms(req) + state->transition.argument));
+    mc_model_checker->process().read(state->internal_comm, remote(remote_comm));
     simcall_comm_wait__set__comm(&state->internal_req, state->internal_comm.getBuffer());
     simcall_comm_wait__set__timeout(&state->internal_req, 0);
     break;