You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

49 lines
1.6 KiB

  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. This reverts commit 0c556bb59241e682bbcd3f572815149c5a9b17db.
  6. see #44 (One test fails to compile after boostorg/coroutine submodule updated)
  7. ---
  8. boost/coroutine/asymmetric_coroutine.hpp | 12 +++---------
  9. 1 file changed, 3 insertions(+), 9 deletions(-)
  10. diff --git a/boost/coroutine/asymmetric_coroutine.hpp b/boost/coroutine/asymmetric_coroutine.hpp
  11. index ea96981..640896f 100644
  12. --- a/boost/coroutine/asymmetric_coroutine.hpp
  13. +++ b/boost/coroutine/asymmetric_coroutine.hpp
  14. @@ -14,6 +14,7 @@
  15. #include <boost/assert.hpp>
  16. #include <boost/config.hpp>
  17. #include <boost/move/move.hpp>
  18. +#include <boost/range.hpp>
  19. #include <boost/throw_exception.hpp>
  20. #include <boost/utility/explicit_operator_bool.hpp>
  21. @@ -2354,19 +2355,12 @@ end( push_coroutine< R > & c)
  22. }
  23. -// forward declaration of Boost.Range traits to break dependency on it
  24. -template<typename C, typename Enabler>
  25. -struct range_mutable_iterator;
  26. -
  27. -template<typename C, typename Enabler>
  28. -struct range_const_iterator;
  29. -
  30. template< typename Arg >
  31. -struct range_mutable_iterator< coroutines::push_coroutine< Arg >, void >
  32. +struct range_mutable_iterator< coroutines::push_coroutine< Arg > >
  33. { typedef typename coroutines::push_coroutine< Arg >::iterator type; };
  34. template< typename R >
  35. -struct range_mutable_iterator< coroutines::pull_coroutine< R >, void >
  36. +struct range_mutable_iterator< coroutines::pull_coroutine< R > >
  37. { typedef typename coroutines::pull_coroutine< R >::iterator type; };
  38. }
  39. --
  40. 2.24.1