[Boost-commit] svn:boost r85191 - in branches/release: boost/heap boost/heap/detail libs/heap libs/heap/test

Subject: [Boost-commit] svn:boost r85191 - in branches/release: boost/heap boost/heap/detail libs/heap libs/heap/test
From: tim_at_[hidden]
Date: 2013-08-02 07:29:51

Author: timblechmann
Date: 2013-08-02 07:29:51 EDT (Fri, 02 Aug 2013)
New Revision: 85191
URL: http://svn.boost.org/trac/boost/changeset/85191

Log:
heap: merge changes from trunk

Properties modified: 
   branches/release/boost/heap/   (props changed)
   branches/release/libs/heap/   (props changed)
Text files modified: 
   branches/release/boost/heap/d_ary_heap.hpp              |     2 --                                      
   branches/release/boost/heap/detail/mutable_heap.hpp     |    14 --------------                          
   branches/release/libs/heap/test/fibonacci_heap_test.cpp |     1 +                                       
   3 files changed, 1 insertions(+), 16 deletions(-)

Modified: branches/release/boost/heap/d_ary_heap.hpp
==============================================================================
--- branches/release/boost/heap/d_ary_heap.hpp	Fri Aug  2 06:55:50 2013	(r85190)
+++ branches/release/boost/heap/d_ary_heap.hpp	2013-08-02 07:29:51 EDT (Fri, 02 Aug 2013)	(r85191)
@@ -348,9 +348,7 @@
 
     size_type last_child_index(size_type index) const
     {
-        typedef typename container_type::const_iterator container_iterator;
         const size_t first_index = first_child_index(index);
-
         const size_type last_index = (std::min)(first_index + D - 1, size() - 1);
 
         return last_index;

Modified: branches/release/boost/heap/detail/mutable_heap.hpp
==============================================================================
--- branches/release/boost/heap/detail/mutable_heap.hpp	Fri Aug  2 06:55:50 2013	(r85190)
+++ branches/release/boost/heap/detail/mutable_heap.hpp	2013-08-02 07:29:51 EDT (Fri, 02 Aug 2013)	(r85191)
@@ -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.

Modified: branches/release/libs/heap/test/fibonacci_heap_test.cpp
==============================================================================
--- branches/release/libs/heap/test/fibonacci_heap_test.cpp	Fri Aug  2 06:55:50 2013	(r85190)
+++ branches/release/libs/heap/test/fibonacci_heap_test.cpp	2013-08-02 07:29:51 EDT (Fri, 02 Aug 2013)	(r85191)
@@ -7,6 +7,7 @@
 =============================================================================*/
 
 #define BOOST_TEST_MAIN
+#define BOOST_TEST_ALTERNATIVE_INIT_API
 #ifdef BOOST_HEAP_INCLUDE_TESTS
 #include <boost/test/included/unit_test.hpp>
 #else