- Refactored RefCounted class to avoid virtual inheritance

- Removed extraneous includes and definitions from RefCounted.h
- Fixed all the places that were relying on RefCounted.h to be including the
  intrusive_ptr header file and were assuming that something had imported
  intrusive_ptr into the qpid namespace


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@640479 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 7 insertions, 5 deletions

diff --git a/cpp/src/qpid/broker/Timer.h b/cpp/src/qpid/broker/Timer.h
index dcb02a5e0a..f702f0f32d 100644
--- a/cpp/src/qpid/broker/Timer.h
+++ b/cpp/src/qpid/broker/Timer.h
@@ -29,6 +29,8 @@
 #include <memory>
 #include <queue>
 
+#include <boost/intrusive_ptr.hpp>
+
 namespace qpid {
 namespace broker {
 
@@ -45,15 +47,15 @@ struct TimerTask : public RefCounted {
 };
 
 struct Later {
-    bool operator()(const intrusive_ptr<TimerTask>& a,
-                    const intrusive_ptr<TimerTask>& b) const;
+    bool operator()(const boost::intrusive_ptr<TimerTask>& a,
+                    const boost::intrusive_ptr<TimerTask>& b) const;
 };
 
 class Timer : private qpid::sys::Runnable {
   protected:
     qpid::sys::Monitor monitor;            
-    std::priority_queue<intrusive_ptr<TimerTask>,
-                        std::vector<intrusive_ptr<TimerTask> >,
+    std::priority_queue<boost::intrusive_ptr<TimerTask>,
+                        std::vector<boost::intrusive_ptr<TimerTask> >,
                         Later> tasks;
     qpid::sys::Thread runner;
     bool active;
@@ -64,7 +66,7 @@ class Timer : private qpid::sys::Runnable {
     Timer();
     virtual ~Timer();
 
-    void add(intrusive_ptr<TimerTask> task);
+    void add(boost::intrusive_ptr<TimerTask> task);
     void start();
     void stop();