PG,Message: move intrusive_ptr_* into top namespace

gcc 4.7 requires that the intrusive_ptr_* functions be in
the same namespace as the templated class.

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

diff --git a/src/msg/Message.cc b/src/msg/Message.cc
index da72e9db4544a5b1970eff1e61e7b545918fde33..7046dd257b2ff95f396739891e98d2728f912692 100644 (file)
--- a/src/msg/Message.cc
+++ b/src/msg/Message.cc
@@ -147,17 +147,15 @@ using namespace std;
 
 #define dout_subsys ceph_subsys_ms
 
-namespace boost {
-  void intrusive_ptr_add_ref(Message *p)
-  {
-    p->get();
-  }
+void intrusive_ptr_add_ref(Message *p)
+{
+  p->get();
+}
 
-  void intrusive_ptr_release(Message *p)
-  {
-    p->put();
-  }
-};
+void intrusive_ptr_release(Message *p)
+{
+  p->put();
+}
 
 void Message::encode(uint64_t features, bool datacrc)
 {

diff --git a/src/msg/Message.h b/src/msg/Message.h
index 9039a8b44ba856f0a9018a0f5bcd21f8f85a027f..fba50ded0277a8207eabe62c15645f05c62564d6 100644 (file)
--- a/src/msg/Message.h
+++ b/src/msg/Message.h
@@ -454,10 +454,8 @@ inline ostream& operator<<(ostream& out, Message& m) {
 extern void encode_message(Message *m, uint64_t features, bufferlist& bl);
 extern Message *decode_message(CephContext *cct, bufferlist::iterator& bl);
 
-namespace boost {
-  void intrusive_ptr_add_ref(Message *p);
-  void intrusive_ptr_release(Message *p);
-};
+void intrusive_ptr_add_ref(Message *p);
+void intrusive_ptr_release(Message *p);
 
 
 #endif

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 934da8cfb4dcc6d81d96ab03ed2ad1a59a3918c3..90018f45c0f8c218b0c4259135ef61be129a304e 100644 (file)
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -5714,5 +5714,5 @@ bool PG::PriorSet::affected_by_map(const OSDMapRef osdmap, const PG *debug_pg) c
   return false;
 }
 
-void boost::intrusive_ptr_add_ref(PG *pg) { pg->get(); }
-void boost::intrusive_ptr_release(PG *pg) { pg->put(); }
+void intrusive_ptr_add_ref(PG *pg) { pg->get(); }
+void intrusive_ptr_release(PG *pg) { pg->put(); }

diff --git a/src/osd/PG.h b/src/osd/PG.h
index 53358215de7c58c4d60e4c2042615666fa896ddc..09ba12ea41b4fed3b40901b6d54e7eeb8068cb47 100644 (file)
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -1564,9 +1564,7 @@ WRITE_CLASS_ENCODER(PG::OndiskLog)
 
 ostream& operator<<(ostream& out, const PG& pg);
 
-namespace boost {
-  void intrusive_ptr_add_ref(PG *pg);
-  void intrusive_ptr_release(PG *pg);
-};
+void intrusive_ptr_add_ref(PG *pg);
+void intrusive_ptr_release(PG *pg);
 
 #endif