[Boost-commit] svn:boost r84740 - trunk/boost/heap/detail

Subject: [Boost-commit] svn:boost r84740 - trunk/boost/heap/detail
From: tim_at_[hidden]
Date: 2013-06-11 10:45:24

Author: timblechmann
Date: 2013-06-11 10:45:24 EDT (Tue, 11 Jun 2013)
New Revision: 84740
URL: http://svn.boost.org/trac/boost/changeset/84740

Log:
heap: priority_queue_mutable_wrapper - remove obsolete merge function

one should not use this method but use heap_merge instead

Text files modified: 
   trunk/boost/heap/detail/mutable_heap.hpp |    14 --------------                          
   1 files changed, 0 insertions(+), 14 deletions(-)

Modified: trunk/boost/heap/detail/mutable_heap.hpp
==============================================================================
--- trunk/boost/heap/detail/mutable_heap.hpp	Tue Jun 11 04:30:39 2013	(r84739)
+++ trunk/boost/heap/detail/mutable_heap.hpp	2013-06-11 10:45:24 EDT (Tue, 11 Jun 2013)	(r84740)
@@ -368,20 +368,6 @@
     }
 
     /**
-     * \b Effects: Merge with priority queue rhs.
-     *
-     * \b Complexity: N log(N)
-     *
-     * */
-    void merge(priority_queue_mutable_wrapper const & rhs)
-    {
-        q_.reserve(q_.size() + rhs.q_.size());
-
-        for (typename object_list::const_iterator it = rhs.objects.begin(); it != rhs.objects.end(); ++it)
-            push(it->first);
-    }
-
-    /**
      * \b Effects: Assigns \c v to the element handled by \c handle & updates the priority queue.
      *
      * \b Complexity: Logarithmic.