X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/745a5ade14924e2b2684a280e4cb75a9c1d3bee7..37026c8cf369c36af2673b6a9404d7871b197686:/src/smpi/internals/smpi_global.cpp

diff --git a/src/smpi/internals/smpi_global.cpp b/src/smpi/internals/smpi_global.cpp
index 70def16015..bb8f9502d5 100644
--- a/src/smpi/internals/smpi_global.cpp
+++ b/src/smpi/internals/smpi_global.cpp
@@ -71,11 +71,9 @@ std::string papi_default_config_name = "default";
 std::map</* computation unit name */ std::string, papi_process_data> units2papi_setup;
 #endif
 
-using simgrid::s4u::Actor;
-using simgrid::s4u::ActorPtr;
 std::unordered_map<std::string, double> location2speedup;
 
-static std::map</*process_id*/ ActorPtr, simgrid::smpi::ActorExt*> process_data;
+static std::map</*process_id*/ simgrid::s4u::ActorPtr, simgrid::smpi::ActorExt*> process_data;
 int process_count = 0;
 static int smpi_exit_status = 0;
 int smpi_universe_size = 0;
@@ -112,7 +110,7 @@ int smpi_process_count()
 
 simgrid::smpi::ActorExt* smpi_process()
 {
-  ActorPtr me = Actor::self();
+  simgrid::s4u::ActorPtr me = simgrid::s4u::Actor::self();
 
   if (me == nullptr) // This happens sometimes (eg, when linking against NS3 because it pulls openMPI...)
     return nullptr;
@@ -120,7 +118,7 @@ simgrid::smpi::ActorExt* smpi_process()
   return process_data.at(me);
 }
 
-simgrid::smpi::ActorExt* smpi_process_remote(ActorPtr actor)
+simgrid::smpi::ActorExt* smpi_process_remote(simgrid::s4u::ActorPtr actor)
 {
   return process_data.at(actor);
 }
@@ -134,11 +132,11 @@ void smpi_process_init(int *argc, char ***argv){
 }
 
 void * smpi_process_get_user_data(){
-  return Actor::self()->get_impl()->get_user_data();
+  return simgrid::s4u::Actor::self()->get_impl()->get_user_data();
 }
 
 void smpi_process_set_user_data(void *data){
-  Actor::self()->get_impl()->set_user_data(data);
+  simgrid::s4u::Actor::self()->get_impl()->set_user_data(data);
 }