updated boost on windows
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
// posix/basic_stream_descriptor.hpp
|
||||
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
//
|
||||
// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com)
|
||||
// Copyright (c) 2003-2019 Christopher M. Kohlhoff (chris at kohlhoff dot com)
|
||||
//
|
||||
// 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)
|
||||
@@ -16,19 +16,11 @@
|
||||
#endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
|
||||
|
||||
#include <boost/asio/detail/config.hpp>
|
||||
#include <boost/asio/posix/descriptor.hpp>
|
||||
|
||||
#if defined(BOOST_ASIO_HAS_POSIX_STREAM_DESCRIPTOR) \
|
||||
|| defined(GENERATING_DOCUMENTATION)
|
||||
|
||||
#include <cstddef>
|
||||
#include <boost/asio/detail/handler_type_requirements.hpp>
|
||||
#include <boost/asio/detail/throw_error.hpp>
|
||||
#include <boost/asio/error.hpp>
|
||||
#include <boost/asio/posix/basic_descriptor.hpp>
|
||||
#include <boost/asio/posix/stream_descriptor_service.hpp>
|
||||
|
||||
#include <boost/asio/detail/push_options.hpp>
|
||||
|
||||
namespace boost {
|
||||
namespace asio {
|
||||
namespace posix {
|
||||
@@ -45,85 +37,126 @@ namespace posix {
|
||||
* @par Concepts:
|
||||
* AsyncReadStream, AsyncWriteStream, Stream, SyncReadStream, SyncWriteStream.
|
||||
*/
|
||||
template <typename StreamDescriptorService = stream_descriptor_service>
|
||||
template <typename Executor = executor>
|
||||
class basic_stream_descriptor
|
||||
: public basic_descriptor<StreamDescriptorService>
|
||||
: public basic_descriptor<Executor>
|
||||
{
|
||||
public:
|
||||
/// (Deprecated: Use native_handle_type.) The native representation of a
|
||||
/// descriptor.
|
||||
typedef typename StreamDescriptorService::native_handle_type native_type;
|
||||
/// The type of the executor associated with the object.
|
||||
typedef Executor executor_type;
|
||||
|
||||
/// The native representation of a descriptor.
|
||||
typedef typename StreamDescriptorService::native_handle_type
|
||||
typedef typename basic_descriptor<Executor>::native_handle_type
|
||||
native_handle_type;
|
||||
|
||||
/// Construct a basic_stream_descriptor without opening it.
|
||||
/// Construct a stream descriptor without opening it.
|
||||
/**
|
||||
* This constructor creates a stream descriptor without opening it. The
|
||||
* descriptor needs to be opened and then connected or accepted before data
|
||||
* can be sent or received on it.
|
||||
*
|
||||
* @param io_service The io_service object that the stream descriptor will
|
||||
* use to dispatch handlers for any asynchronous operations performed on the
|
||||
* @param ex The I/O executor that the descriptor will use, by default, to
|
||||
* dispatch handlers for any asynchronous operations performed on the
|
||||
* descriptor.
|
||||
*/
|
||||
explicit basic_stream_descriptor(boost::asio::io_service& io_service)
|
||||
: basic_descriptor<StreamDescriptorService>(io_service)
|
||||
explicit basic_stream_descriptor(const executor_type& ex)
|
||||
: basic_descriptor<Executor>(ex)
|
||||
{
|
||||
}
|
||||
|
||||
/// Construct a basic_stream_descriptor on an existing native descriptor.
|
||||
/// Construct a stream descriptor without opening it.
|
||||
/**
|
||||
* This constructor creates a stream descriptor without opening it. The
|
||||
* descriptor needs to be opened and then connected or accepted before data
|
||||
* can be sent or received on it.
|
||||
*
|
||||
* @param context An execution context which provides the I/O executor that
|
||||
* the descriptor will use, by default, to dispatch handlers for any
|
||||
* asynchronous operations performed on the descriptor.
|
||||
*/
|
||||
template <typename ExecutionContext>
|
||||
explicit basic_stream_descriptor(ExecutionContext& context,
|
||||
typename enable_if<
|
||||
is_convertible<ExecutionContext&, execution_context&>::value
|
||||
>::type* = 0)
|
||||
: basic_descriptor<Executor>(context)
|
||||
{
|
||||
}
|
||||
|
||||
/// Construct a stream descriptor on an existing native descriptor.
|
||||
/**
|
||||
* This constructor creates a stream descriptor object to hold an existing
|
||||
* native descriptor.
|
||||
*
|
||||
* @param io_service The io_service object that the stream descriptor will
|
||||
* use to dispatch handlers for any asynchronous operations performed on the
|
||||
* @param ex The I/O executor that the descriptor will use, by default, to
|
||||
* dispatch handlers for any asynchronous operations performed on the
|
||||
* descriptor.
|
||||
*
|
||||
* @param native_descriptor The new underlying descriptor implementation.
|
||||
*
|
||||
* @throws boost::system::system_error Thrown on failure.
|
||||
*/
|
||||
basic_stream_descriptor(boost::asio::io_service& io_service,
|
||||
basic_stream_descriptor(const executor_type& ex,
|
||||
const native_handle_type& native_descriptor)
|
||||
: basic_descriptor<StreamDescriptorService>(io_service, native_descriptor)
|
||||
: basic_descriptor<Executor>(ex, native_descriptor)
|
||||
{
|
||||
}
|
||||
|
||||
/// Construct a stream descriptor on an existing native descriptor.
|
||||
/**
|
||||
* This constructor creates a stream descriptor object to hold an existing
|
||||
* native descriptor.
|
||||
*
|
||||
* @param context An execution context which provides the I/O executor that
|
||||
* the descriptor will use, by default, to dispatch handlers for any
|
||||
* asynchronous operations performed on the descriptor.
|
||||
*
|
||||
* @param native_descriptor The new underlying descriptor implementation.
|
||||
*
|
||||
* @throws boost::system::system_error Thrown on failure.
|
||||
*/
|
||||
template <typename ExecutionContext>
|
||||
basic_stream_descriptor(ExecutionContext& context,
|
||||
const native_handle_type& native_descriptor,
|
||||
typename enable_if<
|
||||
is_convertible<ExecutionContext&, execution_context&>::value
|
||||
>::type* = 0)
|
||||
: basic_descriptor<Executor>(context, native_descriptor)
|
||||
{
|
||||
}
|
||||
|
||||
#if defined(BOOST_ASIO_HAS_MOVE) || defined(GENERATING_DOCUMENTATION)
|
||||
/// Move-construct a basic_stream_descriptor from another.
|
||||
/// Move-construct a stream descriptor from another.
|
||||
/**
|
||||
* This constructor moves a stream descriptor from one object to another.
|
||||
*
|
||||
* @param other The other basic_stream_descriptor object from which the move
|
||||
* @param other The other stream descriptor object from which the move
|
||||
* will occur.
|
||||
*
|
||||
* @note Following the move, the moved-from object is in the same state as if
|
||||
* constructed using the @c basic_stream_descriptor(io_service&) constructor.
|
||||
* constructed using the @c basic_stream_descriptor(const executor_type&)
|
||||
* constructor.
|
||||
*/
|
||||
basic_stream_descriptor(basic_stream_descriptor&& other)
|
||||
: basic_descriptor<StreamDescriptorService>(
|
||||
BOOST_ASIO_MOVE_CAST(basic_stream_descriptor)(other))
|
||||
: descriptor(std::move(other))
|
||||
{
|
||||
}
|
||||
|
||||
/// Move-assign a basic_stream_descriptor from another.
|
||||
/// Move-assign a stream descriptor from another.
|
||||
/**
|
||||
* This assignment operator moves a stream descriptor from one object to
|
||||
* another.
|
||||
*
|
||||
* @param other The other basic_stream_descriptor object from which the move
|
||||
* @param other The other stream descriptor object from which the move
|
||||
* will occur.
|
||||
*
|
||||
* @note Following the move, the moved-from object is in the same state as if
|
||||
* constructed using the @c basic_stream_descriptor(io_service&) constructor.
|
||||
* constructed using the @c basic_stream_descriptor(const executor_type&)
|
||||
* constructor.
|
||||
*/
|
||||
basic_stream_descriptor& operator=(basic_stream_descriptor&& other)
|
||||
{
|
||||
basic_descriptor<StreamDescriptorService>::operator=(
|
||||
BOOST_ASIO_MOVE_CAST(basic_stream_descriptor)(other));
|
||||
descriptor::operator=(std::move(other));
|
||||
return *this;
|
||||
}
|
||||
#endif // defined(BOOST_ASIO_HAS_MOVE) || defined(GENERATING_DOCUMENTATION)
|
||||
@@ -159,8 +192,8 @@ public:
|
||||
std::size_t write_some(const ConstBufferSequence& buffers)
|
||||
{
|
||||
boost::system::error_code ec;
|
||||
std::size_t s = this->get_service().write_some(
|
||||
this->get_implementation(), buffers, ec);
|
||||
std::size_t s = this->impl_.get_service().write_some(
|
||||
this->impl_.get_implementation(), buffers, ec);
|
||||
boost::asio::detail::throw_error(ec, "write_some");
|
||||
return s;
|
||||
}
|
||||
@@ -185,8 +218,8 @@ public:
|
||||
std::size_t write_some(const ConstBufferSequence& buffers,
|
||||
boost::system::error_code& ec)
|
||||
{
|
||||
return this->get_service().write_some(
|
||||
this->get_implementation(), buffers, ec);
|
||||
return this->impl_.get_service().write_some(
|
||||
this->impl_.get_implementation(), buffers, ec);
|
||||
}
|
||||
|
||||
/// Start an asynchronous write.
|
||||
@@ -207,9 +240,9 @@ public:
|
||||
* std::size_t bytes_transferred // Number of bytes written.
|
||||
* ); @endcode
|
||||
* Regardless of whether the asynchronous operation completes immediately or
|
||||
* not, the handler will not be invoked from within this function. Invocation
|
||||
* of the handler will be performed in a manner equivalent to using
|
||||
* boost::asio::io_service::post().
|
||||
* not, the handler will not be invoked from within this function. On
|
||||
* immediate completion, invocation of the handler will be performed in a
|
||||
* manner equivalent to using boost::asio::post().
|
||||
*
|
||||
* @note The write operation may not transmit all of the data to the peer.
|
||||
* Consider using the @ref async_write function if you need to ensure that all
|
||||
@@ -230,12 +263,9 @@ public:
|
||||
async_write_some(const ConstBufferSequence& buffers,
|
||||
BOOST_ASIO_MOVE_ARG(WriteHandler) handler)
|
||||
{
|
||||
// If you get an error on the following line it means that your handler does
|
||||
// not meet the documented type requirements for a WriteHandler.
|
||||
BOOST_ASIO_WRITE_HANDLER_CHECK(WriteHandler, handler) type_check;
|
||||
|
||||
return this->get_service().async_write_some(this->get_implementation(),
|
||||
buffers, BOOST_ASIO_MOVE_CAST(WriteHandler)(handler));
|
||||
return async_initiate<WriteHandler,
|
||||
void (boost::system::error_code, std::size_t)>(
|
||||
initiate_async_write_some(), handler, this, buffers);
|
||||
}
|
||||
|
||||
/// Read some data from the descriptor.
|
||||
@@ -270,8 +300,8 @@ public:
|
||||
std::size_t read_some(const MutableBufferSequence& buffers)
|
||||
{
|
||||
boost::system::error_code ec;
|
||||
std::size_t s = this->get_service().read_some(
|
||||
this->get_implementation(), buffers, ec);
|
||||
std::size_t s = this->impl_.get_service().read_some(
|
||||
this->impl_.get_implementation(), buffers, ec);
|
||||
boost::asio::detail::throw_error(ec, "read_some");
|
||||
return s;
|
||||
}
|
||||
@@ -297,8 +327,8 @@ public:
|
||||
std::size_t read_some(const MutableBufferSequence& buffers,
|
||||
boost::system::error_code& ec)
|
||||
{
|
||||
return this->get_service().read_some(
|
||||
this->get_implementation(), buffers, ec);
|
||||
return this->impl_.get_service().read_some(
|
||||
this->impl_.get_implementation(), buffers, ec);
|
||||
}
|
||||
|
||||
/// Start an asynchronous read.
|
||||
@@ -319,9 +349,9 @@ public:
|
||||
* std::size_t bytes_transferred // Number of bytes read.
|
||||
* ); @endcode
|
||||
* Regardless of whether the asynchronous operation completes immediately or
|
||||
* not, the handler will not be invoked from within this function. Invocation
|
||||
* of the handler will be performed in a manner equivalent to using
|
||||
* boost::asio::io_service::post().
|
||||
* not, the handler will not be invoked from within this function. On
|
||||
* immediate completion, invocation of the handler will be performed in a
|
||||
* manner equivalent to using boost::asio::post().
|
||||
*
|
||||
* @note The read operation may not read all of the requested number of bytes.
|
||||
* Consider using the @ref async_read function if you need to ensure that the
|
||||
@@ -343,21 +373,53 @@ public:
|
||||
async_read_some(const MutableBufferSequence& buffers,
|
||||
BOOST_ASIO_MOVE_ARG(ReadHandler) handler)
|
||||
{
|
||||
// If you get an error on the following line it means that your handler does
|
||||
// not meet the documented type requirements for a ReadHandler.
|
||||
BOOST_ASIO_READ_HANDLER_CHECK(ReadHandler, handler) type_check;
|
||||
|
||||
return this->get_service().async_read_some(this->get_implementation(),
|
||||
buffers, BOOST_ASIO_MOVE_CAST(ReadHandler)(handler));
|
||||
return async_initiate<ReadHandler,
|
||||
void (boost::system::error_code, std::size_t)>(
|
||||
initiate_async_read_some(), handler, this, buffers);
|
||||
}
|
||||
|
||||
private:
|
||||
struct initiate_async_write_some
|
||||
{
|
||||
template <typename WriteHandler, typename ConstBufferSequence>
|
||||
void operator()(BOOST_ASIO_MOVE_ARG(WriteHandler) handler,
|
||||
basic_stream_descriptor* self,
|
||||
const ConstBufferSequence& buffers) const
|
||||
{
|
||||
// If you get an error on the following line it means that your handler
|
||||
// does not meet the documented type requirements for a WriteHandler.
|
||||
BOOST_ASIO_WRITE_HANDLER_CHECK(WriteHandler, handler) type_check;
|
||||
|
||||
detail::non_const_lvalue<WriteHandler> handler2(handler);
|
||||
self->impl_.get_service().async_write_some(
|
||||
self->impl_.get_implementation(), buffers, handler2.value,
|
||||
self->impl_.get_implementation_executor());
|
||||
}
|
||||
};
|
||||
|
||||
struct initiate_async_read_some
|
||||
{
|
||||
template <typename ReadHandler, typename MutableBufferSequence>
|
||||
void operator()(BOOST_ASIO_MOVE_ARG(ReadHandler) handler,
|
||||
basic_stream_descriptor* self,
|
||||
const MutableBufferSequence& buffers) const
|
||||
{
|
||||
// If you get an error on the following line it means that your handler
|
||||
// does not meet the documented type requirements for a ReadHandler.
|
||||
BOOST_ASIO_READ_HANDLER_CHECK(ReadHandler, handler) type_check;
|
||||
|
||||
detail::non_const_lvalue<ReadHandler> handler2(handler);
|
||||
self->impl_.get_service().async_read_some(
|
||||
self->impl_.get_implementation(), buffers, handler2.value,
|
||||
self->impl_.get_implementation_executor());
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
} // namespace posix
|
||||
} // namespace asio
|
||||
} // namespace boost
|
||||
|
||||
#include <boost/asio/detail/pop_options.hpp>
|
||||
|
||||
#endif // defined(BOOST_ASIO_HAS_POSIX_STREAM_DESCRIPTOR)
|
||||
// || defined(GENERATING_DOCUMENTATION)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user