From: Adam C. Emerson <aemerson@redhat.com>
Date: Mon, 10 Apr 2017 15:48:57 +0000 (-0400)
Subject: monc: Remove pessimizing move
X-Git-Tag: v12.0.2~94^2~10
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=05fed82cf4463ffe396d7d68d9458ea649c93939;p=ceph.git

monc: Remove pessimizing move

Calling std::move on on a function returning a value can interfere
with RVO. At best it has no effect, but can actively interfere with
Copy/Move Elision and make code less efficient.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
---

diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc
index 684b3f617b56..b8ceab714be4 100644
--- a/src/mon/MonClient.cc
+++ b/src/mon/MonClient.cc
@@ -623,7 +623,7 @@ MonConnection& MonClient::_add_conn(unsigned rank, uint64_t global_id)
   auto peer = monmap.get_addr(rank);
   auto conn = messenger->get_connection(monmap.get_inst(rank));
   MonConnection mc(cct, conn, global_id);
-  auto inserted = pending_cons.insert(move(make_pair(peer, move(mc))));
+  auto inserted = pending_cons.insert(make_pair(peer, move(mc)));
   ldout(cct, 10) << "picked mon." << monmap.get_name(rank)
                  << " con " << conn
                  << " addr " << conn->get_peer_addr()