diff options
Diffstat (limited to 'boost/asio/impl/read_at.hpp')
| -rw-r--r-- | boost/asio/impl/read_at.hpp | 514 |
1 files changed, 172 insertions, 342 deletions
diff --git a/boost/asio/impl/read_at.hpp b/boost/asio/impl/read_at.hpp index 0ec8a94e44..457bc056f4 100644 --- a/boost/asio/impl/read_at.hpp +++ b/boost/asio/impl/read_at.hpp @@ -16,6 +16,8 @@ #endif // defined(_MSC_VER) && (_MSC_VER >= 1200) #include <algorithm> +#include <boost/asio/associated_allocator.hpp> +#include <boost/asio/associated_executor.hpp> #include <boost/asio/buffer.hpp> #include <boost/asio/completion_condition.hpp> #include <boost/asio/detail/array_fwd.hpp> @@ -35,28 +37,41 @@ namespace boost { namespace asio { +namespace detail +{ + template <typename SyncRandomAccessReadDevice, typename MutableBufferSequence, + typename MutableBufferIterator, typename CompletionCondition> + std::size_t read_at_buffer_sequence(SyncRandomAccessReadDevice& d, + uint64_t offset, const MutableBufferSequence& buffers, + const MutableBufferIterator&, CompletionCondition completion_condition, + boost::system::error_code& ec) + { + ec = boost::system::error_code(); + boost::asio::detail::consuming_buffers<mutable_buffer, + MutableBufferSequence, MutableBufferIterator> tmp(buffers); + while (!tmp.empty()) + { + if (std::size_t max_size = detail::adapt_completion_condition_result( + completion_condition(ec, tmp.total_consumed()))) + { + tmp.consume(d.read_some_at(offset + tmp.total_consumed(), + tmp.prepare(max_size), ec)); + } + else + break; + } + return tmp.total_consumed();; + } +} // namespace detail + template <typename SyncRandomAccessReadDevice, typename MutableBufferSequence, typename CompletionCondition> std::size_t read_at(SyncRandomAccessReadDevice& d, uint64_t offset, const MutableBufferSequence& buffers, CompletionCondition completion_condition, boost::system::error_code& ec) { - ec = boost::system::error_code(); - boost::asio::detail::consuming_buffers< - mutable_buffer, MutableBufferSequence> tmp(buffers); - std::size_t total_transferred = 0; - tmp.prepare(detail::adapt_completion_condition_result( - completion_condition(ec, total_transferred))); - while (tmp.begin() != tmp.end()) - { - std::size_t bytes_transferred = d.read_some_at( - offset + total_transferred, tmp, ec); - tmp.consume(bytes_transferred); - total_transferred += bytes_transferred; - tmp.prepare(detail::adapt_completion_condition_result( - completion_condition(ec, total_transferred))); - } - return total_transferred; + return detail::read_at_buffer_sequence(d, offset, buffers, + boost::asio::buffer_sequence_begin(buffers), completion_condition, ec); } template <typename SyncRandomAccessReadDevice, typename MutableBufferSequence> @@ -91,6 +106,7 @@ inline std::size_t read_at(SyncRandomAccessReadDevice& d, return bytes_transferred; } +#if !defined(BOOST_ASIO_NO_EXTENSIONS) #if !defined(BOOST_ASIO_NO_IOSTREAM) template <typename SyncRandomAccessReadDevice, typename Allocator, @@ -150,12 +166,13 @@ inline std::size_t read_at(SyncRandomAccessReadDevice& d, } #endif // !defined(BOOST_ASIO_NO_IOSTREAM) +#endif // !defined(BOOST_ASIO_NO_EXTENSIONS) namespace detail { template <typename AsyncRandomAccessReadDevice, - typename MutableBufferSequence, typename CompletionCondition, - typename ReadHandler> + typename MutableBufferSequence, typename MutableBufferIterator, + typename CompletionCondition, typename ReadHandler> class read_at_op : detail::base_from_completion_cond<CompletionCondition> { @@ -169,7 +186,6 @@ namespace detail offset_(offset), buffers_(buffers), start_(0), - total_transferred_(0), handler_(BOOST_ASIO_MOVE_CAST(ReadHandler)(handler)) { } @@ -181,7 +197,6 @@ namespace detail offset_(other.offset_), buffers_(other.buffers_), start_(other.start_), - total_transferred_(other.total_transferred_), handler_(other.handler_) { } @@ -192,7 +207,6 @@ namespace detail offset_(other.offset_), buffers_(other.buffers_), start_(other.start_), - total_transferred_(other.total_transferred_), handler_(BOOST_ASIO_MOVE_CAST(ReadHandler)(other.handler_)) { } @@ -201,326 +215,64 @@ namespace detail void operator()(const boost::system::error_code& ec, std::size_t bytes_transferred, int start = 0) { + std::size_t max_size; switch (start_ = start) { case 1: - buffers_.prepare(this->check_for_completion(ec, total_transferred_)); - for (;;) + max_size = this->check_for_completion(ec, buffers_.total_consumed()); + do { - device_.async_read_some_at(offset_ + total_transferred_, - buffers_, BOOST_ASIO_MOVE_CAST(read_at_op)(*this)); + device_.async_read_some_at( + offset_ + buffers_.total_consumed(), buffers_.prepare(max_size), + BOOST_ASIO_MOVE_CAST(read_at_op)(*this)); return; default: - total_transferred_ += bytes_transferred; buffers_.consume(bytes_transferred); - buffers_.prepare(this->check_for_completion(ec, total_transferred_)); - if ((!ec && bytes_transferred == 0) - || buffers_.begin() == buffers_.end()) + if ((!ec && bytes_transferred == 0) || buffers_.empty()) break; - } + max_size = this->check_for_completion(ec, buffers_.total_consumed()); + } while (max_size > 0); - handler_(ec, static_cast<const std::size_t&>(total_transferred_)); + handler_(ec, buffers_.total_consumed()); } } //private: AsyncRandomAccessReadDevice& device_; uint64_t offset_; - boost::asio::detail::consuming_buffers< - mutable_buffer, MutableBufferSequence> buffers_; + boost::asio::detail::consuming_buffers<mutable_buffer, + MutableBufferSequence, MutableBufferIterator> buffers_; int start_; - std::size_t total_transferred_; ReadHandler handler_; }; template <typename AsyncRandomAccessReadDevice, + typename MutableBufferSequence, typename MutableBufferIterator, typename CompletionCondition, typename ReadHandler> - class read_at_op<AsyncRandomAccessReadDevice, - boost::asio::mutable_buffers_1, CompletionCondition, ReadHandler> - : detail::base_from_completion_cond<CompletionCondition> - { - public: - read_at_op(AsyncRandomAccessReadDevice& device, - uint64_t offset, const boost::asio::mutable_buffers_1& buffers, - CompletionCondition completion_condition, ReadHandler& handler) - : detail::base_from_completion_cond< - CompletionCondition>(completion_condition), - device_(device), - offset_(offset), - buffer_(buffers), - start_(0), - total_transferred_(0), - handler_(BOOST_ASIO_MOVE_CAST(ReadHandler)(handler)) - { - } - -#if defined(BOOST_ASIO_HAS_MOVE) - read_at_op(const read_at_op& other) - : detail::base_from_completion_cond<CompletionCondition>(other), - device_(other.device_), - offset_(other.offset_), - buffer_(other.buffer_), - start_(other.start_), - total_transferred_(other.total_transferred_), - handler_(other.handler_) - { - } - - read_at_op(read_at_op&& other) - : detail::base_from_completion_cond<CompletionCondition>(other), - device_(other.device_), - offset_(other.offset_), - buffer_(other.buffer_), - start_(other.start_), - total_transferred_(other.total_transferred_), - handler_(BOOST_ASIO_MOVE_CAST(ReadHandler)(other.handler_)) - { - } -#endif // defined(BOOST_ASIO_HAS_MOVE) - - void operator()(const boost::system::error_code& ec, - std::size_t bytes_transferred, int start = 0) - { - std::size_t n = 0; - switch (start_ = start) - { - case 1: - n = this->check_for_completion(ec, total_transferred_); - for (;;) - { - device_.async_read_some_at(offset_ + total_transferred_, - boost::asio::buffer(buffer_ + total_transferred_, n), - BOOST_ASIO_MOVE_CAST(read_at_op)(*this)); - return; default: - total_transferred_ += bytes_transferred; - if ((!ec && bytes_transferred == 0) - || (n = this->check_for_completion(ec, total_transferred_)) == 0 - || total_transferred_ == boost::asio::buffer_size(buffer_)) - break; - } - - handler_(ec, static_cast<const std::size_t&>(total_transferred_)); - } - } - - //private: - AsyncRandomAccessReadDevice& device_; - uint64_t offset_; - boost::asio::mutable_buffer buffer_; - int start_; - std::size_t total_transferred_; - ReadHandler handler_; - }; - - template <typename AsyncRandomAccessReadDevice, typename Elem, - typename CompletionCondition, typename ReadHandler> - class read_at_op<AsyncRandomAccessReadDevice, boost::array<Elem, 2>, - CompletionCondition, ReadHandler> - : detail::base_from_completion_cond<CompletionCondition> - { - public: - read_at_op(AsyncRandomAccessReadDevice& device, - uint64_t offset, const boost::array<Elem, 2>& buffers, - CompletionCondition completion_condition, ReadHandler& handler) - : detail::base_from_completion_cond< - CompletionCondition>(completion_condition), - device_(device), - offset_(offset), - buffers_(buffers), - start_(0), - total_transferred_(0), - handler_(BOOST_ASIO_MOVE_CAST(ReadHandler)(handler)) - { - } - -#if defined(BOOST_ASIO_HAS_MOVE) - read_at_op(const read_at_op& other) - : detail::base_from_completion_cond<CompletionCondition>(other), - device_(other.device_), - offset_(other.offset_), - buffers_(other.buffers_), - start_(other.start_), - total_transferred_(other.total_transferred_), - handler_(other.handler_) - { - } - - read_at_op(read_at_op&& other) - : detail::base_from_completion_cond<CompletionCondition>(other), - device_(other.device_), - offset_(other.offset_), - buffers_(other.buffers_), - start_(other.start_), - total_transferred_(other.total_transferred_), - handler_(BOOST_ASIO_MOVE_CAST(ReadHandler)(other.handler_)) - { - } -#endif // defined(BOOST_ASIO_HAS_MOVE) - - void operator()(const boost::system::error_code& ec, - std::size_t bytes_transferred, int start = 0) - { - typename boost::asio::detail::dependent_type<Elem, - boost::array<boost::asio::mutable_buffer, 2> >::type bufs = {{ - boost::asio::mutable_buffer(buffers_[0]), - boost::asio::mutable_buffer(buffers_[1]) }}; - std::size_t buffer_size0 = boost::asio::buffer_size(bufs[0]); - std::size_t buffer_size1 = boost::asio::buffer_size(bufs[1]); - std::size_t n = 0; - switch (start_ = start) - { - case 1: - n = this->check_for_completion(ec, total_transferred_); - for (;;) - { - bufs[0] = boost::asio::buffer(bufs[0] + total_transferred_, n); - bufs[1] = boost::asio::buffer( - bufs[1] + (total_transferred_ < buffer_size0 - ? 0 : total_transferred_ - buffer_size0), - n - boost::asio::buffer_size(bufs[0])); - device_.async_read_some_at(offset_ + total_transferred_, - bufs, BOOST_ASIO_MOVE_CAST(read_at_op)(*this)); - return; default: - total_transferred_ += bytes_transferred; - if ((!ec && bytes_transferred == 0) - || (n = this->check_for_completion(ec, total_transferred_)) == 0 - || total_transferred_ == buffer_size0 + buffer_size1) - break; - } - - handler_(ec, static_cast<const std::size_t&>(total_transferred_)); - } - } - - //private: - AsyncRandomAccessReadDevice& device_; - uint64_t offset_; - boost::array<Elem, 2> buffers_; - int start_; - std::size_t total_transferred_; - ReadHandler handler_; - }; - -#if defined(BOOST_ASIO_HAS_STD_ARRAY) - - template <typename AsyncRandomAccessReadDevice, typename Elem, - typename CompletionCondition, typename ReadHandler> - class read_at_op<AsyncRandomAccessReadDevice, std::array<Elem, 2>, - CompletionCondition, ReadHandler> - : detail::base_from_completion_cond<CompletionCondition> - { - public: - read_at_op(AsyncRandomAccessReadDevice& device, - uint64_t offset, const std::array<Elem, 2>& buffers, - CompletionCondition completion_condition, ReadHandler& handler) - : detail::base_from_completion_cond< - CompletionCondition>(completion_condition), - device_(device), - offset_(offset), - buffers_(buffers), - start_(0), - total_transferred_(0), - handler_(BOOST_ASIO_MOVE_CAST(ReadHandler)(handler)) - { - } - -#if defined(BOOST_ASIO_HAS_MOVE) - read_at_op(const read_at_op& other) - : detail::base_from_completion_cond<CompletionCondition>(other), - device_(other.device_), - offset_(other.offset_), - buffers_(other.buffers_), - start_(other.start_), - total_transferred_(other.total_transferred_), - handler_(other.handler_) - { - } - - read_at_op(read_at_op&& other) - : detail::base_from_completion_cond<CompletionCondition>(other), - device_(other.device_), - offset_(other.offset_), - buffers_(other.buffers_), - start_(other.start_), - total_transferred_(other.total_transferred_), - handler_(BOOST_ASIO_MOVE_CAST(ReadHandler)(other.handler_)) - { - } -#endif // defined(BOOST_ASIO_HAS_MOVE) - - void operator()(const boost::system::error_code& ec, - std::size_t bytes_transferred, int start = 0) - { - typename boost::asio::detail::dependent_type<Elem, - std::array<boost::asio::mutable_buffer, 2> >::type bufs = {{ - boost::asio::mutable_buffer(buffers_[0]), - boost::asio::mutable_buffer(buffers_[1]) }}; - std::size_t buffer_size0 = boost::asio::buffer_size(bufs[0]); - std::size_t buffer_size1 = boost::asio::buffer_size(bufs[1]); - std::size_t n = 0; - switch (start_ = start) - { - case 1: - n = this->check_for_completion(ec, total_transferred_); - for (;;) - { - bufs[0] = boost::asio::buffer(bufs[0] + total_transferred_, n); - bufs[1] = boost::asio::buffer( - bufs[1] + (total_transferred_ < buffer_size0 - ? 0 : total_transferred_ - buffer_size0), - n - boost::asio::buffer_size(bufs[0])); - device_.async_read_some_at(offset_ + total_transferred_, - bufs, BOOST_ASIO_MOVE_CAST(read_at_op)(*this)); - return; default: - total_transferred_ += bytes_transferred; - if ((!ec && bytes_transferred == 0) - || (n = this->check_for_completion(ec, total_transferred_)) == 0 - || total_transferred_ == buffer_size0 + buffer_size1) - break; - } - - handler_(ec, static_cast<const std::size_t&>(total_transferred_)); - } - } - - //private: - AsyncRandomAccessReadDevice& device_; - uint64_t offset_; - std::array<Elem, 2> buffers_; - int start_; - std::size_t total_transferred_; - ReadHandler handler_; - }; - -#endif // defined(BOOST_ASIO_HAS_STD_ARRAY) - - template <typename AsyncRandomAccessReadDevice, - typename MutableBufferSequence, typename CompletionCondition, - typename ReadHandler> inline void* asio_handler_allocate(std::size_t size, read_at_op<AsyncRandomAccessReadDevice, MutableBufferSequence, - CompletionCondition, ReadHandler>* this_handler) + MutableBufferIterator, CompletionCondition, ReadHandler>* this_handler) { return boost_asio_handler_alloc_helpers::allocate( size, this_handler->handler_); } template <typename AsyncRandomAccessReadDevice, - typename MutableBufferSequence, typename CompletionCondition, - typename ReadHandler> + typename MutableBufferSequence, typename MutableBufferIterator, + typename CompletionCondition, typename ReadHandler> inline void asio_handler_deallocate(void* pointer, std::size_t size, read_at_op<AsyncRandomAccessReadDevice, MutableBufferSequence, - CompletionCondition, ReadHandler>* this_handler) + MutableBufferIterator, CompletionCondition, ReadHandler>* this_handler) { boost_asio_handler_alloc_helpers::deallocate( pointer, size, this_handler->handler_); } template <typename AsyncRandomAccessReadDevice, - typename MutableBufferSequence, typename CompletionCondition, - typename ReadHandler> + typename MutableBufferSequence, typename MutableBufferIterator, + typename CompletionCondition, typename ReadHandler> inline bool asio_handler_is_continuation( read_at_op<AsyncRandomAccessReadDevice, MutableBufferSequence, - CompletionCondition, ReadHandler>* this_handler) + MutableBufferIterator, CompletionCondition, ReadHandler>* this_handler) { return this_handler->start_ == 0 ? true : boost_asio_handler_cont_helpers::is_continuation( @@ -528,42 +280,86 @@ namespace detail } template <typename Function, typename AsyncRandomAccessReadDevice, - typename MutableBufferSequence, typename CompletionCondition, - typename ReadHandler> + typename MutableBufferSequence, typename MutableBufferIterator, + typename CompletionCondition, typename ReadHandler> inline void asio_handler_invoke(Function& function, read_at_op<AsyncRandomAccessReadDevice, MutableBufferSequence, - CompletionCondition, ReadHandler>* this_handler) + MutableBufferIterator, CompletionCondition, ReadHandler>* this_handler) { boost_asio_handler_invoke_helpers::invoke( function, this_handler->handler_); } template <typename Function, typename AsyncRandomAccessReadDevice, - typename MutableBufferSequence, typename CompletionCondition, - typename ReadHandler> + typename MutableBufferSequence, typename MutableBufferIterator, + typename CompletionCondition, typename ReadHandler> inline void asio_handler_invoke(const Function& function, read_at_op<AsyncRandomAccessReadDevice, MutableBufferSequence, - CompletionCondition, ReadHandler>* this_handler) + MutableBufferIterator, CompletionCondition, ReadHandler>* this_handler) { boost_asio_handler_invoke_helpers::invoke( function, this_handler->handler_); } template <typename AsyncRandomAccessReadDevice, - typename MutableBufferSequence, typename CompletionCondition, - typename ReadHandler> - inline read_at_op<AsyncRandomAccessReadDevice, - MutableBufferSequence, CompletionCondition, ReadHandler> - make_read_at_op(AsyncRandomAccessReadDevice& d, + typename MutableBufferSequence, typename MutableBufferIterator, + typename CompletionCondition, typename ReadHandler> + inline void start_read_at_buffer_sequence_op(AsyncRandomAccessReadDevice& d, uint64_t offset, const MutableBufferSequence& buffers, - CompletionCondition completion_condition, ReadHandler handler) + const MutableBufferIterator&, CompletionCondition completion_condition, + ReadHandler& handler) { - return read_at_op<AsyncRandomAccessReadDevice, - MutableBufferSequence, CompletionCondition, ReadHandler>( - d, offset, buffers, completion_condition, handler); + detail::read_at_op<AsyncRandomAccessReadDevice, MutableBufferSequence, + MutableBufferIterator, CompletionCondition, ReadHandler>( + d, offset, buffers, completion_condition, handler)( + boost::system::error_code(), 0, 1); } } // namespace detail +#if !defined(GENERATING_DOCUMENTATION) + +template <typename AsyncRandomAccessReadDevice, + typename MutableBufferSequence, typename MutableBufferIterator, + typename CompletionCondition, typename ReadHandler, typename Allocator> +struct associated_allocator< + detail::read_at_op<AsyncRandomAccessReadDevice, MutableBufferSequence, + MutableBufferIterator, CompletionCondition, ReadHandler>, + Allocator> +{ + typedef typename associated_allocator<ReadHandler, Allocator>::type type; + + static type get( + const detail::read_at_op<AsyncRandomAccessReadDevice, + MutableBufferSequence, MutableBufferIterator, + CompletionCondition, ReadHandler>& h, + const Allocator& a = Allocator()) BOOST_ASIO_NOEXCEPT + { + return associated_allocator<ReadHandler, Allocator>::get(h.handler_, a); + } +}; + +template <typename AsyncRandomAccessReadDevice, + typename MutableBufferSequence, typename MutableBufferIterator, + typename CompletionCondition, typename ReadHandler, typename Executor> +struct associated_executor< + detail::read_at_op<AsyncRandomAccessReadDevice, MutableBufferSequence, + MutableBufferIterator, CompletionCondition, ReadHandler>, + Executor> +{ + typedef typename associated_executor<ReadHandler, Executor>::type type; + + static type get( + const detail::read_at_op<AsyncRandomAccessReadDevice, + MutableBufferSequence, MutableBufferIterator, + CompletionCondition, ReadHandler>& h, + const Executor& ex = Executor()) BOOST_ASIO_NOEXCEPT + { + return associated_executor<ReadHandler, Executor>::get(h.handler_, ex); + } +}; + +#endif // !defined(GENERATING_DOCUMENTATION) + template <typename AsyncRandomAccessReadDevice, typename MutableBufferSequence, typename CompletionCondition, typename ReadHandler> inline BOOST_ASIO_INITFN_RESULT_TYPE(ReadHandler, @@ -577,15 +373,12 @@ async_read_at(AsyncRandomAccessReadDevice& d, // not meet the documented type requirements for a ReadHandler. BOOST_ASIO_READ_HANDLER_CHECK(ReadHandler, handler) type_check; - detail::async_result_init< - ReadHandler, void (boost::system::error_code, std::size_t)> init( - BOOST_ASIO_MOVE_CAST(ReadHandler)(handler)); + async_completion<ReadHandler, + void (boost::system::error_code, std::size_t)> init(handler); - detail::read_at_op<AsyncRandomAccessReadDevice, MutableBufferSequence, - CompletionCondition, BOOST_ASIO_HANDLER_TYPE(ReadHandler, - void (boost::system::error_code, std::size_t))>( - d, offset, buffers, completion_condition, init.handler)( - boost::system::error_code(), 0, 1); + detail::start_read_at_buffer_sequence_op(d, offset, buffers, + boost::asio::buffer_sequence_begin(buffers), completion_condition, + init.completion_handler); return init.result.get(); } @@ -602,19 +395,17 @@ async_read_at(AsyncRandomAccessReadDevice& d, // not meet the documented type requirements for a ReadHandler. BOOST_ASIO_READ_HANDLER_CHECK(ReadHandler, handler) type_check; - detail::async_result_init< - ReadHandler, void (boost::system::error_code, std::size_t)> init( - BOOST_ASIO_MOVE_CAST(ReadHandler)(handler)); + async_completion<ReadHandler, + void (boost::system::error_code, std::size_t)> init(handler); - detail::read_at_op<AsyncRandomAccessReadDevice, MutableBufferSequence, - detail::transfer_all_t, BOOST_ASIO_HANDLER_TYPE(ReadHandler, - void (boost::system::error_code, std::size_t))>( - d, offset, buffers, transfer_all(), init.handler)( - boost::system::error_code(), 0, 1); + detail::start_read_at_buffer_sequence_op(d, offset, buffers, + boost::asio::buffer_sequence_begin(buffers), transfer_all(), + init.completion_handler); return init.result.get(); } +#if !defined(BOOST_ASIO_NO_EXTENSIONS) #if !defined(BOOST_ASIO_NO_IOSTREAM) namespace detail @@ -751,6 +542,46 @@ namespace detail } } // namespace detail +#if !defined(GENERATING_DOCUMENTATION) + +template <typename AsyncRandomAccessReadDevice, typename Allocator, + typename CompletionCondition, typename ReadHandler, typename Allocator1> +struct associated_allocator< + detail::read_at_streambuf_op<AsyncRandomAccessReadDevice, + Allocator, CompletionCondition, ReadHandler>, + Allocator1> +{ + typedef typename associated_allocator<ReadHandler, Allocator1>::type type; + + static type get( + const detail::read_at_streambuf_op<AsyncRandomAccessReadDevice, + Allocator, CompletionCondition, ReadHandler>& h, + const Allocator1& a = Allocator1()) BOOST_ASIO_NOEXCEPT + { + return associated_allocator<ReadHandler, Allocator1>::get(h.handler_, a); + } +}; + +template <typename AsyncRandomAccessReadDevice, typename Executor, + typename CompletionCondition, typename ReadHandler, typename Executor1> +struct associated_executor< + detail::read_at_streambuf_op<AsyncRandomAccessReadDevice, + Executor, CompletionCondition, ReadHandler>, + Executor1> +{ + typedef typename associated_executor<ReadHandler, Executor1>::type type; + + static type get( + const detail::read_at_streambuf_op<AsyncRandomAccessReadDevice, + Executor, CompletionCondition, ReadHandler>& h, + const Executor1& ex = Executor1()) BOOST_ASIO_NOEXCEPT + { + return associated_executor<ReadHandler, Executor1>::get(h.handler_, ex); + } +}; + +#endif // !defined(GENERATING_DOCUMENTATION) + template <typename AsyncRandomAccessReadDevice, typename Allocator, typename CompletionCondition, typename ReadHandler> inline BOOST_ASIO_INITFN_RESULT_TYPE(ReadHandler, @@ -764,14 +595,13 @@ async_read_at(AsyncRandomAccessReadDevice& d, // not meet the documented type requirements for a ReadHandler. BOOST_ASIO_READ_HANDLER_CHECK(ReadHandler, handler) type_check; - detail::async_result_init< - ReadHandler, void (boost::system::error_code, std::size_t)> init( - BOOST_ASIO_MOVE_CAST(ReadHandler)(handler)); + async_completion<ReadHandler, + void (boost::system::error_code, std::size_t)> init(handler); detail::read_at_streambuf_op<AsyncRandomAccessReadDevice, Allocator, CompletionCondition, BOOST_ASIO_HANDLER_TYPE(ReadHandler, void (boost::system::error_code, std::size_t))>( - d, offset, b, completion_condition, init.handler)( + d, offset, b, completion_condition, init.completion_handler)( boost::system::error_code(), 0, 1); return init.result.get(); @@ -789,20 +619,20 @@ async_read_at(AsyncRandomAccessReadDevice& d, // not meet the documented type requirements for a ReadHandler. BOOST_ASIO_READ_HANDLER_CHECK(ReadHandler, handler) type_check; - detail::async_result_init< - ReadHandler, void (boost::system::error_code, std::size_t)> init( - BOOST_ASIO_MOVE_CAST(ReadHandler)(handler)); + async_completion<ReadHandler, + void (boost::system::error_code, std::size_t)> init(handler); detail::read_at_streambuf_op<AsyncRandomAccessReadDevice, Allocator, detail::transfer_all_t, BOOST_ASIO_HANDLER_TYPE(ReadHandler, void (boost::system::error_code, std::size_t))>( - d, offset, b, transfer_all(), init.handler)( + d, offset, b, transfer_all(), init.completion_handler)( boost::system::error_code(), 0, 1); return init.result.get(); } #endif // !defined(BOOST_ASIO_NO_IOSTREAM) +#endif // !defined(BOOST_ASIO_NO_EXTENSIONS) } // namespace asio } // namespace boost |