From: Kefu Chai <kchai@redhat.com>
Date: Sat, 11 Jan 2020 08:26:54 +0000 (+0800)
Subject: crimson: move() explicitly to avoid copy
X-Git-Tag: v15.1.0~234^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2ed00c0328ffb250aa1dad616d4e4586747ea288;p=ceph.git

crimson: move() explicitly to avoid copy

to silence following warnings from clang 9.0.1:

src/crimson/osd/heartbeat.cc:143:14: warning: local variable 'extras' will be copied despite being returned by name [-Wreturn-std-move]
      return extras;
             ^~~~~~
../src/crimson/osd/heartbeat.cc:143:14: note: call 'std::move' explicitly to avoid copying
      return extras;
             ^~~~~~
             std::move(extras)

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/crimson/osd/heartbeat.cc b/src/crimson/osd/heartbeat.cc
index 139e684c092e..2fdfe1abee5e 100644
--- a/src/crimson/osd/heartbeat.cc
+++ b/src/crimson/osd/heartbeat.cc
@@ -139,7 +139,7 @@ seastar::future<Heartbeat::osds_t> Heartbeat::remove_down_peers()
       if (extra >= 0) {
         extras.push_back(extra);
       }
-      return extras;
+      return std::move(extras);
     });
 }