PG,ReplicatedPG: move intrusive_ptr declarations to top

Signed-off-by: Samuel Just <sam.just@inktank.com>

diff --git a/src/osd/PG.h b/src/osd/PG.h
index f437bafbb16e1511929040271f0642653a6523c1..3e86dd9f66d54ed4de814855c5f038c1b76884a4 100644 (file)
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -64,6 +64,12 @@ class MOSDPGScan;
 class MOSDPGBackfill;
 class MOSDPGInfo;
 
+class PG;
+
+void intrusive_ptr_add_ref(PG *pg);
+void intrusive_ptr_release(PG *pg);
+
+  typedef boost::intrusive_ptr<PG> PGRef;
 
 struct PGRecoveryStats {
   struct per_state_info {
@@ -1967,9 +1973,4 @@ WRITE_CLASS_ENCODER(PG::OndiskLog)
 
 ostream& operator<<(ostream& out, const PG& pg);
 
-void intrusive_ptr_add_ref(PG *pg);
-void intrusive_ptr_release(PG *pg);
-
-typedef boost::intrusive_ptr<PG> PGRef;
-
 #endif

diff --git a/src/osd/ReplicatedPG.h b/src/osd/ReplicatedPG.h
index cdad9dfb7d49392a79687c37db7e7a0e867c14ee..a21c0ce18cb6d708bd9d27400f31599e6aac45c4 100644 (file)
--- a/src/osd/ReplicatedPG.h
+++ b/src/osd/ReplicatedPG.h
@@ -28,6 +28,10 @@
 #include "messages/MOSDSubOp.h"
 class MOSDSubOpReply;
 
+class ReplicatedPG;
+void intrusive_ptr_add_ref(ReplicatedPG *pg);
+void intrusive_ptr_release(ReplicatedPG *pg);
+  typedef boost::intrusive_ptr<ReplicatedPG> ReplicatedPGRef;
 class PGLSFilter {
 protected:
   string xattr;
@@ -1021,9 +1025,4 @@ inline ostream& operator<<(ostream& out, ReplicatedPG::AccessMode& mode)
   return out;
 }
 
-void intrusive_ptr_add_ref(ReplicatedPG *pg);
-void intrusive_ptr_release(ReplicatedPG *pg);
-
-typedef boost::intrusive_ptr<ReplicatedPG> ReplicatedPGRef;
-
 #endif