diff options
| author | yurybura <yurybura@gmail.com> | 2020-12-24 04:16:42 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-23 17:16:42 -0800 |
| commit | f2c91b2d897ebbc7f4531ed46e6a650a582a92ff (patch) | |
| tree | 4f4a8e74c65a534e9927a3983ac30e0db5d56319 /ports/boost-heap | |
| parent | 6654632423844b0ff5441a6a99b4ae0ae259928f (diff) | |
| download | vcpkg-f2c91b2d897ebbc7f4531ed46e6a650a582a92ff.tar.gz vcpkg-f2c91b2d897ebbc7f4531ed46e6a650a582a92ff.zip | |
[boost] update to 1.75.0 (#15090)
Diffstat (limited to 'ports/boost-heap')
| -rw-r--r-- | ports/boost-heap/0002-Fix-compilation-on-MSVC-in-node_disposer.patch | 38 | ||||
| -rw-r--r-- | ports/boost-heap/CONTROL | 2 | ||||
| -rw-r--r-- | ports/boost-heap/portfile.cmake | 5 |
3 files changed, 3 insertions, 42 deletions
diff --git a/ports/boost-heap/0002-Fix-compilation-on-MSVC-in-node_disposer.patch b/ports/boost-heap/0002-Fix-compilation-on-MSVC-in-node_disposer.patch deleted file mode 100644 index d40dea3d8..000000000 --- a/ports/boost-heap/0002-Fix-compilation-on-MSVC-in-node_disposer.patch +++ /dev/null @@ -1,38 +0,0 @@ -From ed015c3b21c10166321f7565e038b690ad8e04df Mon Sep 17 00:00:00 2001 -From: Glen Fernandes <glen.fernandes@gmail.com> -Date: Mon, 17 Aug 2020 19:00:58 -0400 -Subject: [PATCH 2/3] Fix compilation on MSVC in node_disposer - ---- - include/boost/heap/detail/heap_node.hpp | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/include/boost/heap/detail/heap_node.hpp b/include/boost/heap/detail/heap_node.hpp -index 04ed7ae..755eac3 100644 ---- a/include/boost/heap/detail/heap_node.hpp -+++ b/include/boost/heap/detail/heap_node.hpp -@@ -83,6 +83,12 @@ std::size_t count_nodes(const Node * n) - return 1 + count_list_nodes<Node, typename Node::child_list>(n->children); - } - -+template<class Node> -+void destroy_node(Node& node) -+{ -+ node.~Node(); -+} -+ - - /* node cloner - * -@@ -142,7 +148,7 @@ struct node_disposer - { - node_pointer n = static_cast<node_pointer>(base); - n->clear_subtree(alloc_); -- n->~Node(); -+ boost::heap::detail::destroy_node(*n); - alloc_.deallocate(n, 1); - } - --- -2.22.0.windows.1 - diff --git a/ports/boost-heap/CONTROL b/ports/boost-heap/CONTROL index 794dc13e0..3396962ef 100644 --- a/ports/boost-heap/CONTROL +++ b/ports/boost-heap/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by scripts/boost/generate-ports.ps1
Source: boost-heap
-Version: 1.74.0
+Version: 1.75.0
Build-Depends: boost-array, boost-assert, boost-bind, boost-concept-check, boost-core, boost-integer, boost-intrusive, boost-iterator, boost-parameter, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers
Homepage: https://github.com/boostorg/heap
Description: Boost heap module
diff --git a/ports/boost-heap/portfile.cmake b/ports/boost-heap/portfile.cmake index 592d977fe..c20839543 100644 --- a/ports/boost-heap/portfile.cmake +++ b/ports/boost-heap/portfile.cmake @@ -3,10 +3,9 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/heap
- REF boost-1.74.0
- SHA512 239d49d34c7d8300569b67fd979ac81cf5cefdd573787094b46b587384afc6881bd67bb9ffbc99da330b2ff45427a50782cc45c7b83c2a316936abed07bd4db3
+ REF boost-1.75.0
+ SHA512 1f8127aba16efce6694451dd04130cae92a88257937d87860fdbf9111405f458e8a162f3d541b00c5e4d0e3eba4cadc1c9fd2424eb03e52ce1302cd8ef1e0af5
HEAD_REF master
- PATCHES 0002-Fix-compilation-on-MSVC-in-node_disposer.patch
)
include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
|