Rename kernel::activity::Synchro into kernel::activity::ActivityImpl

[simgrid.git] / src / simix / ActorImpl.cpp

diff --git a/src/simix/ActorImpl.cpp b/src/simix/ActorImpl.cpp
index 5a45462..ce44678 100644 (file)
--- a/src/simix/ActorImpl.cpp
+++ b/src/simix/ActorImpl.cpp
@@ -197,9 +197,7 @@ void create_maestro(std::function<void()> code)
 }
 }
 
-/**
- * \brief Creates and runs the maestro process
- */
+/** @brief Creates and runs the maestro process */
 void SIMIX_maestro_create(void (*code)(void*), void* data)
 {
   simgrid::simix::create_maestro(std::bind(code, data));
@@ -395,7 +393,7 @@ smx_process_t SIMIX_process_attach(
   /* Tracing the process creation */
   TRACE_msg_process_create(process->name.c_str(), process->pid, process->host);
 
-  auto context = dynamic_cast<simgrid::simix::AttachContext*>(process->context);
+  auto context = dynamic_cast<simgrid::kernel::context::AttachContext*>(process->context);
   if (!context)
     xbt_die("Not a suitable context");
 
@@ -405,7 +403,7 @@ smx_process_t SIMIX_process_attach(
 
 void SIMIX_process_detach()
 {
-  auto context = dynamic_cast<simgrid::simix::AttachContext*>(SIMIX_context_self());
+  auto context = dynamic_cast<simgrid::kernel::context::AttachContext*>(SIMIX_context_self());
   if (!context)
     xbt_die("Not a suitable context");
 
@@ -414,7 +412,7 @@ void SIMIX_process_detach()
   // Let maestro ignore we are still alive:
   // xbt_swag_remove(context->process(), simix_global->process_list);
 
-  // TODDO, Remove from proces list:
+  // TODO, Remove from proces list:
   //   xbt_swag_remove(process, sg_host_simix(host)->process_list);
 
   context->attach_stop();
@@ -782,7 +780,7 @@ static int SIMIX_process_join_finish(smx_process_exit_status_t status, smx_synch
 smx_synchro_t SIMIX_process_join(smx_process_t issuer, smx_process_t process, double timeout)
 {
   smx_synchro_t res = SIMIX_process_sleep(issuer, timeout);
-  static_cast<simgrid::kernel::activity::Synchro*>(res)->ref();
+  static_cast<simgrid::kernel::activity::ActivityImpl*>(res)->ref();
   SIMIX_process_on_exit(process, (int_f_pvoid_pvoid_t)SIMIX_process_join_finish, res);
   return res;
 }