From: Abhishek Lekshmanan <abhishek@suse.com>
Date: Mon, 27 Nov 2017 10:54:12 +0000 (+0100)
Subject: rgw_op: drop the forward_as_tuple variant of rgw_add_to_iam_environment
X-Git-Tag: v13.0.2~246^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e4c8123dcfaa72a11c0ba5dd6790dba5ca5e8ef4;p=ceph.git

rgw_op: drop the forward_as_tuple variant of rgw_add_to_iam_environment

We don't have any places in the code where we can std::move both the
key and value to construct the map, so dropping this code.

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
---

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index 187f46d1ad17..1958302465ae 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -566,12 +566,6 @@ int rgw_build_object_policies(RGWRados *store, struct req_state *s,
   return ret;
 }
 
-void rgw_add_to_iam_environment(rgw::IAM::Environment& e, std::string&& key, std::string&& val){
-  e.emplace(std::piecewise_construct,
-	    std::forward_as_tuple(key),
-	    std::forward_as_tuple(val));
-}
-
 void rgw_add_to_iam_environment(rgw::IAM::Environment& e, const std::string& key, const std::string& val){
     e[key] = val;
 }