[Boost-commit] svn:boost r50319 - sandbox/thread_safe_signals/trunk/boost/signals2

Subject: [Boost-commit] svn:boost r50319 - sandbox/thread_safe_signals/trunk/boost/signals2
From: fmhess_at_[hidden]
Date: 2008-12-18 17:09:36

Author: fmhess
Date: 2008-12-18 17:09:36 EST (Thu, 18 Dec 2008)
New Revision: 50319
URL: http://svn.boost.org/trac/boost/changeset/50319

Log:
Fixed tracking of null but not empty shared_ptr (broken by recent optimization
changes).

Text files modified: 
   sandbox/thread_safe_signals/trunk/boost/signals2/connection.hpp |     5 +++--                                   
   1 files changed, 3 insertions(+), 2 deletions(-)

Modified: sandbox/thread_safe_signals/trunk/boost/signals2/connection.hpp
==============================================================================
--- sandbox/thread_safe_signals/trunk/boost/signals2/connection.hpp	(original)
+++ sandbox/thread_safe_signals/trunk/boost/signals2/connection.hpp	2008-12-18 17:09:36 EST (Thu, 18 Dec 2008)
@@ -116,12 +116,13 @@
               ++it)
             {
               boost::shared_ptr<void> locked_object = it->lock();
-              if(!locked_object)
+              boost::shared_ptr<void> empty;
+              if(!(empty < locked_object) && !(locked_object < empty))
               {
                 _connected = false;
                 return;
               }
-              *inserter++ = it->lock();
+              *inserter++ = locked_object;
           }
         }
         // expose Lockable concept of mutex