Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

[simgrid.git] / src / s4u / s4u_actor.cpp

diff --git a/src/s4u/s4u_actor.cpp b/src/s4u/s4u_actor.cpp
index 7a53a10..1b46b96 100644 (file)
--- a/src/s4u/s4u_actor.cpp
+++ b/src/s4u/s4u_actor.cpp
@@ -35,7 +35,7 @@ ActorPtr Actor::createActor(const char* name, s4u::Host *host, double killTime,
 {
   // TODO, when autorestart is used, the std::function is copied so the new
   // instance will get a fresh (reinitialized) state. Is this what we want?
-  smx_process_t process = simcall_process_create(
+  smx_actor_t process = simcall_process_create(
     name, std::move(code), nullptr, host->name().c_str(),
     killTime, nullptr, 0);
   return ActorPtr(&process->getIface());
@@ -46,7 +46,7 @@ ActorPtr Actor::createActor(const char* name, s4u::Host *host, double killTime,
 {
   simgrid::simix::ActorCodeFactory& factory = SIMIX_get_actor_code_factory(function);
   simgrid::simix::ActorCode code = factory(std::move(args));
-  smx_process_t process = simcall_process_create(
+  smx_actor_t process = simcall_process_create(
     name, std::move(code), nullptr, host->name().c_str(),
     killTime, nullptr, 0);
   return ActorPtr(&process->getIface());
@@ -97,7 +97,7 @@ void Actor::kill(int pid) {
   }
 }
 
-smx_process_t Actor::getImpl() {
+smx_actor_t Actor::getImpl() {
   return pimpl_;
 }
 
@@ -109,7 +109,7 @@ void Actor::kill() {
 
 ActorPtr Actor::forPid(int pid)
 {
-  smx_process_t process = SIMIX_process_from_PID(pid);
+  smx_actor_t process = SIMIX_process_from_PID(pid);
   if (process != nullptr)
     return ActorPtr(&process->getIface());
   else