comparison DEPENDENCIES/generic/include/boost/signals2/slot_base.hpp @ 101:c530137014c0

Update Boost headers (1.58.0)

   namespace signals2
   {
     namespace detail
     {
       class tracked_objects_visitor;
+      class trackable_pointee;
 
-      typedef boost::variant<boost::weak_ptr<void>, detail::foreign_void_weak_ptr > void_weak_ptr_variant;
+      typedef boost::variant<boost::weak_ptr<trackable_pointee>, boost::weak_ptr<void>, detail::foreign_void_weak_ptr > void_weak_ptr_variant;
       typedef boost::variant<boost::shared_ptr<void>, detail::foreign_void_shared_ptr > void_shared_ptr_variant;
       class lock_weak_ptr_visitor
       {
       public:
         typedef void_shared_ptr_variant result_type;
         template<typename WeakPtr>
         result_type operator()(const WeakPtr &wp) const
         {
           return wp.lock();
+        }
+        // overload to prevent incrementing use count of shared_ptr associated
+        // with signals2::trackable objects
+        result_type operator()(const weak_ptr<trackable_pointee> &) const
+        {
+          return boost::shared_ptr<void>();
         }
       };
       class expired_weak_ptr_visitor
       {
       public: