Add patch for binomial_heap::pop (#1294515)
This commit is contained in:
parent
a1d6628b87
commit
783423d8bf
|
@ -0,0 +1,27 @@
|
|||
From 8091fbf00ae6953d34b717ab077a041420e5ba43 Mon Sep 17 00:00:00 2001
|
||||
From: Tim Blechmann <tim@klingt.org>
|
||||
Date: Sat, 5 Sep 2015 09:04:32 +0200
|
||||
Subject: [PATCH] heap: binomial heap - fix size handling in pop()
|
||||
|
||||
---
|
||||
include/boost/heap/binomial_heap.hpp | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/include/boost/heap/binomial_heap.hpp b/include/boost/heap/binomial_heap.hpp
|
||||
index 7e0760f..01ccf3f 100644
|
||||
--- a/include/boost/heap/binomial_heap.hpp
|
||||
+++ b/include/boost/heap/binomial_heap.hpp
|
||||
@@ -404,8 +404,13 @@ class binomial_heap:
|
||||
binomial_heap children(value_comp(), element->children, sz);
|
||||
if (trees.empty()) {
|
||||
stability_counter_type stability_count = super_t::get_stability_count();
|
||||
+ size_t size = constant_time_size ? size_holder::get_size()
|
||||
+ : 0;
|
||||
swap(children);
|
||||
super_t::set_stability_count(stability_count);
|
||||
+
|
||||
+ if (constant_time_size)
|
||||
+ size_holder::set_size( size );
|
||||
} else
|
||||
merge_and_clear_nodes(children);
|
||||
|
|
@ -32,7 +32,7 @@ Name: boost
|
|||
Summary: The free peer-reviewed portable C++ source libraries
|
||||
Version: 1.58.0
|
||||
%define version_enc 1_58_0
|
||||
Release: 10%{?dist}
|
||||
Release: 11%{?dist}
|
||||
License: Boost and MIT and Python
|
||||
|
||||
%define toplev_dirname %{name}_%{version_enc}
|
||||
|
@ -137,6 +137,8 @@ Patch70: 0001-Changes-required-for-aarch64-support-in-boost-config.patch
|
|||
|
||||
#http://www.boost.org/patches/1_58_0/0002-Fix-a-regression-with-non-constexpr-types.patch
|
||||
Patch80: 0002-Fix-a-regression-with-non-constexpr-types.patch
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1294515
|
||||
Patch81: boost-1.58-binomial_heap.patch
|
||||
|
||||
%bcond_with tests
|
||||
%bcond_with docs_generated
|
||||
|
@ -638,6 +640,7 @@ a number of significant features and is now developed independently
|
|||
%patch69 -p2
|
||||
%patch70 -p1
|
||||
%patch80 -p2
|
||||
%patch81 -p2
|
||||
|
||||
# At least python2_version needs to be a macro so that it's visible in
|
||||
# %%install as well.
|
||||
|
@ -1299,6 +1302,9 @@ fi
|
|||
%{_mandir}/man1/bjam.1*
|
||||
|
||||
%changelog
|
||||
* Fri Jan 15 2016 Jonathan Wakely <jwakely@redhat.com> 1.58.0-11
|
||||
- Add patch for binomial_heap::pop (#1294515)
|
||||
|
||||
* Tue Dec 22 2015 Jonathan Wakely <jwakely@redhat.com> 1.58.0-10
|
||||
- Add boost-doctools subpackage (#1244268).
|
||||
|
||||
|
|
Loading…
Reference in New Issue