]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw_op: drop the forward_as_tuple variant of rgw_add_to_iam_environment
authorAbhishek Lekshmanan <abhishek@suse.com>
Mon, 27 Nov 2017 10:54:12 +0000 (11:54 +0100)
committerAbhishek Lekshmanan <abhishek@suse.com>
Mon, 22 Jan 2018 13:47:34 +0000 (14:47 +0100)
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>
src/rgw/rgw_op.cc

index 187f46d1ad17cd5e31f3eaa752fab7956305a738..1958302465aefcfedb9f039c1c9bc8a615e1899b 100644 (file)
@@ -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;
 }