rgw/acl: remove empty base class ACLGrantee

an unnecessary base class of ACLGrantee_S3 which is just for s3
xml parsing

Signed-off-by: Casey Bodley <cbodley@redhat.com>

diff --git a/src/rgw/rgw_acl_s3.h b/src/rgw/rgw_acl_s3.h
index c234d722b997f3a8a4e08e34ca2e1c31616ddbfd..49964c6aa2bca56818a4b2553ba7c40fa95ea959 100644 (file)
--- a/src/rgw/rgw_acl_s3.h
+++ b/src/rgw/rgw_acl_s3.h
@@ -25,7 +25,7 @@ public:
   void to_xml(std::ostream& out);
 };
 
-class ACLGrantee_S3 : public ACLGrantee, public XMLObj
+class ACLGrantee_S3 : public XMLObj
 {
 public:
   ACLGrantee_S3() {}

diff --git a/src/rgw/rgw_acl_types.h b/src/rgw/rgw_acl_types.h
index c76d085e0b552e96979bd60291a3a29dad8ff963..a257bb4c9e6d60ea76b16aa4e7bf5c80a567e6fe 100644 (file)
--- a/src/rgw/rgw_acl_types.h
+++ b/src/rgw/rgw_acl_types.h
@@ -204,10 +204,3 @@ public:
   friend bool operator!=(const ACLGranteeType& lhs, const ACLGranteeType& rhs);
 };
 WRITE_CLASS_ENCODER(ACLGranteeType)
-
-class ACLGrantee
-{
-public:
-  ACLGrantee() {}
-  ~ACLGrantee() {}
-};