diff options
Diffstat (limited to 'src/third_party/asio-master/asio/include/asio/impl/buffered_read_stream.hpp')
| -rw-r--r-- | src/third_party/asio-master/asio/include/asio/impl/buffered_read_stream.hpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/third_party/asio-master/asio/include/asio/impl/buffered_read_stream.hpp b/src/third_party/asio-master/asio/include/asio/impl/buffered_read_stream.hpp index c1a2e145490..00a11d8460b 100644 --- a/src/third_party/asio-master/asio/include/asio/impl/buffered_read_stream.hpp +++ b/src/third_party/asio-master/asio/include/asio/impl/buffered_read_stream.hpp @@ -2,7 +2,7 @@ // impl/buffered_read_stream.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 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) @@ -201,7 +201,8 @@ template <typename MutableBufferSequence> std::size_t buffered_read_stream<Stream>::read_some( const MutableBufferSequence& buffers) { - if (asio::buffer_size(buffers) == 0) + using asio::buffer_size; + if (buffer_size(buffers) == 0) return 0; if (storage_.empty()) @@ -217,7 +218,8 @@ std::size_t buffered_read_stream<Stream>::read_some( { ec = asio::error_code(); - if (asio::buffer_size(buffers) == 0) + using asio::buffer_size; + if (buffer_size(buffers) == 0) return 0; if (storage_.empty() && !this->fill(ec)) @@ -379,7 +381,8 @@ buffered_read_stream<Stream>::async_read_some( async_completion<ReadHandler, void (asio::error_code, std::size_t)> init(handler); - if (asio::buffer_size(buffers) == 0 || !storage_.empty()) + using asio::buffer_size; + if (buffer_size(buffers) == 0 || !storage_.empty()) { next_layer_.async_read_some(ASIO_MUTABLE_BUFFER(0, 0), detail::buffered_read_some_handler< |