X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7ecb4ca0914cfbd58786dac35ec97fc7c5518332..b0d07f67c6153ee2689bc22486c95becf4286493:/src/mc/mc_smx.cpp

diff --git a/src/mc/mc_smx.cpp b/src/mc/mc_smx.cpp
index 2830defe05..e57e6bd7a8 100644
--- a/src/mc/mc_smx.cpp
+++ b/src/mc/mc_smx.cpp
@@ -101,7 +101,7 @@ smx_actor_t MC_smx_simcall_get_issuer(s_smx_simcall const* req)
   xbt_assert(mc_model_checker != nullptr);
 
   // This is the address of the smx_actor in the MCed process:
-  auto address = simgrid::mc::remote(req->issuer);
+  auto address = simgrid::mc::remote(req->issuer_);
 
   // Lookup by address:
   for (auto& actor : mc_model_checker->process().actors())
@@ -123,7 +123,8 @@ const char* MC_smx_actor_get_host_name(smx_actor_t actor)
 
   // Read the simgrid::xbt::string in the MCed process:
   simgrid::mc::ActorInformation* info     = actor_info_cast(actor);
-  auto remote_string_address              = remote((simgrid::xbt::string_data*)&actor->get_host()->get_name());
+  auto remote_string_address =
+      remote(reinterpret_cast<const simgrid::xbt::string_data*>(&actor->get_host()->get_name()));
   simgrid::xbt::string_data remote_string = process->read(remote_string_address);
   char hostname[remote_string.len];
   process->read_bytes(hostname, remote_string.len + 1, remote(remote_string.data));
@@ -148,7 +149,9 @@ const char* MC_smx_actor_get_name(smx_actor_t actor)
 unsigned long MC_smx_get_maxpid()
 {
   unsigned long maxpid;
-  mc_model_checker->process().read_variable("simix_process_maxpid",
-    &maxpid, sizeof(maxpid));
+  const char* name = "simgrid::kernel::actor::maxpid";
+  if (mc_model_checker->process().find_variable(name) == nullptr)
+    name = "maxpid"; // We seem to miss the namespaces when compiling with GCC
+  mc_model_checker->process().read_variable(name, &maxpid, sizeof(maxpid));
   return maxpid;
 }