From: Abhishek Lekshmanan <abhishek@suse.com>
Date: Tue, 5 Mar 2019 12:35:50 +0000 (+0100)
Subject: cls_rgw: alias the LC entries as  rgw_lc_entry_t
X-Git-Tag: v15.0.0~215^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9e1d2a28807fc709b5c9f86132609841e453ae45;p=ceph.git

cls_rgw: alias the LC entries as  rgw_lc_entry_t

instead of a naked std::pair<std::string, int> everywhere

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

diff --git a/src/cls/rgw/cls_rgw_ops.h b/src/cls/rgw/cls_rgw_ops.h
index 78f8c692f32..30e82a9e20f 100644
--- a/src/cls/rgw/cls_rgw_ops.h
+++ b/src/cls/rgw/cls_rgw_ops.h
@@ -1010,9 +1010,10 @@ struct cls_rgw_lc_get_next_entry_op {
 };
 WRITE_CLASS_ENCODER(cls_rgw_lc_get_next_entry_op)
 
-struct cls_rgw_lc_get_next_entry_ret {
-  pair<string, int> entry;
+using rgw_lc_entry_t = std::pair<std::string, int>;
 
+struct cls_rgw_lc_get_next_entry_ret {
+  rgw_lc_entry_t entry;
   cls_rgw_lc_get_next_entry_ret() {}
 
   void encode(bufferlist& bl) const {
@@ -1031,7 +1032,7 @@ struct cls_rgw_lc_get_next_entry_ret {
 WRITE_CLASS_ENCODER(cls_rgw_lc_get_next_entry_ret)
 
 struct cls_rgw_lc_rm_entry_op {
-  pair<string, int> entry;
+  rgw_lc_entry_t entry;
   cls_rgw_lc_rm_entry_op() {}
 
   void encode(bufferlist& bl) const {
@@ -1049,7 +1050,7 @@ struct cls_rgw_lc_rm_entry_op {
 WRITE_CLASS_ENCODER(cls_rgw_lc_rm_entry_op)
 
 struct cls_rgw_lc_set_entry_op {
-  pair<string, int> entry;
+  rgw_lc_entry_t entry;
   cls_rgw_lc_set_entry_op() {}
 
   void encode(bufferlist& bl) const {