[Boost-commit] svn:boost r80050 - branches/release/boost/heap

Subject: [Boost-commit] svn:boost r80050 - branches/release/boost/heap
From: tim_at_[hidden]
Date: 2012-08-15 11:40:53

Author: timblechmann
Date: 2012-08-15 11:40:52 EDT (Wed, 15 Aug 2012)
New Revision: 80050
URL: http://svn.boost.org/trac/boost/changeset/80050

Log:
heap: merge fix for #7233

Properties modified: 
   branches/release/boost/heap/   (props changed)
Text files modified: 
   branches/release/boost/heap/fibonacci_heap.hpp |     3 +++                                     
   1 files changed, 3 insertions(+), 0 deletions(-)

Modified: branches/release/boost/heap/fibonacci_heap.hpp
==============================================================================
--- branches/release/boost/heap/fibonacci_heap.hpp	(original)
+++ branches/release/boost/heap/fibonacci_heap.hpp	2012-08-15 11:40:52 EDT (Wed, 15 Aug 2012)
@@ -714,6 +714,9 @@
 
     void consolidate(void)
     {
+        if (roots.empty())
+            return;
+
         static const size_type max_log2 = sizeof(size_type) * 8;
         boost::array<node_pointer, max_log2> aux;
         aux.assign(NULL);