Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame^] | 1 | From 436e1dbe6fcd31523d261d18ad011392f1d6fbbc Mon Sep 17 00:00:00 2001 |
| 2 | From: Oliver Kowalke <oliver.kowalke@gmail.com> |
| 3 | Date: Sun, 1 Dec 2019 20:40:28 +0100 |
| 4 | Subject: [PATCH] Revert "Cease dependence on Range" |
| 5 | |
| 6 | This reverts commit 0c556bb59241e682bbcd3f572815149c5a9b17db. |
| 7 | |
| 8 | see #44 (One test fails to compile after boostorg/coroutine submodule updated) |
| 9 | |
| 10 | Upstream-Status: Backport [https://github.com/boostorg/coroutine/commit/9c73b2f7c1759a9508ba8780b38dc15f07f1a447] |
| 11 | |
| 12 | Signed-off-by: Andrew Geissler <geissonator@gmail.com> |
| 13 | --- |
| 14 | boost/coroutine/asymmetric_coroutine.hpp | 12 +++--------- |
| 15 | 1 file changed, 3 insertions(+), 9 deletions(-) |
| 16 | |
| 17 | diff --git a/boost/coroutine/asymmetric_coroutine.hpp b/boost/coroutine/asymmetric_coroutine.hpp |
| 18 | index ea96981..640896f 100644 |
| 19 | --- a/boost/coroutine/asymmetric_coroutine.hpp |
| 20 | +++ b/boost/coroutine/asymmetric_coroutine.hpp |
| 21 | @@ -14,6 +14,7 @@ |
| 22 | #include <boost/assert.hpp> |
| 23 | #include <boost/config.hpp> |
| 24 | #include <boost/move/move.hpp> |
| 25 | +#include <boost/range.hpp> |
| 26 | #include <boost/throw_exception.hpp> |
| 27 | #include <boost/utility/explicit_operator_bool.hpp> |
| 28 | |
| 29 | @@ -2354,19 +2355,12 @@ end( push_coroutine< R > & c) |
| 30 | |
| 31 | } |
| 32 | |
| 33 | -// forward declaration of Boost.Range traits to break dependency on it |
| 34 | -template<typename C, typename Enabler> |
| 35 | -struct range_mutable_iterator; |
| 36 | - |
| 37 | -template<typename C, typename Enabler> |
| 38 | -struct range_const_iterator; |
| 39 | - |
| 40 | template< typename Arg > |
| 41 | -struct range_mutable_iterator< coroutines::push_coroutine< Arg >, void > |
| 42 | +struct range_mutable_iterator< coroutines::push_coroutine< Arg > > |
| 43 | { typedef typename coroutines::push_coroutine< Arg >::iterator type; }; |
| 44 | |
| 45 | template< typename R > |
| 46 | -struct range_mutable_iterator< coroutines::pull_coroutine< R >, void > |
| 47 | +struct range_mutable_iterator< coroutines::pull_coroutine< R > > |
| 48 | { typedef typename coroutines::pull_coroutine< R >::iterator type; }; |
| 49 | |
| 50 | } |
| 51 | -- |
| 52 | 2.24.1 |
| 53 | |