update boost on linux
This commit is contained in:
@@ -7,14 +7,6 @@
|
||||
#ifndef BOOST_COROUTINES_ASYMMETRIC_COROUTINE_H
|
||||
#define BOOST_COROUTINES_ASYMMETRIC_COROUTINE_H
|
||||
|
||||
#ifndef BOOST_COROUTINES_NO_DEPRECATION_WARNING
|
||||
# if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__DMC__)
|
||||
# pragma message ("Warning: Boost.Coroutine is now deprecated. Please switch to Boost.Coroutine2. To disable this warning message, define BOOST_COROUTINES_NO_DEPRECATION_WARNING.")
|
||||
# elif defined(__GNUC__) || defined(__HP_aCC) || defined(__SUNPRO_CC) || defined(__IBMCPP__)
|
||||
# warning "Boost.Coroutine is now deprecated. Please switch to Boost.Coroutine2. To disable this warning message, define BOOST_COROUTINES_NO_DEPRECATION_WARNING."
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#include <cstddef>
|
||||
#include <iterator>
|
||||
#include <memory>
|
||||
@@ -152,12 +144,18 @@ public:
|
||||
return * this;
|
||||
}
|
||||
|
||||
class iterator : public std::iterator< std::output_iterator_tag, void, void, void, void >
|
||||
class iterator
|
||||
{
|
||||
private:
|
||||
push_coroutine< Arg > * c_;
|
||||
|
||||
public:
|
||||
typedef std::output_iterator_tag iterator_category;
|
||||
typedef void value_type;
|
||||
typedef void difference_type;
|
||||
typedef void pointer;
|
||||
typedef void reference;
|
||||
|
||||
iterator() :
|
||||
c_( 0)
|
||||
{}
|
||||
@@ -291,12 +289,18 @@ public:
|
||||
return * this;
|
||||
}
|
||||
|
||||
class iterator : public std::iterator< std::output_iterator_tag, void, void, void, void >
|
||||
class iterator
|
||||
{
|
||||
private:
|
||||
push_coroutine< Arg & > * c_;
|
||||
|
||||
public:
|
||||
typedef std::output_iterator_tag iterator_category;
|
||||
typedef void value_type;
|
||||
typedef void difference_type;
|
||||
typedef void pointer;
|
||||
typedef void reference;
|
||||
|
||||
iterator() :
|
||||
c_( 0)
|
||||
{}
|
||||
@@ -725,7 +729,7 @@ public:
|
||||
return impl_->get();
|
||||
}
|
||||
|
||||
class iterator : public std::iterator< std::input_iterator_tag, typename remove_reference< R >::type >
|
||||
class iterator
|
||||
{
|
||||
private:
|
||||
pull_coroutine< R > * c_;
|
||||
@@ -754,8 +758,14 @@ public:
|
||||
}
|
||||
|
||||
public:
|
||||
typedef typename iterator::pointer pointer_t;
|
||||
typedef typename iterator::reference reference_t;
|
||||
typedef std::input_iterator_tag iterator_category;
|
||||
typedef typename remove_reference< R >::type value_type;
|
||||
typedef std::ptrdiff_t difference_type;
|
||||
typedef value_type * pointer;
|
||||
typedef value_type & reference;
|
||||
|
||||
typedef pointer pointer_t;
|
||||
typedef reference reference_t;
|
||||
|
||||
iterator() :
|
||||
c_( 0), val_( 0)
|
||||
@@ -808,7 +818,7 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
class const_iterator : public std::iterator< std::input_iterator_tag, const typename remove_reference< R >::type >
|
||||
class const_iterator
|
||||
{
|
||||
private:
|
||||
pull_coroutine< R > * c_;
|
||||
@@ -837,8 +847,14 @@ public:
|
||||
}
|
||||
|
||||
public:
|
||||
typedef typename const_iterator::pointer pointer_t;
|
||||
typedef typename const_iterator::reference reference_t;
|
||||
typedef std::input_iterator_tag iterator_category;
|
||||
typedef const typename remove_reference< R >::type value_type;
|
||||
typedef std::ptrdiff_t difference_type;
|
||||
typedef value_type * pointer;
|
||||
typedef value_type & reference;
|
||||
|
||||
typedef pointer pointer_t;
|
||||
typedef reference reference_t;
|
||||
|
||||
const_iterator() :
|
||||
c_( 0), val_( 0)
|
||||
@@ -1181,7 +1197,7 @@ public:
|
||||
R & get() const
|
||||
{ return impl_->get(); }
|
||||
|
||||
class iterator : public std::iterator< std::input_iterator_tag, typename remove_reference< R >::type >
|
||||
class iterator
|
||||
{
|
||||
private:
|
||||
pull_coroutine< R & > * c_;
|
||||
@@ -1210,8 +1226,14 @@ public:
|
||||
}
|
||||
|
||||
public:
|
||||
typedef typename iterator::pointer pointer_t;
|
||||
typedef typename iterator::reference reference_t;
|
||||
typedef std::input_iterator_tag iterator_category;
|
||||
typedef typename remove_reference< R >::type value_type;
|
||||
typedef std::ptrdiff_t difference_type;
|
||||
typedef value_type * pointer;
|
||||
typedef value_type & reference;
|
||||
|
||||
typedef pointer pointer_t;
|
||||
typedef reference reference_t;
|
||||
|
||||
iterator() :
|
||||
c_( 0), val_( 0)
|
||||
@@ -1264,7 +1286,7 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
class const_iterator : public std::iterator< std::input_iterator_tag, const typename remove_reference< R >::type >
|
||||
class const_iterator
|
||||
{
|
||||
private:
|
||||
pull_coroutine< R & > * c_;
|
||||
@@ -1293,8 +1315,14 @@ public:
|
||||
}
|
||||
|
||||
public:
|
||||
typedef typename const_iterator::pointer pointer_t;
|
||||
typedef typename const_iterator::reference reference_t;
|
||||
typedef std::input_iterator_tag iterator_category;
|
||||
typedef const typename remove_reference< R >::type value_type;
|
||||
typedef std::ptrdiff_t difference_type;
|
||||
typedef value_type * pointer;
|
||||
typedef value_type & reference;
|
||||
|
||||
typedef pointer pointer_t;
|
||||
typedef reference reference_t;
|
||||
|
||||
const_iterator() :
|
||||
c_( 0), val_( 0)
|
||||
|
||||
@@ -10,14 +10,6 @@
|
||||
#include <boost/config.hpp>
|
||||
#include <boost/detail/workaround.hpp>
|
||||
|
||||
#ifndef BOOST_COROUTINES_NO_DEPRECATION_WARNING
|
||||
# if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__DMC__)
|
||||
# pragma message ("Warning: Boost.Coroutine is now deprecated. Please switch to Boost.Coroutine2. To disable this warning message, define BOOST_COROUTINES_NO_DEPRECATION_WARNING.")
|
||||
# elif defined(__GNUC__) || defined(__HP_aCC) || defined(__SUNPRO_CC) || defined(__IBMCPP__)
|
||||
# warning "Boost.Coroutine is now deprecated. Please switch to Boost.Coroutine2. To disable this warning message, define BOOST_COROUTINES_NO_DEPRECATION_WARNING."
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#ifdef BOOST_COROUTINES_DECL
|
||||
# undef BOOST_COROUTINES_DECL
|
||||
#endif
|
||||
|
||||
@@ -22,7 +22,7 @@ namespace boost {
|
||||
namespace coroutines {
|
||||
namespace detail {
|
||||
|
||||
struct preallocated {
|
||||
struct BOOST_COROUTINES_DECL preallocated {
|
||||
void * sp;
|
||||
std::size_t size;
|
||||
stack_context sctx;
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
|
||||
#include <boost/assert.hpp>
|
||||
#include <boost/config.hpp>
|
||||
#include <boost/context/detail/config.hpp>
|
||||
#include <boost/cstdint.hpp>
|
||||
#include <boost/exception_ptr.hpp>
|
||||
#include <boost/move/move.hpp>
|
||||
@@ -115,6 +116,10 @@ public:
|
||||
{ fn_( push_coro); }
|
||||
catch ( forced_unwind const&)
|
||||
{}
|
||||
#if defined( BOOST_CONTEXT_HAS_CXXABI_H )
|
||||
catch ( abi::__forced_unwind const&)
|
||||
{ throw; }
|
||||
#endif
|
||||
catch (...)
|
||||
{ base_t::except_ = current_exception(); }
|
||||
|
||||
@@ -198,6 +203,10 @@ public:
|
||||
{ fn_( push_coro); }
|
||||
catch ( forced_unwind const&)
|
||||
{}
|
||||
#if defined( BOOST_CONTEXT_HAS_CXXABI_H )
|
||||
catch ( abi::__forced_unwind const&)
|
||||
{ throw; }
|
||||
#endif
|
||||
catch (...)
|
||||
{ base_t::except_ = current_exception(); }
|
||||
|
||||
@@ -281,6 +290,10 @@ public:
|
||||
{ fn_( push_coro); }
|
||||
catch ( forced_unwind const&)
|
||||
{}
|
||||
#if defined( BOOST_CONTEXT_HAS_CXXABI_H )
|
||||
catch ( abi::__forced_unwind const&)
|
||||
{ throw; }
|
||||
#endif
|
||||
catch (...)
|
||||
{ base_t::except_ = current_exception(); }
|
||||
|
||||
|
||||
@@ -54,6 +54,8 @@ public:
|
||||
if ( unwind) flags_ |= flag_force_unwind;
|
||||
}
|
||||
|
||||
virtual ~push_coroutine_impl() {}
|
||||
|
||||
bool force_unwind() const BOOST_NOEXCEPT
|
||||
{ return 0 != ( flags_ & flag_force_unwind); }
|
||||
|
||||
@@ -144,6 +146,8 @@ public:
|
||||
if ( unwind) flags_ |= flag_force_unwind;
|
||||
}
|
||||
|
||||
virtual ~push_coroutine_impl() {}
|
||||
|
||||
bool force_unwind() const BOOST_NOEXCEPT
|
||||
{ return 0 != ( flags_ & flag_force_unwind); }
|
||||
|
||||
@@ -217,6 +221,8 @@ public:
|
||||
if ( unwind) flags_ |= flag_force_unwind;
|
||||
}
|
||||
|
||||
virtual ~push_coroutine_impl() {}
|
||||
|
||||
inline bool force_unwind() const BOOST_NOEXCEPT
|
||||
{ return 0 != ( flags_ & flag_force_unwind); }
|
||||
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
|
||||
#include <boost/assert.hpp>
|
||||
#include <boost/config.hpp>
|
||||
#include <boost/context/detail/config.hpp>
|
||||
#include <boost/cstdint.hpp>
|
||||
#include <boost/exception_ptr.hpp>
|
||||
#include <boost/move/move.hpp>
|
||||
@@ -127,6 +128,10 @@ public:
|
||||
{ fn_( pull_coro); }
|
||||
catch ( forced_unwind const&)
|
||||
{}
|
||||
#if defined( BOOST_CONTEXT_HAS_CXXABI_H )
|
||||
catch ( abi::__forced_unwind const&)
|
||||
{ throw; }
|
||||
#endif
|
||||
catch (...)
|
||||
{ base_t::except_ = current_exception(); }
|
||||
|
||||
@@ -210,6 +215,10 @@ public:
|
||||
{ fn_( push_coro); }
|
||||
catch ( forced_unwind const&)
|
||||
{}
|
||||
#if defined( BOOST_CONTEXT_HAS_CXXABI_H )
|
||||
catch ( abi::__forced_unwind const&)
|
||||
{ throw; }
|
||||
#endif
|
||||
catch (...)
|
||||
{ base_t::except_ = current_exception(); }
|
||||
|
||||
@@ -293,6 +302,10 @@ public:
|
||||
{ fn_( push_coro); }
|
||||
catch ( forced_unwind const&)
|
||||
{}
|
||||
#if defined( BOOST_CONTEXT_HAS_CXXABI_H )
|
||||
catch ( abi::__forced_unwind const&)
|
||||
{ throw; }
|
||||
#endif
|
||||
catch (...)
|
||||
{ base_t::except_ = current_exception(); }
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@ namespace boost {
|
||||
namespace coroutines {
|
||||
|
||||
#if defined(BOOST_USE_SEGMENTED_STACKS)
|
||||
struct stack_context
|
||||
struct BOOST_COROUTINES_DECL stack_context
|
||||
{
|
||||
typedef void * segments_context[BOOST_CONTEXT_SEGMENTS];
|
||||
|
||||
@@ -40,7 +40,7 @@ struct stack_context
|
||||
{}
|
||||
};
|
||||
#else
|
||||
struct stack_context
|
||||
struct BOOST_COROUTINES_DECL stack_context
|
||||
{
|
||||
std::size_t size;
|
||||
void * sp;
|
||||
|
||||
@@ -7,14 +7,6 @@
|
||||
#ifndef BOOST_COROUTINES_SYMMETRIC_COROUTINE_H
|
||||
#define BOOST_COROUTINES_SYMMETRIC_COROUTINE_H
|
||||
|
||||
#ifndef BOOST_COROUTINES_NO_DEPRECATION_WARNING
|
||||
# if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__DMC__)
|
||||
# pragma message ("Warning: Boost.Coroutine is now deprecated. Please switch to Boost.Coroutine2. To disable this warning message, define BOOST_COROUTINES_NO_DEPRECATION_WARNING.")
|
||||
# elif defined(__GNUC__) || defined(__HP_aCC) || defined(__SUNPRO_CC) || defined(__IBMCPP__)
|
||||
# warning "Boost.Coroutine is now deprecated. Please switch to Boost.Coroutine2. To disable this warning message, define BOOST_COROUTINES_NO_DEPRECATION_WARNING."
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#include <boost/config.hpp>
|
||||
|
||||
#include <boost/coroutine/detail/symmetric_coroutine_call.hpp>
|
||||
|
||||
Reference in New Issue
Block a user