From 052f2deb51abb0bdbb2a2b6c7d052acdc030cfd5 Mon Sep 17 00:00:00 2001
From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Wed, 17 Apr 2019 21:13:16 +0200
Subject: [PATCH] Smart pointer is not necessary for Actor::self.

---
 include/simgrid/s4u/Actor.hpp | 2 +-
 src/s4u/s4u_Actor.cpp         | 6 +++---
 src/smpi/smpi_replay_main.cpp | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/simgrid/s4u/Actor.hpp b/include/simgrid/s4u/Actor.hpp
index 7bde9ca723..1dc179f78a 100644
--- a/include/simgrid/s4u/Actor.hpp
+++ b/include/simgrid/s4u/Actor.hpp
@@ -142,7 +142,7 @@ public:
 
   // ***** Actor creation *****
   /** Retrieve a reference to myself */
-  static ActorPtr self();
+  static Actor* self();
 
   /** Signal to others that a new actor has been created **/
   static xbt::signal<void(Actor&)> on_creation;
diff --git a/src/s4u/s4u_Actor.cpp b/src/s4u/s4u_Actor.cpp
index ef457c6d7e..99d80a7781 100644
--- a/src/s4u/s4u_Actor.cpp
+++ b/src/s4u/s4u_Actor.cpp
@@ -31,13 +31,13 @@ xbt::signal<void(Actor const&)> s4u::Actor::on_migration_end;
 xbt::signal<void(Actor const&)> s4u::Actor::on_destruction;
 
 // ***** Actor creation *****
-ActorPtr Actor::self()
+Actor* Actor::self()
 {
   kernel::context::Context* self_context = kernel::context::Context::self();
   if (self_context == nullptr)
-    return ActorPtr();
+    return nullptr;
 
-  return self_context->get_actor()->iface();
+  return self_context->get_actor()->ciface();
 }
 ActorPtr Actor::init(const std::string& name, s4u::Host* host)
 {
diff --git a/src/smpi/smpi_replay_main.cpp b/src/smpi/smpi_replay_main.cpp
index 72898c5ca7..240454190c 100644
--- a/src/smpi/smpi_replay_main.cpp
+++ b/src/smpi/smpi_replay_main.cpp
@@ -6,7 +6,7 @@
 
 int main(int argc, char* argv[])
 {
-  if (simgrid::s4u::Actor::self().get() == nullptr) {
+  if (simgrid::s4u::Actor::self() == nullptr) {
     printf("smpireplaymain should not be called directly. Please use smpirun -replay instead.\n");
     return 1;
   }
-- 
2.20.1