warning: fix typo and -Wmismatched-tags

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>

diff --git a/src/osd/ReplicatedPG.h b/src/osd/ReplicatedPG.h
index 3ec3f048b832dec968292569ee9c2c013e915479..d42031b3af00ab8bdd7ecd837c2e5d043bb8cb1b 100644 (file)
--- a/src/osd/ReplicatedPG.h
+++ b/src/osd/ReplicatedPG.h
@@ -972,7 +972,7 @@ protected:
   void cancel_flush(FlushOpRef fop, bool requeue);
   void cancel_flush_ops(bool requeue);
 
-  friend class C_Flush;
+  friend struct C_Flush;
 
   // -- scrub --
   virtual void _scrub(ScrubMap& map);

diff --git a/src/test/bench/bencher.h b/src/test/bench/bencher.h
index 6660d1dfa62b4b81484b338a3241bdb97ba41046..3e18fc64d0a6cf6b84589e52e9f2c5586bcf8530 100644 (file)
--- a/src/test/bench/bencher.h
+++ b/src/test/bench/bencher.h
@@ -12,10 +12,10 @@
 #include "common/Cond.h"
 #include "common/Thread.h"
 
-class OnWriteApplied;
-class OnWriteCommit;
-class OnReadComplete;
-class Clenaup;
+struct OnWriteApplied;
+struct OnWriteCommit;
+struct OnReadComplete;
+struct Cleanup;
 
 class Bencher : public Thread {
 public:
@@ -105,10 +105,10 @@ public:
     run_bench();
     return 0;
   }
-  friend class OnWriteApplied;
-  friend class OnWriteCommit;
-  friend class OnReadComplete;
-  friend class Cleanup;
+  friend struct OnWriteApplied;
+  friend struct OnWriteCommit;
+  friend struct OnReadComplete;
+  friend struct Cleanup;
 };
 
 class SequentialLoad :

diff --git a/src/test/osd/TestOpStat.h b/src/test/osd/TestOpStat.h
index e08fab9c6fb74f6ee73f32051765dc57001c8999..3d70ece719e7465da64e7611f40232dce6c25a53 100644 (file)
--- a/src/test/osd/TestOpStat.h
+++ b/src/test/osd/TestOpStat.h
@@ -6,7 +6,7 @@
 #ifndef TESTOPSTAT_H
 #define TESTOPSTAT_H
 
-struct TestOp;
+class TestOp;
 
 class TestOpStat {
 public: