Merge commit 'v3.3.1' into try-3.3.1

[debian/gnuradio] / pmt / src / lib / pmt_int.h

diff --git a/pmt/src/lib/pmt_int.h b/pmt/src/lib/pmt_int.h
index af22d4515910de3eb449244822f0e86f249fcabf..285244cb5f0b7ac72a77876dc1885ca6a2791b90 100644 (file)
--- a/pmt/src/lib/pmt_int.h
+++ b/pmt/src/lib/pmt_int.h
@@ -34,10 +34,8 @@
 #define PMT_LOCAL_ALLOCATOR 0          // define to 0 or 1
 
 class pmt_base : boost::noncopyable {
-  mutable boost::detail::atomic_count count_;
-
 protected:
-  pmt_base() : count_(0) {};
+  pmt_base(){};
   virtual ~pmt_base();
 
 public:
@@ -67,9 +65,6 @@ public:
   virtual bool is_c32vector() const { return false; }
   virtual bool is_c64vector() const { return false; }
 
-  friend void intrusive_ptr_add_ref(pmt_base* p);
-  friend void intrusive_ptr_release(pmt_base* p);
-
 # if (PMT_LOCAL_ALLOCATOR)
   void *operator new(size_t);
   void operator delete(void *, size_t);
@@ -156,7 +151,7 @@ class pmt_pair : public pmt_base
   pmt_t                d_cdr;
 
 public:
-  pmt_pair(const pmt_t& car, const pmt_t& cdr);
+  pmt_pair(pmt_t car, pmt_t cdr);
   //~pmt_pair(){};
 
   bool is_pair() const { return true; }