mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-01-19 03:33:02 +08:00
[boost-coroutine] Add patch from boost.org (#10988)
* [boost-coroutine] Add patch from boost.org * [boost-coroutine] update package version and remove derecated include
This commit is contained in:
parent
d525bf5b20
commit
2bf1c1da02
@ -0,0 +1,49 @@
|
||||
From 436e1dbe6fcd31523d261d18ad011392f1d6fbbc Mon Sep 17 00:00:00 2001
|
||||
From: Oliver Kowalke <oliver.kowalke@gmail.com>
|
||||
Date: Sun, 1 Dec 2019 20:40:28 +0100
|
||||
Subject: [PATCH] Revert "Cease dependence on Range"
|
||||
|
||||
This reverts commit 0c556bb59241e682bbcd3f572815149c5a9b17db.
|
||||
|
||||
see #44 (One test fails to compile after boostorg/coroutine submodule updated)
|
||||
---
|
||||
boost/coroutine/asymmetric_coroutine.hpp | 12 +++---------
|
||||
1 file changed, 3 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/include/boost/coroutine/asymmetric_coroutine.hpp b/boost/coroutine/asymmetric_coroutine.hpp
|
||||
index ea96981..640896f 100644
|
||||
--- a/include/boost/coroutine/asymmetric_coroutine.hpp
|
||||
+++ b/include/boost/coroutine/asymmetric_coroutine.hpp
|
||||
@@ -14,6 +14,7 @@
|
||||
#include <boost/assert.hpp>
|
||||
#include <boost/config.hpp>
|
||||
#include <boost/move/move.hpp>
|
||||
+#include <boost/range.hpp>
|
||||
#include <boost/throw_exception.hpp>
|
||||
#include <boost/utility/explicit_operator_bool.hpp>
|
||||
|
||||
@@ -2354,19 +2355,12 @@ end( push_coroutine< R > & c)
|
||||
|
||||
}
|
||||
|
||||
-// forward declaration of Boost.Range traits to break dependency on it
|
||||
-template<typename C, typename Enabler>
|
||||
-struct range_mutable_iterator;
|
||||
-
|
||||
-template<typename C, typename Enabler>
|
||||
-struct range_const_iterator;
|
||||
-
|
||||
template< typename Arg >
|
||||
-struct range_mutable_iterator< coroutines::push_coroutine< Arg >, void >
|
||||
+struct range_mutable_iterator< coroutines::push_coroutine< Arg > >
|
||||
{ typedef typename coroutines::push_coroutine< Arg >::iterator type; };
|
||||
|
||||
template< typename R >
|
||||
-struct range_mutable_iterator< coroutines::pull_coroutine< R >, void >
|
||||
+struct range_mutable_iterator< coroutines::pull_coroutine< R > >
|
||||
{ typedef typename coroutines::pull_coroutine< R >::iterator type; };
|
||||
|
||||
}
|
||||
--
|
||||
2.24.1
|
||||
|
@ -1,6 +1,6 @@
|
||||
# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
|
||||
Source: boost-coroutine
|
||||
Version: 1.72.0
|
||||
Version: 1.72.0-1
|
||||
Build-Depends: boost-assert, boost-build, boost-config, boost-context (!uwp), boost-detail, boost-exception, boost-integer, boost-modular-build-helper, boost-move, boost-system, boost-thread, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
|
||||
Homepage: https://github.com/boostorg/coroutine
|
||||
Description: Boost coroutine module
|
||||
|
@ -1,13 +1,13 @@
|
||||
# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
|
||||
|
||||
include(vcpkg_common_functions)
|
||||
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO boostorg/coroutine
|
||||
REF boost-1.72.0
|
||||
SHA512 efd234d24692a484b3bb4fdf9790d6e0014ba87ba628768dc2710c9999da14ea4ec6fef2e55a6283d8c3cb22894bd737cadb61f788d9f5e1408785e8c32892a0
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
0001-revert-cease-dependence-on-range.patch
|
||||
)
|
||||
|
||||
include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
|
||||
|
Loading…
Reference in New Issue
Block a user