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 58b5bcdbaef5e03799a251df180b6aa0de8a1fbe..648920b858f328a7c3452528d243d54208fe1700 100644 (file)
--- 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 34d895683007685d2708fefaba6ec85ba2f754dc..040430a5342956b7000f1439c6970f38c33d5513 100644 (file)
--- 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 c51a87cb88c028ba1b719f84e8167b1430da5ecf..dcfee83b301bfea1f3ab6921097b02925d5c7f02 100644 (file)
--- 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 f0029b1900cd04ec3a00adca84c1e50f9aeef6b7..ad4ca52bdbe0cdb9f0c868c99d8214c089e2754a 100644 (file)
--- 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 083ccd1ad59beacef8c84529cd5adbc3eff22196..235b244b4010c1d222cc9f76b2cb47136a684606 100644 (file)
--- 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 221a91a523dadb26ec3fe8bc578df4fda31490bb..f0c3b328ea697527b28284c2d8cdb9ff512be8fa 100644 (file)
--- 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 b7a8a394df30d6968313a19fdd22e153ff073d02..fb7f5b1aa809d109fe57675e638066adb3667e42 100644 (file)
--- 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 5525f077bec3fb26d5423b75ad4a5efa7bc402b5..b6fd8f354a4714e1c7f683e4e1c0c723aa284354 100644 (file)
--- 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 ccb1f4daaf6532e6a79522279a4ede1de3f9a3db..b3c2b2cd4e1218162cff337d1673b40a7e57423b 100644 (file)
--- 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 e8aac5af29bd30a4436c890f94a9cd7dfb1314a2..6e074ebb85d1cfa9280d1e6c3027296a7ee3c887 100644 (file)
--- 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 abdb62ed90b34f3b64e6db28f7bbfe0b3816f141..c74cdce52f6dddd3ca1c3d9e4edfa0fc773acfeb 100644 (file)
--- 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: