From 123eb04136e675b529d471afa777fcc0dcaeb899 Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Tue, 29 Dec 2015 13:25:16 +0200 Subject: [PATCH] lsa: disable constant_time_size in binomial_heap implementation Corrupts heap on boost < 1.60, and not needed. Fixes #698. --- utils/logalloc.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/utils/logalloc.cc b/utils/logalloc.cc index 49fe5560a8..f0ddf8a19a 100644 --- a/utils/logalloc.cc +++ b/utils/logalloc.cc @@ -158,7 +158,9 @@ thread_local T* prepared_buffers_allocator::_prepared_buffer; // Consider using an intrusive container leveraging segment_descriptor objects. using segment_heap = boost::heap::binomial_heap< segment*, boost::heap::compare, - boost::heap::allocator>>; + boost::heap::allocator>, + // constant_time_size causes corruption with boost < 1.60 + boost::heap::constant_time_size>; using segment_heap_allocator = segment_heap::allocator_type; struct segment {