[project-description] Fix extraction of the ns-3 version.

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

diff --git a/src/mc/mc_smx.cpp b/src/mc/mc_smx.cpp
index a2d3310..7593fc2 100644 (file)
--- a/src/mc/mc_smx.cpp
+++ b/src/mc/mc_smx.cpp
@@ -8,7 +8,6 @@
 #include "src/mc/ModelChecker.hpp"
 #include "src/mc/remote/RemoteProcess.hpp"
 
-using simgrid::mc::remote;
 /** @file
  *  @brief (Cross-process, MCer/MCed) Access to SMX structures
  *
@@ -29,7 +28,7 @@ using simgrid::mc::remote;
 /** Load the remote list of processes into a vector
  *
  *  @param process      MCed process
- *  @param target       Local vector (to be filled with copies of `s_smx_actor_t`)
+ *  @param target       Local vector (to be filled with `simgrid::mc::ActorInformation`)
  *  @param remote_dynar Address of the process dynar in the remote list
  */
 static void MC_process_refresh_simix_actor_dynar(const simgrid::mc::RemoteProcess* process,
@@ -41,7 +40,7 @@ static void MC_process_refresh_simix_actor_dynar(const simgrid::mc::RemoteProces
   s_xbt_dynar_t dynar;
   process->read_bytes(&dynar, sizeof(dynar), remote_dynar);
 
-  auto* data = static_cast<smx_actor_t*>(::operator new(dynar.elmsize * dynar.used));
+  auto* data = static_cast<simgrid::kernel::actor::ActorImpl**>(::operator new(dynar.elmsize * dynar.used));
   process->read_bytes(data, dynar.elmsize * dynar.used, simgrid::mc::RemotePtr<void>(dynar.data));
 
   // Load each element of the vector from the MCed process:
@@ -49,13 +48,12 @@ static void MC_process_refresh_simix_actor_dynar(const simgrid::mc::RemoteProces
     simgrid::mc::ActorInformation info;
 
     info.address  = simgrid::mc::RemotePtr<simgrid::kernel::actor::ActorImpl>(data[i]);
-    process->read_bytes(&info.copy, sizeof(info.copy), remote(data[i]));
+    process->read_bytes(&info.copy, sizeof(info.copy), simgrid::mc::remote(data[i]));
     target.push_back(std::move(info));
   }
   ::operator delete(data);
 }
-namespace simgrid {
-namespace mc {
+namespace simgrid::mc {
 
 void RemoteProcess::refresh_simix()
 {
@@ -67,5 +65,4 @@ void RemoteProcess::refresh_simix()
   this->cache_flags_ |= RemoteProcess::cache_simix_processes;
 }
 
-}
-}
+} // namespace simgrid::mc