[Boost-commit] svn:boost r61277 - trunk/boost/signals2/detail

Subject: [Boost-commit] svn:boost r61277 - trunk/boost/signals2/detail
From: fmhess_at_[hidden]
Date: 2010-04-14 16:03:58

Author: fmhess
Date: 2010-04-14 16:03:57 EDT (Wed, 14 Apr 2010)
New Revision: 61277
URL: http://svn.boost.org/trac/boost/changeset/61277

Log:
renamed one overload of private nolock_cleanup_connections method,
to avoid compiler problem on one test platform (sandia-intel-10.1).

Text files modified: 
   trunk/boost/signals2/detail/signal_template.hpp |     8 ++++----                                
   1 files changed, 4 insertions(+), 4 deletions(-)

Modified: trunk/boost/signals2/detail/signal_template.hpp
==============================================================================
--- trunk/boost/signals2/detail/signal_template.hpp	(original)
+++ trunk/boost/signals2/detail/signal_template.hpp	2010-04-14 16:03:57 EDT (Wed, 14 Apr 2010)
@@ -412,7 +412,7 @@
         };
 
         // clean up disconnected connections
-        void nolock_cleanup_connections(bool grab_tracked,
+        void nolock_cleanup_connections_from(bool grab_tracked,
           const typename connection_list_type::iterator &begin, unsigned count = 0) const
         {
           BOOST_ASSERT(_shared_state.unique());
@@ -451,7 +451,7 @@
           {
             begin = _garbage_collector_it;
           }
-          nolock_cleanup_connections(grab_tracked, begin, count);
+          nolock_cleanup_connections_from(grab_tracked, begin, count);
         }
         /* Make a new copy of the slot list if it is currently being read somewhere else
         */
@@ -460,7 +460,7 @@
           if(_shared_state.unique() == false)
           {
             _shared_state.reset(new invocation_state(*_shared_state, _shared_state->connection_bodies()));
-            nolock_cleanup_connections(true, _shared_state->connection_bodies().begin());
+            nolock_cleanup_connections_from(true, _shared_state->connection_bodies().begin());
           }else
           {
             /* We need to try and check more than just 1 connection here to avoid corner
@@ -483,7 +483,7 @@
           {
             _shared_state.reset(new invocation_state(*_shared_state, _shared_state->connection_bodies()));
           }
-          nolock_cleanup_connections(false, _shared_state->connection_bodies().begin());
+          nolock_cleanup_connections_from(false, _shared_state->connection_bodies().begin());
         }
         shared_ptr<invocation_state> get_readable_state() const
         {