Subject: [Boost-commit] svn:boost r77064 - branches/release/boost/heap
From: tim_at_[hidden]
Date: 2012-02-18 08:27:43
Author: timblechmann
Date: 2012-02-18 08:27:43 EST (Sat, 18 Feb 2012)
New Revision: 77064
URL: http://svn.boost.org/trac/boost/changeset/77064
Log:
heap: merge fix from trunk
Properties modified:
branches/release/boost/heap/ (props changed)
Text files modified:
branches/release/boost/heap/binomial_heap.hpp | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
Modified: branches/release/boost/heap/binomial_heap.hpp
==============================================================================
--- branches/release/boost/heap/binomial_heap.hpp (original)
+++ branches/release/boost/heap/binomial_heap.hpp 2012-02-18 08:27:43 EST (Sat, 18 Feb 2012)
@@ -389,7 +389,7 @@
if (element->child_count()) {
size_type sz = (1 << element->child_count()) - 1;
- binomial_heap children(element->children, sz);
+ binomial_heap children(value_comp(), element->children, sz);
if (trees.empty())
swap(children);
else
@@ -827,8 +827,8 @@
}
// private constructor, just used in pop()
- explicit binomial_heap(node_list_type & child_list, size_type size):
- super_t(value_compare())
+ explicit binomial_heap(value_compare const & cmp, node_list_type & child_list, size_type size):
+ super_t(cmp)
{
size_holder::set_size(size);
if (size)