fix some more MC examples

diff --git a/src/mc/mc_base.cpp b/src/mc/mc_base.cpp
index b178888..6f13189 100644 (file)
--- a/src/mc/mc_base.cpp
+++ b/src/mc/mc_base.cpp
@@ -107,7 +107,7 @@ bool request_is_enabled(smx_simcall_t req)
   case SIMCALL_COMM_WAITANY: {
     xbt_dynar_t comms;
     simgrid::kernel::activity::CommImpl* act =
   case SIMCALL_COMM_WAITANY: {
     xbt_dynar_t comms;
     simgrid::kernel::activity::CommImpl* act =

-        static_cast<simgrid::kernel::activity::CommImpl*>(&*simcall_comm_wait__get__comm(req));
+        static_cast<simgrid::kernel::activity::CommImpl*>(simcall_comm_wait__getraw__comm(req));

 
 #if SIMGRID_HAVE_MC
     s_xbt_dynar_t comms_buffer;
 
 #if SIMGRID_HAVE_MC
     s_xbt_dynar_t comms_buffer;

diff --git a/src/mc/mc_comm_pattern.cpp b/src/mc/mc_comm_pattern.cpp
index dfba80e..e14e34d 100644 (file)
--- a/src/mc/mc_comm_pattern.cpp
+++ b/src/mc/mc_comm_pattern.cpp
@@ -1,5 +1,4 @@
-/* Copyright (c) 2007-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2007-2017. 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. */
 
 /* 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. */


@@ -89,7 +88,7 @@ void MC_handle_comm_pattern(
     simgrid::mc::RemotePtr<simgrid::kernel::activity::CommImpl> comm_addr = nullptr;
     if (call_type == MC_CALL_TYPE_WAIT)
       comm_addr = remote(static_cast<simgrid::kernel::activity::CommImpl*>(
     simgrid::mc::RemotePtr<simgrid::kernel::activity::CommImpl> comm_addr = nullptr;
     if (call_type == MC_CALL_TYPE_WAIT)
       comm_addr = remote(static_cast<simgrid::kernel::activity::CommImpl*>(

-          simgrid::simix::unmarshal<simgrid::kernel::activity::ActivityImpl*>(req->result)));
+          simgrid::simix::unmarshal_raw<simgrid::kernel::activity::ActivityImpl*>(req->result)));

 
     else {
       simgrid::kernel::activity::CommImpl* addr;
 
     else {
       simgrid::kernel::activity::CommImpl* addr;