From 5681461bf43345a6ed18db0fefcf593d5c65ab36 Mon Sep 17 00:00:00 2001 From: Greg Farnum Date: Mon, 19 Mar 2012 13:12:14 -0700 Subject: [PATCH] msgr: change the signature of get_myaddr() Return a const reference to the actual address, instead of copying it. All current users are happy with this, and I can't see a good reason to copy it instead. Signed-off-by: Greg Farnum --- src/msg/Messenger.h | 2 +- src/msg/SimpleMessenger.cc | 5 ++--- src/msg/SimpleMessenger.h | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/msg/Messenger.h b/src/msg/Messenger.h index 40abd4b9a9dec..37baccb906a77 100644 --- a/src/msg/Messenger.h +++ b/src/msg/Messenger.h @@ -94,7 +94,7 @@ protected: // accessors entity_name_t get_myname() { return _my_name; } - virtual entity_addr_t get_myaddr() = 0; + virtual const entity_addr_t& get_myaddr() = 0; virtual void set_ip(entity_addr_t &addr) = 0; entity_inst_t get_myinst() { return entity_inst_t(get_myname(), get_myaddr()); } diff --git a/src/msg/SimpleMessenger.cc b/src/msg/SimpleMessenger.cc index 7e4acbfde15bc..0a64250071942 100644 --- a/src/msg/SimpleMessenger.cc +++ b/src/msg/SimpleMessenger.cc @@ -487,10 +487,9 @@ int SimpleMessenger::lazy_send_message(Message *m, const entity_inst_t& dest) return 0; } -entity_addr_t SimpleMessenger::get_myaddr() +const entity_addr_t& SimpleMessenger::get_myaddr() { - entity_addr_t a = ms_addr; - return a; + return ms_addr; } /** diff --git a/src/msg/SimpleMessenger.h b/src/msg/SimpleMessenger.h index 8ab78c9fc1a30..12a5a16f7578a 100644 --- a/src/msg/SimpleMessenger.h +++ b/src/msg/SimpleMessenger.h @@ -72,7 +72,7 @@ public: * @return A copy of he address this Messenger currently * believes to be its own. */ - virtual entity_addr_t get_myaddr(); + virtual const entity_addr_t& get_myaddr(); /** * Retrieve the Connection for an endpoint. * -- 2.39.5