From: Samuel Just Date: Fri, 19 Apr 2013 00:41:18 +0000 (-0700) Subject: PG,ReplicatedPG: move intrusive_ptr declarations to top X-Git-Tag: v0.61~136^2~20 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b021036bde2a6427ea821145944f86ef50e7333a;p=ceph.git PG,ReplicatedPG: move intrusive_ptr declarations to top Signed-off-by: Samuel Just --- diff --git a/src/osd/PG.h b/src/osd/PG.h index f437bafbb16e..3e86dd9f66d5 100644 --- 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 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 PGRef; - #endif diff --git a/src/osd/ReplicatedPG.h b/src/osd/ReplicatedPG.h index cdad9dfb7d49..a21c0ce18cb6 100644 --- 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 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 ReplicatedPGRef; - #endif