update boost
This commit is contained in:
@@ -1,37 +0,0 @@
|
||||
|
||||
// Copyright Oliver Kowalke 2014.
|
||||
// Distributed under the Boost Software License, Version 1.0.
|
||||
// (See accompanying file LICENSE_1_0.txt or copy at
|
||||
// http://www.boost.org/LICENSE_1_0.txt)
|
||||
|
||||
#ifndef BOOST_COROUTINES2_DETAIL_FORCED_UNWIND_HPP
|
||||
#define BOOST_COROUTINES2_DETAIL_FORCED_UNWIND_HPP
|
||||
|
||||
#include <exception>
|
||||
|
||||
#include <boost/assert.hpp>
|
||||
#include <boost/config.hpp>
|
||||
|
||||
#ifdef BOOST_HAS_ABI_HEADERS
|
||||
# include BOOST_ABI_PREFIX
|
||||
#endif
|
||||
|
||||
namespace boost {
|
||||
namespace coroutines2 {
|
||||
namespace detail {
|
||||
|
||||
struct forced_unwind {};
|
||||
|
||||
inline
|
||||
void * unwind_coroutine( void * data) {
|
||||
throw forced_unwind{};
|
||||
return data;
|
||||
}
|
||||
|
||||
}}}
|
||||
|
||||
#ifdef BOOST_HAS_ABI_HEADERS
|
||||
# include BOOST_ABI_SUFFIX
|
||||
#endif
|
||||
|
||||
#endif // BOOST_COROUTINES2_DETAIL_FORCED_UNWIND_HPP
|
||||
@@ -19,7 +19,6 @@
|
||||
#include <boost/context/fiber.hpp>
|
||||
|
||||
#include <boost/coroutine2/detail/config.hpp>
|
||||
#include <boost/coroutine2/detail/forced_unwind.hpp>
|
||||
#include <boost/coroutine2/detail/wrap.hpp>
|
||||
|
||||
#ifdef BOOST_HAS_ABI_HEADERS
|
||||
|
||||
@@ -130,6 +130,9 @@ public:
|
||||
};
|
||||
|
||||
friend class iterator;
|
||||
|
||||
iterator begin() { return iterator (this); }
|
||||
iterator end() { return iterator(); }
|
||||
};
|
||||
|
||||
template< typename T >
|
||||
@@ -238,6 +241,9 @@ public:
|
||||
};
|
||||
|
||||
friend class iterator;
|
||||
|
||||
iterator begin() { return iterator (this); }
|
||||
iterator end() { return iterator(); }
|
||||
};
|
||||
|
||||
template<>
|
||||
@@ -278,6 +284,8 @@ public:
|
||||
explicit operator bool() const noexcept;
|
||||
|
||||
bool operator!() const noexcept;
|
||||
|
||||
|
||||
};
|
||||
|
||||
template< typename T >
|
||||
|
||||
@@ -18,7 +18,6 @@
|
||||
#include <boost/context/fiber.hpp>
|
||||
|
||||
#include <boost/coroutine2/detail/config.hpp>
|
||||
#include <boost/coroutine2/detail/forced_unwind.hpp>
|
||||
#include <boost/coroutine2/detail/wrap.hpp>
|
||||
|
||||
#ifdef BOOST_HAS_ABI_HEADERS
|
||||
|
||||
@@ -7,10 +7,13 @@
|
||||
#ifndef BOOST_COROUTINE2_DETAIL_WRAP_H
|
||||
#define BOOST_COROUTINE2_DETAIL_WRAP_H
|
||||
|
||||
#include <functional>
|
||||
#include <type_traits>
|
||||
|
||||
#include <boost/config.hpp>
|
||||
#if defined(BOOST_NO_CXX17_STD_INVOKE)
|
||||
#include <boost/context/detail/invoke.hpp>
|
||||
#endif
|
||||
#include <boost/context/fiber.hpp>
|
||||
|
||||
#include <boost/coroutine2/detail/config.hpp>
|
||||
@@ -43,10 +46,17 @@ public:
|
||||
|
||||
boost::context::fiber
|
||||
operator()( boost::context::fiber && c) {
|
||||
#if defined(BOOST_NO_CXX17_STD_INVOKE)
|
||||
return boost::context::detail::invoke(
|
||||
std::move( fn1_),
|
||||
fn2_,
|
||||
std::forward< boost::context::fiber >( c) );
|
||||
#else
|
||||
return std::invoke(
|
||||
std::move( fn1_),
|
||||
fn2_,
|
||||
std::forward< boost::context::fiber >( c) );
|
||||
#endif
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user