From: Arnaud Giersch Date: Wed, 17 Apr 2019 19:43:04 +0000 (+0200) Subject: Useless smart pointer. X-Git-Tag: v3.22.2~109 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/e2d387ada5b9abb021b855d161906017660d7b45 Useless smart pointer. --- diff --git a/include/simgrid/s4u/Comm.hpp b/include/simgrid/s4u/Comm.hpp index ae59d154f9..d82a019e77 100644 --- a/include/simgrid/s4u/Comm.hpp +++ b/include/simgrid/s4u/Comm.hpp @@ -119,7 +119,7 @@ public: /** Retrieve the size of the received data. Not to be mixed with @ref Activity::set_remaining() */ size_t get_dst_data_size(); - s4u::ActorPtr get_sender(); + Actor* get_sender(); #ifndef DOXYGEN XBT_ATTRIB_DEPRECATED_v324("Please use Comm::wait_for()") void wait(double t) override { wait_for(t); } diff --git a/src/msg/msg_task.cpp b/src/msg/msg_task.cpp index 188990ba13..08aeb1fa54 100644 --- a/src/msg/msg_task.cpp +++ b/src/msg/msg_task.cpp @@ -167,7 +167,7 @@ void Task::set_priority(double priority) s4u::Actor* Task::get_sender() { - return comm ? comm->get_sender().get() : nullptr; + return comm ? comm->get_sender() : nullptr; } s4u::Host* Task::get_source() diff --git a/src/s4u/s4u_Comm.cpp b/src/s4u/s4u_Comm.cpp index f119c5aff8..0c28a0bb58 100644 --- a/src/s4u/s4u_Comm.cpp +++ b/src/s4u/s4u_Comm.cpp @@ -230,9 +230,9 @@ Mailbox* Comm::get_mailbox() return mailbox_; } -ActorPtr Comm::get_sender() +Actor* Comm::get_sender() { - return sender_ ? sender_->iface() : nullptr; + return sender_ ? sender_->ciface() : nullptr; } void intrusive_ptr_release(simgrid::s4u::Comm* c)