summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Just <sam.just@inktank.com>2013-04-18 17:41:18 -0700
committerSamuel Just <sam.just@inktank.com>2013-04-19 11:00:21 -0700
commitb021036bde2a6427ea821145944f86ef50e7333a (patch)
tree803a6f7a6d3043df4fac086435dd7de09241750c
parent220c65127dee718f7fa773313d18cbfdeec95e30 (diff)
downloadceph-b021036bde2a6427ea821145944f86ef50e7333a.tar.gz
PG,ReplicatedPG: move intrusive_ptr declarations to top
Signed-off-by: Samuel Just <sam.just@inktank.com>
-rw-r--r--src/osd/PG.h11
-rw-r--r--src/osd/ReplicatedPG.h9
2 files changed, 10 insertions, 10 deletions
diff --git a/src/osd/PG.h b/src/osd/PG.h
index f437bafbb16..3e86dd9f66d 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<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 cdad9dfb7d4..a21c0ce18cb 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<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