From: Kefu Chai <kchai@redhat.com>
Date: Fri, 3 Aug 2018 11:42:59 +0000 (+0800)
Subject: tools/rados: silence clang++ warning
X-Git-Tag: v14.0.1~651^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=71c7f6a95091bff982a6bf0ba825682395277aa9;p=ceph-ci.git

tools/rados: silence clang++ warning

ceph/src/tools/rados/rados.cc:1951:47: warning: moving a temporary
object prevents copy elision [-Wpessimizing-move]
  boost::optional<pg_t> pgid(i != opts.end(), std::move(pg_t()));
                                              ^
ceph/src/tools/rados/rados.cc:1951:47: note: remove std::move
call here
  boost::optional<pg_t> pgid(i != opts.end(), std::move(pg_t()));

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

diff --git a/src/tools/rados/rados.cc b/src/tools/rados/rados.cc
index cb4eae2742a..d7d6ae0ec1d 100644
--- a/src/tools/rados/rados.cc
+++ b/src/tools/rados/rados.cc
@@ -1948,7 +1948,7 @@ static int rados_tool_common(const std::map < std::string, std::string > &opts,
   }
 
   i = opts.find("pgid");
-  boost::optional<pg_t> pgid(i != opts.end(), std::move(pg_t()));
+  boost::optional<pg_t> pgid(i != opts.end(), pg_t());
   if (pgid && (!pgid->parse(i->second.c_str()) || (pool_name && rados.pool_lookup(pool_name) != pgid->pool()))) {
     cerr << "invalid pgid" << std::endl;
     ret = -1;