From: Thorsten Behrens <tbehrens@suse.com>
Date: Mon, 21 Jul 2014 15:07:21 +0000 (+0200)
Subject: Fix mismatched tags (struct vs. class) inconsistency
X-Git-Tag: v0.84~83^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F2067%2Fhead;p=ceph.git

Fix mismatched tags (struct vs. class) inconsistency

Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
---

diff --git a/src/client/Client.h b/src/client/Client.h
index 58b5bcdbaef5..648920b858f3 100644
--- a/src/client/Client.h
+++ b/src/client/Client.h
@@ -109,7 +109,7 @@ struct DirEntry {
   DirEntry(const string &n, struct stat& s, int stm) : d_name(n), st(s), stmask(stm) {}
 };
 
-class Inode;
+struct Inode;
 struct Cap;
 class Dir;
 class Dentry;
diff --git a/src/client/ClientSnapRealm.h b/src/client/ClientSnapRealm.h
index 34d895683007..040430a53429 100644
--- a/src/client/ClientSnapRealm.h
+++ b/src/client/ClientSnapRealm.h
@@ -8,7 +8,7 @@
 #include "common/snap_types.h"
 #include "include/xlist.h"
 
-class Inode;
+struct Inode;
 
 struct SnapRealm {
   inodeno_t ino;
diff --git a/src/client/Dentry.h b/src/client/Dentry.h
index c51a87cb88c0..dcfee83b301b 100644
--- a/src/client/Dentry.h
+++ b/src/client/Dentry.h
@@ -4,7 +4,7 @@
 #include "include/lru.h"
 
 class Dir;
-class Inode;
+struct Inode;
 
 class Dentry : public LRUObject {
  public:
diff --git a/src/client/Dir.h b/src/client/Dir.h
index f0029b1900cd..ad4ca52bdbe0 100644
--- a/src/client/Dir.h
+++ b/src/client/Dir.h
@@ -1,7 +1,7 @@
 #ifndef CEPH_CLIENT_DIR_H
 #define CEPH_CLIENT_DIR_H
 
-class Inode;
+struct Inode;
 
 class Dir {
  public:
diff --git a/src/client/Fh.h b/src/client/Fh.h
index 083ccd1ad59b..235b244b4010 100644
--- a/src/client/Fh.h
+++ b/src/client/Fh.h
@@ -3,7 +3,7 @@
 
 #include "include/types.h"
 
-class Inode;
+struct Inode;
 class Cond;
 
 // file handle for any open file state
diff --git a/src/client/Inode.h b/src/client/Inode.h
index 221a91a523da..f0c3b328ea69 100644
--- a/src/client/Inode.h
+++ b/src/client/Inode.h
@@ -17,7 +17,7 @@ struct MetaSession;
 class Dentry;
 class Dir;
 struct SnapRealm;
-class Inode;
+struct Inode;
 
 struct Cap {
   MetaSession *session;
@@ -71,8 +71,7 @@ struct CapSnap {
 // inode flags
 #define I_COMPLETE 1
 
-class Inode {
- public:
+struct Inode {
   CephContext *cct;
 
   // -- the actual inode --
diff --git a/src/client/MetaRequest.h b/src/client/MetaRequest.h
index b7a8a394df30..fb7f5b1aa809 100644
--- a/src/client/MetaRequest.h
+++ b/src/client/MetaRequest.h
@@ -16,7 +16,7 @@
 #include "messages/MClientRequest.h"
 
 class MClientReply;
-class Inode;
+struct Inode;
 class Dentry;
 
 struct MetaRequest {
diff --git a/src/client/MetaSession.h b/src/client/MetaSession.h
index 5525f077bec3..b6fd8f354a47 100644
--- a/src/client/MetaSession.h
+++ b/src/client/MetaSession.h
@@ -12,7 +12,7 @@
 #include "messages/MClientCapRelease.h"
 
 struct Cap;
-class Inode;
+struct Inode;
 struct CapSnap;
 struct MetaRequest;
 class MClientCapRelease;
diff --git a/src/include/rados/librados.hpp b/src/include/rados/librados.hpp
index ccb1f4daaf65..b3c2b2cd4e12 100644
--- a/src/include/rados/librados.hpp
+++ b/src/include/rados/librados.hpp
@@ -16,7 +16,7 @@
 
 namespace libradosstriper
 {
-  struct RadosStriper;
+  class RadosStriper;
 }
 
 namespace librados
diff --git a/src/osd/ReplicatedPG.h b/src/osd/ReplicatedPG.h
index e8aac5af29bd..6e074ebb85d1 100644
--- a/src/osd/ReplicatedPG.h
+++ b/src/osd/ReplicatedPG.h
@@ -806,8 +806,8 @@ protected:
   // agent
   boost::scoped_ptr<TierAgentState> agent_state;
 
-  friend class C_AgentFlushStartStop;
-  friend class C_HitSetFlushing;
+  friend struct C_AgentFlushStartStop;
+  friend struct C_HitSetFlushing;
 
   void agent_setup();       ///< initialize agent state
   bool agent_work(int max); ///< entry point to do some agent work
diff --git a/src/rgw/rgw_quota.h b/src/rgw/rgw_quota.h
index abdb62ed90b3..c74cdce52f6d 100644
--- a/src/rgw/rgw_quota.h
+++ b/src/rgw/rgw_quota.h
@@ -55,7 +55,7 @@ struct RGWQuotaInfo {
 };
 WRITE_CLASS_ENCODER(RGWQuotaInfo)
 
-class rgw_bucket;
+struct rgw_bucket;
 
 class RGWQuotaHandler {
 public: