diff options
Diffstat (limited to '3rdparty/asio/src/tests/unit/read_at.cpp')
-rw-r--r-- | 3rdparty/asio/src/tests/unit/read_at.cpp | 259 |
1 files changed, 106 insertions, 153 deletions
diff --git a/3rdparty/asio/src/tests/unit/read_at.cpp b/3rdparty/asio/src/tests/unit/read_at.cpp index 5b2f5ebace3..72d21bc3236 100644 --- a/3rdparty/asio/src/tests/unit/read_at.cpp +++ b/3rdparty/asio/src/tests/unit/read_at.cpp @@ -2,7 +2,7 @@ // read_at.cpp // ~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2024 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,27 +16,19 @@ // Test that header file is self-contained. #include "asio/read_at.hpp" +#include <array> #include <cstring> +#include <functional> #include "archetypes/async_result.hpp" #include "asio/io_context.hpp" #include "asio/post.hpp" #include "asio/streambuf.hpp" #include "unit_test.hpp" -#if defined(ASIO_HAS_BOOST_BIND) -# include <boost/bind.hpp> -#else // defined(ASIO_HAS_BOOST_BIND) -# include <functional> -#endif // defined(ASIO_HAS_BOOST_BIND) - #if defined(ASIO_HAS_BOOST_ARRAY) #include <boost/array.hpp> #endif // defined(ASIO_HAS_BOOST_ARRAY) -#if defined(ASIO_HAS_STD_ARRAY) -# include <array> -#endif // defined(ASIO_HAS_STD_ARRAY) - using namespace std; // For memcmp, memcpy and memset. class test_random_access_device @@ -51,7 +43,7 @@ public: { } - executor_type get_executor() ASIO_NOEXCEPT + executor_type get_executor() noexcept { return io_context_.get_executor(); } @@ -125,12 +117,12 @@ public: template <typename Mutable_Buffers, typename Handler> void async_read_some_at(asio::uint64_t offset, - const Mutable_Buffers& buffers, Handler handler) + const Mutable_Buffers& buffers, Handler&& handler) { size_t bytes_transferred = read_some_at(offset, buffers); asio::post(get_executor(), asio::detail::bind_handler( - ASIO_MOVE_CAST(Handler)(handler), + static_cast<Handler&&>(handler), asio::error_code(), bytes_transferred)); } @@ -476,11 +468,16 @@ bool old_style_transfer_all(const asio::error_code& ec, return !!ec; } -size_t short_transfer(const asio::error_code& ec, - size_t /*bytes_transferred*/) +struct short_transfer { - return !!ec ? 0 : 3; -} + short_transfer() {} + short_transfer(short_transfer&&) {} + size_t operator()(const asio::error_code& ec, + size_t /*bytes_transferred*/) + { + return !!ec ? 0 : 3; + } +}; void test_4_arg_mutable_buffer_read_at() { @@ -860,41 +857,41 @@ void test_4_arg_mutable_buffer_read_at() s.reset(read_data, sizeof(read_data)); memset(read_buf, 0, sizeof(read_buf)); - bytes_transferred = asio::read_at(s, 0, buffers, short_transfer); + bytes_transferred = asio::read_at(s, 0, buffers, short_transfer()); ASIO_CHECK(bytes_transferred == sizeof(read_data)); ASIO_CHECK(s.check_buffers(0, buffers, sizeof(read_data))); s.reset(read_data, sizeof(read_data)); memset(read_buf, 0, sizeof(read_buf)); - bytes_transferred = asio::read_at(s, 1234, buffers, short_transfer); + bytes_transferred = asio::read_at(s, 1234, buffers, short_transfer()); ASIO_CHECK(bytes_transferred == sizeof(read_data)); ASIO_CHECK(s.check_buffers(1234, buffers, sizeof(read_data))); s.reset(read_data, sizeof(read_data)); s.next_read_length(1); memset(read_buf, 0, sizeof(read_buf)); - bytes_transferred = asio::read_at(s, 0, buffers, short_transfer); + bytes_transferred = asio::read_at(s, 0, buffers, short_transfer()); ASIO_CHECK(bytes_transferred == sizeof(read_data)); ASIO_CHECK(s.check_buffers(0, buffers, sizeof(read_data))); s.reset(read_data, sizeof(read_data)); s.next_read_length(1); memset(read_buf, 0, sizeof(read_buf)); - bytes_transferred = asio::read_at(s, 1234, buffers, short_transfer); + bytes_transferred = asio::read_at(s, 1234, buffers, short_transfer()); ASIO_CHECK(bytes_transferred == sizeof(read_data)); ASIO_CHECK(s.check_buffers(1234, buffers, sizeof(read_data))); s.reset(read_data, sizeof(read_data)); s.next_read_length(10); memset(read_buf, 0, sizeof(read_buf)); - bytes_transferred = asio::read_at(s, 0, buffers, short_transfer); + bytes_transferred = asio::read_at(s, 0, buffers, short_transfer()); ASIO_CHECK(bytes_transferred == sizeof(read_data)); ASIO_CHECK(s.check_buffers(0, buffers, sizeof(read_data))); s.reset(read_data, sizeof(read_data)); s.next_read_length(10); memset(read_buf, 0, sizeof(read_buf)); - bytes_transferred = asio::read_at(s, 1234, buffers, short_transfer); + bytes_transferred = asio::read_at(s, 1234, buffers, short_transfer()); ASIO_CHECK(bytes_transferred == sizeof(read_data)); ASIO_CHECK(s.check_buffers(1234, buffers, sizeof(read_data))); } @@ -1278,41 +1275,41 @@ void test_4_arg_vector_buffers_read_at() s.reset(read_data, sizeof(read_data)); memset(read_buf, 0, sizeof(read_buf)); - bytes_transferred = asio::read_at(s, 0, buffers, short_transfer); + bytes_transferred = asio::read_at(s, 0, buffers, short_transfer()); ASIO_CHECK(bytes_transferred == sizeof(read_data)); ASIO_CHECK(s.check_buffers(0, buffers, sizeof(read_data))); s.reset(read_data, sizeof(read_data)); memset(read_buf, 0, sizeof(read_buf)); - bytes_transferred = asio::read_at(s, 1234, buffers, short_transfer); + bytes_transferred = asio::read_at(s, 1234, buffers, short_transfer()); ASIO_CHECK(bytes_transferred == sizeof(read_data)); ASIO_CHECK(s.check_buffers(1234, buffers, sizeof(read_data))); s.reset(read_data, sizeof(read_data)); s.next_read_length(1); memset(read_buf, 0, sizeof(read_buf)); - bytes_transferred = asio::read_at(s, 0, buffers, short_transfer); + bytes_transferred = asio::read_at(s, 0, buffers, short_transfer()); ASIO_CHECK(bytes_transferred == sizeof(read_data)); ASIO_CHECK(s.check_buffers(0, buffers, sizeof(read_data))); s.reset(read_data, sizeof(read_data)); s.next_read_length(1); memset(read_buf, 0, sizeof(read_buf)); - bytes_transferred = asio::read_at(s, 1234, buffers, short_transfer); + bytes_transferred = asio::read_at(s, 1234, buffers, short_transfer()); ASIO_CHECK(bytes_transferred == sizeof(read_data)); ASIO_CHECK(s.check_buffers(1234, buffers, sizeof(read_data))); s.reset(read_data, sizeof(read_data)); s.next_read_length(10); memset(read_buf, 0, sizeof(read_buf)); - bytes_transferred = asio::read_at(s, 0, buffers, short_transfer); + bytes_transferred = asio::read_at(s, 0, buffers, short_transfer()); ASIO_CHECK(bytes_transferred == sizeof(read_data)); ASIO_CHECK(s.check_buffers(0, buffers, sizeof(read_data))); s.reset(read_data, sizeof(read_data)); s.next_read_length(10); memset(read_buf, 0, sizeof(read_buf)); - bytes_transferred = asio::read_at(s, 1234, buffers, short_transfer); + bytes_transferred = asio::read_at(s, 1234, buffers, short_transfer()); ASIO_CHECK(bytes_transferred == sizeof(read_data)); ASIO_CHECK(s.check_buffers(1234, buffers, sizeof(read_data))); } @@ -1741,14 +1738,14 @@ void test_4_arg_streambuf_read_at() s.reset(read_data, sizeof(read_data)); sb.consume(sb.size()); - bytes_transferred = asio::read_at(s, 0, sb, short_transfer); + bytes_transferred = asio::read_at(s, 0, sb, short_transfer()); ASIO_CHECK(bytes_transferred == sizeof(read_data)); ASIO_CHECK(sb.size() == sizeof(read_data)); ASIO_CHECK(s.check_buffers(0, sb.data(), sizeof(read_data))); s.reset(read_data, sizeof(read_data)); sb.consume(sb.size()); - bytes_transferred = asio::read_at(s, 1234, sb, short_transfer); + bytes_transferred = asio::read_at(s, 1234, sb, short_transfer()); ASIO_CHECK(bytes_transferred == sizeof(read_data)); ASIO_CHECK(sb.size() == sizeof(read_data)); ASIO_CHECK(s.check_buffers(1234, sb.data(), sizeof(read_data))); @@ -1756,7 +1753,7 @@ void test_4_arg_streambuf_read_at() s.reset(read_data, sizeof(read_data)); s.next_read_length(1); sb.consume(sb.size()); - bytes_transferred = asio::read_at(s, 0, sb, short_transfer); + bytes_transferred = asio::read_at(s, 0, sb, short_transfer()); ASIO_CHECK(bytes_transferred == sizeof(read_data)); ASIO_CHECK(sb.size() == sizeof(read_data)); ASIO_CHECK(s.check_buffers(0, sb.data(), sizeof(read_data))); @@ -1764,7 +1761,7 @@ void test_4_arg_streambuf_read_at() s.reset(read_data, sizeof(read_data)); s.next_read_length(1); sb.consume(sb.size()); - bytes_transferred = asio::read_at(s, 1234, sb, short_transfer); + bytes_transferred = asio::read_at(s, 1234, sb, short_transfer()); ASIO_CHECK(bytes_transferred == sizeof(read_data)); ASIO_CHECK(sb.size() == sizeof(read_data)); ASIO_CHECK(s.check_buffers(1234, sb.data(), sizeof(read_data))); @@ -1772,7 +1769,7 @@ void test_4_arg_streambuf_read_at() s.reset(read_data, sizeof(read_data)); s.next_read_length(10); sb.consume(sb.size()); - bytes_transferred = asio::read_at(s, 0, sb, short_transfer); + bytes_transferred = asio::read_at(s, 0, sb, short_transfer()); ASIO_CHECK(bytes_transferred == sizeof(read_data)); ASIO_CHECK(sb.size() == sizeof(read_data)); ASIO_CHECK(s.check_buffers(0, sb.data(), sizeof(read_data))); @@ -1780,7 +1777,7 @@ void test_4_arg_streambuf_read_at() s.reset(read_data, sizeof(read_data)); s.next_read_length(10); sb.consume(sb.size()); - bytes_transferred = asio::read_at(s, 1234, sb, short_transfer); + bytes_transferred = asio::read_at(s, 1234, sb, short_transfer()); ASIO_CHECK(bytes_transferred == sizeof(read_data)); ASIO_CHECK(sb.size() == sizeof(read_data)); ASIO_CHECK(s.check_buffers(1234, sb.data(), sizeof(read_data))); @@ -2258,7 +2255,7 @@ void test_5_arg_mutable_buffer_read_at() s.reset(read_data, sizeof(read_data)); memset(read_buf, 0, sizeof(read_buf)); bytes_transferred = asio::read_at(s, 0, buffers, - short_transfer, error); + short_transfer(), error); ASIO_CHECK(bytes_transferred == sizeof(read_data)); ASIO_CHECK(s.check_buffers(0, buffers, sizeof(read_data))); ASIO_CHECK(!error); @@ -2266,7 +2263,7 @@ void test_5_arg_mutable_buffer_read_at() s.reset(read_data, sizeof(read_data)); memset(read_buf, 0, sizeof(read_buf)); bytes_transferred = asio::read_at(s, 1234, buffers, - short_transfer, error); + short_transfer(), error); ASIO_CHECK(bytes_transferred == sizeof(read_data)); ASIO_CHECK(s.check_buffers(1234, buffers, sizeof(read_data))); ASIO_CHECK(!error); @@ -2276,7 +2273,7 @@ void test_5_arg_mutable_buffer_read_at() memset(read_buf, 0, sizeof(read_buf)); error = asio::error_code(); bytes_transferred = asio::read_at(s, 0, buffers, - short_transfer, error); + short_transfer(), error); ASIO_CHECK(bytes_transferred == sizeof(read_data)); ASIO_CHECK(s.check_buffers(0, buffers, sizeof(read_data))); ASIO_CHECK(!error); @@ -2286,7 +2283,7 @@ void test_5_arg_mutable_buffer_read_at() memset(read_buf, 0, sizeof(read_buf)); error = asio::error_code(); bytes_transferred = asio::read_at(s, 1234, buffers, - short_transfer, error); + short_transfer(), error); ASIO_CHECK(bytes_transferred == sizeof(read_data)); ASIO_CHECK(s.check_buffers(1234, buffers, sizeof(read_data))); ASIO_CHECK(!error); @@ -2296,7 +2293,7 @@ void test_5_arg_mutable_buffer_read_at() memset(read_buf, 0, sizeof(read_buf)); error = asio::error_code(); bytes_transferred = asio::read_at(s, 0, buffers, - short_transfer, error); + short_transfer(), error); ASIO_CHECK(bytes_transferred == sizeof(read_data)); ASIO_CHECK(s.check_buffers(0, buffers, sizeof(read_data))); ASIO_CHECK(!error); @@ -2306,7 +2303,7 @@ void test_5_arg_mutable_buffer_read_at() memset(read_buf, 0, sizeof(read_buf)); error = asio::error_code(); bytes_transferred = asio::read_at(s, 1234, buffers, - short_transfer, error); + short_transfer(), error); ASIO_CHECK(bytes_transferred == sizeof(read_data)); ASIO_CHECK(s.check_buffers(1234, buffers, sizeof(read_data))); ASIO_CHECK(!error); @@ -2785,7 +2782,7 @@ void test_5_arg_vector_buffers_read_at() s.reset(read_data, sizeof(read_data)); memset(read_buf, 0, sizeof(read_buf)); bytes_transferred = asio::read_at(s, 0, buffers, - short_transfer, error); + short_transfer(), error); ASIO_CHECK(bytes_transferred == sizeof(read_data)); ASIO_CHECK(s.check_buffers(0, buffers, sizeof(read_data))); ASIO_CHECK(!error); @@ -2793,7 +2790,7 @@ void test_5_arg_vector_buffers_read_at() s.reset(read_data, sizeof(read_data)); memset(read_buf, 0, sizeof(read_buf)); bytes_transferred = asio::read_at(s, 1234, buffers, - short_transfer, error); + short_transfer(), error); ASIO_CHECK(bytes_transferred == sizeof(read_data)); ASIO_CHECK(s.check_buffers(1234, buffers, sizeof(read_data))); ASIO_CHECK(!error); @@ -2803,7 +2800,7 @@ void test_5_arg_vector_buffers_read_at() memset(read_buf, 0, sizeof(read_buf)); error = asio::error_code(); bytes_transferred = asio::read_at(s, 0, buffers, - short_transfer, error); + short_transfer(), error); ASIO_CHECK(bytes_transferred == sizeof(read_data)); ASIO_CHECK(s.check_buffers(0, buffers, sizeof(read_data))); ASIO_CHECK(!error); @@ -2813,7 +2810,7 @@ void test_5_arg_vector_buffers_read_at() memset(read_buf, 0, sizeof(read_buf)); error = asio::error_code(); bytes_transferred = asio::read_at(s, 1234, buffers, - short_transfer, error); + short_transfer(), error); ASIO_CHECK(bytes_transferred == sizeof(read_data)); ASIO_CHECK(s.check_buffers(1234, buffers, sizeof(read_data))); ASIO_CHECK(!error); @@ -2823,7 +2820,7 @@ void test_5_arg_vector_buffers_read_at() memset(read_buf, 0, sizeof(read_buf)); error = asio::error_code(); bytes_transferred = asio::read_at(s, 0, buffers, - short_transfer, error); + short_transfer(), error); ASIO_CHECK(bytes_transferred == sizeof(read_data)); ASIO_CHECK(s.check_buffers(0, buffers, sizeof(read_data))); ASIO_CHECK(!error); @@ -2833,7 +2830,7 @@ void test_5_arg_vector_buffers_read_at() memset(read_buf, 0, sizeof(read_buf)); error = asio::error_code(); bytes_transferred = asio::read_at(s, 1234, buffers, - short_transfer, error); + short_transfer(), error); ASIO_CHECK(bytes_transferred == sizeof(read_data)); ASIO_CHECK(s.check_buffers(1234, buffers, sizeof(read_data))); ASIO_CHECK(!error); @@ -3357,7 +3354,7 @@ void test_5_arg_streambuf_read_at() s.reset(read_data, sizeof(read_data)); sb.consume(sb.size()); bytes_transferred = asio::read_at(s, 0, sb, - short_transfer, error); + short_transfer(), error); ASIO_CHECK(bytes_transferred == sizeof(read_data)); ASIO_CHECK(sb.size() == sizeof(read_data)); ASIO_CHECK(s.check_buffers(0, sb.data(), sizeof(read_data))); @@ -3366,7 +3363,7 @@ void test_5_arg_streambuf_read_at() s.reset(read_data, sizeof(read_data)); sb.consume(sb.size()); bytes_transferred = asio::read_at(s, 1234, sb, - short_transfer, error); + short_transfer(), error); ASIO_CHECK(bytes_transferred == sizeof(read_data)); ASIO_CHECK(sb.size() == sizeof(read_data)); ASIO_CHECK(s.check_buffers(1234, sb.data(), sizeof(read_data))); @@ -3377,7 +3374,7 @@ void test_5_arg_streambuf_read_at() sb.consume(sb.size()); error = asio::error_code(); bytes_transferred = asio::read_at(s, 0, sb, - short_transfer, error); + short_transfer(), error); ASIO_CHECK(bytes_transferred == sizeof(read_data)); ASIO_CHECK(sb.size() == sizeof(read_data)); ASIO_CHECK(s.check_buffers(0, sb.data(), sizeof(read_data))); @@ -3388,7 +3385,7 @@ void test_5_arg_streambuf_read_at() sb.consume(sb.size()); error = asio::error_code(); bytes_transferred = asio::read_at(s, 1234, sb, - short_transfer, error); + short_transfer(), error); ASIO_CHECK(bytes_transferred == sizeof(read_data)); ASIO_CHECK(sb.size() == sizeof(read_data)); ASIO_CHECK(s.check_buffers(1234, sb.data(), sizeof(read_data))); @@ -3399,7 +3396,7 @@ void test_5_arg_streambuf_read_at() sb.consume(sb.size()); error = asio::error_code(); bytes_transferred = asio::read_at(s, 0, sb, - short_transfer, error); + short_transfer(), error); ASIO_CHECK(bytes_transferred == sizeof(read_data)); ASIO_CHECK(sb.size() == sizeof(read_data)); ASIO_CHECK(s.check_buffers(0, sb.data(), sizeof(read_data))); @@ -3410,7 +3407,7 @@ void test_5_arg_streambuf_read_at() sb.consume(sb.size()); error = asio::error_code(); bytes_transferred = asio::read_at(s, 1234, sb, - short_transfer, error); + short_transfer(), error); ASIO_CHECK(bytes_transferred == sizeof(read_data)); ASIO_CHECK(sb.size() == sizeof(read_data)); ASIO_CHECK(s.check_buffers(1234, sb.data(), sizeof(read_data))); @@ -3427,13 +3424,9 @@ void async_read_handler(const asio::error_code& e, void test_4_arg_mutable_buffer_async_read_at() { -#if defined(ASIO_HAS_BOOST_BIND) - namespace bindns = boost; -#else // defined(ASIO_HAS_BOOST_BIND) namespace bindns = std; - using std::placeholders::_1; - using std::placeholders::_2; -#endif // defined(ASIO_HAS_BOOST_BIND) + using bindns::placeholders::_1; + using bindns::placeholders::_2; asio::io_context ioc; test_random_access_device s(ioc); @@ -3523,13 +3516,9 @@ void test_4_arg_mutable_buffer_async_read_at() void test_4_arg_boost_array_buffers_async_read_at() { -#if defined(ASIO_HAS_BOOST_BIND) - namespace bindns = boost; -#else // defined(ASIO_HAS_BOOST_BIND) namespace bindns = std; - using std::placeholders::_1; - using std::placeholders::_2; -#endif // defined(ASIO_HAS_BOOST_BIND) + using bindns::placeholders::_1; + using bindns::placeholders::_2; #if defined(ASIO_HAS_BOOST_ARRAY) asio::io_context ioc; @@ -3622,15 +3611,10 @@ void test_4_arg_boost_array_buffers_async_read_at() void test_4_arg_std_array_buffers_async_read_at() { -#if defined(ASIO_HAS_BOOST_BIND) - namespace bindns = boost; -#else // defined(ASIO_HAS_BOOST_BIND) namespace bindns = std; - using std::placeholders::_1; - using std::placeholders::_2; -#endif // defined(ASIO_HAS_BOOST_BIND) + using bindns::placeholders::_1; + using bindns::placeholders::_2; -#if defined(ASIO_HAS_STD_ARRAY) asio::io_context ioc; test_random_access_device s(ioc); char read_buf[sizeof(read_data)]; @@ -3716,18 +3700,13 @@ void test_4_arg_std_array_buffers_async_read_at() ioc.restart(); ioc.run(); ASIO_CHECK(s.check_buffers(1234, buffers, sizeof(read_data))); -#endif // defined(ASIO_HAS_STD_ARRAY) } void test_4_arg_vector_buffers_async_read_at() { -#if defined(ASIO_HAS_BOOST_BIND) - namespace bindns = boost; -#else // defined(ASIO_HAS_BOOST_BIND) namespace bindns = std; - using std::placeholders::_1; - using std::placeholders::_2; -#endif // defined(ASIO_HAS_BOOST_BIND) + using bindns::placeholders::_1; + using bindns::placeholders::_2; asio::io_context ioc; test_random_access_device s(ioc); @@ -3818,13 +3797,9 @@ void test_4_arg_vector_buffers_async_read_at() void test_4_arg_streambuf_async_read_at() { -#if defined(ASIO_HAS_BOOST_BIND) - namespace bindns = boost; -#else // defined(ASIO_HAS_BOOST_BIND) namespace bindns = std; - using std::placeholders::_1; - using std::placeholders::_2; -#endif // defined(ASIO_HAS_BOOST_BIND) + using bindns::placeholders::_1; + using bindns::placeholders::_2; asio::io_context ioc; test_random_access_device s(ioc); @@ -3918,13 +3893,9 @@ void test_4_arg_streambuf_async_read_at() void test_5_arg_mutable_buffer_async_read_at() { -#if defined(ASIO_HAS_BOOST_BIND) - namespace bindns = boost; -#else // defined(ASIO_HAS_BOOST_BIND) namespace bindns = std; - using std::placeholders::_1; - using std::placeholders::_2; -#endif // defined(ASIO_HAS_BOOST_BIND) + using bindns::placeholders::_1; + using bindns::placeholders::_2; asio::io_context ioc; test_random_access_device s(ioc); @@ -4537,7 +4508,7 @@ void test_5_arg_mutable_buffer_async_read_at() s.reset(read_data, sizeof(read_data)); memset(read_buf, 0, sizeof(read_buf)); called = false; - asio::async_read_at(s, 0, buffers, short_transfer, + asio::async_read_at(s, 0, buffers, short_transfer(), bindns::bind(async_read_handler, _1, _2, sizeof(read_data), &called)); ioc.restart(); @@ -4548,7 +4519,7 @@ void test_5_arg_mutable_buffer_async_read_at() s.reset(read_data, sizeof(read_data)); memset(read_buf, 0, sizeof(read_buf)); called = false; - asio::async_read_at(s, 1234, buffers, short_transfer, + asio::async_read_at(s, 1234, buffers, short_transfer(), bindns::bind(async_read_handler, _1, _2, sizeof(read_data), &called)); ioc.restart(); @@ -4560,7 +4531,7 @@ void test_5_arg_mutable_buffer_async_read_at() s.next_read_length(1); memset(read_buf, 0, sizeof(read_buf)); called = false; - asio::async_read_at(s, 0, buffers, short_transfer, + asio::async_read_at(s, 0, buffers, short_transfer(), bindns::bind(async_read_handler, _1, _2, sizeof(read_data), &called)); ioc.restart(); @@ -4572,7 +4543,7 @@ void test_5_arg_mutable_buffer_async_read_at() s.next_read_length(1); memset(read_buf, 0, sizeof(read_buf)); called = false; - asio::async_read_at(s, 1234, buffers, short_transfer, + asio::async_read_at(s, 1234, buffers, short_transfer(), bindns::bind(async_read_handler, _1, _2, sizeof(read_data), &called)); ioc.restart(); @@ -4584,7 +4555,7 @@ void test_5_arg_mutable_buffer_async_read_at() s.next_read_length(10); memset(read_buf, 0, sizeof(read_buf)); called = false; - asio::async_read_at(s, 0, buffers, short_transfer, + asio::async_read_at(s, 0, buffers, short_transfer(), bindns::bind(async_read_handler, _1, _2, sizeof(read_data), &called)); ioc.restart(); @@ -4596,7 +4567,7 @@ void test_5_arg_mutable_buffer_async_read_at() s.next_read_length(10); memset(read_buf, 0, sizeof(read_buf)); called = false; - asio::async_read_at(s, 1234, buffers, short_transfer, + asio::async_read_at(s, 1234, buffers, short_transfer(), bindns::bind(async_read_handler, _1, _2, sizeof(read_data), &called)); ioc.restart(); @@ -4607,7 +4578,7 @@ void test_5_arg_mutable_buffer_async_read_at() s.reset(read_data, sizeof(read_data)); memset(read_buf, 0, sizeof(read_buf)); int i = asio::async_read_at(s, 1234, buffers, - short_transfer, archetypes::lazy_handler()); + short_transfer(), archetypes::lazy_handler()); ASIO_CHECK(i == 42); ioc.restart(); ioc.run(); @@ -4616,13 +4587,9 @@ void test_5_arg_mutable_buffer_async_read_at() void test_5_arg_boost_array_buffers_async_read_at() { -#if defined(ASIO_HAS_BOOST_BIND) - namespace bindns = boost; -#else // defined(ASIO_HAS_BOOST_BIND) namespace bindns = std; - using std::placeholders::_1; - using std::placeholders::_2; -#endif // defined(ASIO_HAS_BOOST_BIND) + using bindns::placeholders::_1; + using bindns::placeholders::_2; #if defined(ASIO_HAS_BOOST_ARRAY) asio::io_context ioc; @@ -5237,7 +5204,7 @@ void test_5_arg_boost_array_buffers_async_read_at() s.reset(read_data, sizeof(read_data)); memset(read_buf, 0, sizeof(read_buf)); called = false; - asio::async_read_at(s, 0, buffers, short_transfer, + asio::async_read_at(s, 0, buffers, short_transfer(), bindns::bind(async_read_handler, _1, _2, sizeof(read_data), &called)); ioc.restart(); @@ -5248,7 +5215,7 @@ void test_5_arg_boost_array_buffers_async_read_at() s.reset(read_data, sizeof(read_data)); memset(read_buf, 0, sizeof(read_buf)); called = false; - asio::async_read_at(s, 1234, buffers, short_transfer, + asio::async_read_at(s, 1234, buffers, short_transfer(), bindns::bind(async_read_handler, _1, _2, sizeof(read_data), &called)); ioc.restart(); @@ -5260,7 +5227,7 @@ void test_5_arg_boost_array_buffers_async_read_at() s.next_read_length(1); memset(read_buf, 0, sizeof(read_buf)); called = false; - asio::async_read_at(s, 0, buffers, short_transfer, + asio::async_read_at(s, 0, buffers, short_transfer(), bindns::bind(async_read_handler, _1, _2, sizeof(read_data), &called)); ioc.restart(); @@ -5272,7 +5239,7 @@ void test_5_arg_boost_array_buffers_async_read_at() s.next_read_length(1); memset(read_buf, 0, sizeof(read_buf)); called = false; - asio::async_read_at(s, 1234, buffers, short_transfer, + asio::async_read_at(s, 1234, buffers, short_transfer(), bindns::bind(async_read_handler, _1, _2, sizeof(read_data), &called)); ioc.restart(); @@ -5284,7 +5251,7 @@ void test_5_arg_boost_array_buffers_async_read_at() s.next_read_length(10); memset(read_buf, 0, sizeof(read_buf)); called = false; - asio::async_read_at(s, 0, buffers, short_transfer, + asio::async_read_at(s, 0, buffers, short_transfer(), bindns::bind(async_read_handler, _1, _2, sizeof(read_data), &called)); ioc.restart(); @@ -5296,7 +5263,7 @@ void test_5_arg_boost_array_buffers_async_read_at() s.next_read_length(10); memset(read_buf, 0, sizeof(read_buf)); called = false; - asio::async_read_at(s, 1234, buffers, short_transfer, + asio::async_read_at(s, 1234, buffers, short_transfer(), bindns::bind(async_read_handler, _1, _2, sizeof(read_data), &called)); ioc.restart(); @@ -5307,7 +5274,7 @@ void test_5_arg_boost_array_buffers_async_read_at() s.reset(read_data, sizeof(read_data)); memset(read_buf, 0, sizeof(read_buf)); int i = asio::async_read_at(s, 1234, buffers, - short_transfer, archetypes::lazy_handler()); + short_transfer(), archetypes::lazy_handler()); ASIO_CHECK(i == 42); ioc.restart(); ioc.run(); @@ -5317,15 +5284,10 @@ void test_5_arg_boost_array_buffers_async_read_at() void test_5_arg_std_array_buffers_async_read_at() { -#if defined(ASIO_HAS_BOOST_BIND) - namespace bindns = boost; -#else // defined(ASIO_HAS_BOOST_BIND) namespace bindns = std; - using std::placeholders::_1; - using std::placeholders::_2; -#endif // defined(ASIO_HAS_BOOST_BIND) + using bindns::placeholders::_1; + using bindns::placeholders::_2; -#if defined(ASIO_HAS_STD_ARRAY) asio::io_context ioc; test_random_access_device s(ioc); char read_buf[sizeof(read_data)]; @@ -5938,7 +5900,7 @@ void test_5_arg_std_array_buffers_async_read_at() s.reset(read_data, sizeof(read_data)); memset(read_buf, 0, sizeof(read_buf)); called = false; - asio::async_read_at(s, 0, buffers, short_transfer, + asio::async_read_at(s, 0, buffers, short_transfer(), bindns::bind(async_read_handler, _1, _2, sizeof(read_data), &called)); ioc.restart(); @@ -5949,7 +5911,7 @@ void test_5_arg_std_array_buffers_async_read_at() s.reset(read_data, sizeof(read_data)); memset(read_buf, 0, sizeof(read_buf)); called = false; - asio::async_read_at(s, 1234, buffers, short_transfer, + asio::async_read_at(s, 1234, buffers, short_transfer(), bindns::bind(async_read_handler, _1, _2, sizeof(read_data), &called)); ioc.restart(); @@ -5961,7 +5923,7 @@ void test_5_arg_std_array_buffers_async_read_at() s.next_read_length(1); memset(read_buf, 0, sizeof(read_buf)); called = false; - asio::async_read_at(s, 0, buffers, short_transfer, + asio::async_read_at(s, 0, buffers, short_transfer(), bindns::bind(async_read_handler, _1, _2, sizeof(read_data), &called)); ioc.restart(); @@ -5973,7 +5935,7 @@ void test_5_arg_std_array_buffers_async_read_at() s.next_read_length(1); memset(read_buf, 0, sizeof(read_buf)); called = false; - asio::async_read_at(s, 1234, buffers, short_transfer, + asio::async_read_at(s, 1234, buffers, short_transfer(), bindns::bind(async_read_handler, _1, _2, sizeof(read_data), &called)); ioc.restart(); @@ -5985,7 +5947,7 @@ void test_5_arg_std_array_buffers_async_read_at() s.next_read_length(10); memset(read_buf, 0, sizeof(read_buf)); called = false; - asio::async_read_at(s, 0, buffers, short_transfer, + asio::async_read_at(s, 0, buffers, short_transfer(), bindns::bind(async_read_handler, _1, _2, sizeof(read_data), &called)); ioc.restart(); @@ -5997,7 +5959,7 @@ void test_5_arg_std_array_buffers_async_read_at() s.next_read_length(10); memset(read_buf, 0, sizeof(read_buf)); called = false; - asio::async_read_at(s, 1234, buffers, short_transfer, + asio::async_read_at(s, 1234, buffers, short_transfer(), bindns::bind(async_read_handler, _1, _2, sizeof(read_data), &called)); ioc.restart(); @@ -6008,23 +5970,18 @@ void test_5_arg_std_array_buffers_async_read_at() s.reset(read_data, sizeof(read_data)); memset(read_buf, 0, sizeof(read_buf)); int i = asio::async_read_at(s, 1234, buffers, - short_transfer, archetypes::lazy_handler()); + short_transfer(), archetypes::lazy_handler()); ASIO_CHECK(i == 42); ioc.restart(); ioc.run(); ASIO_CHECK(s.check_buffers(1234, buffers, sizeof(read_data))); -#endif // defined(ASIO_HAS_STD_ARRAY) } void test_5_arg_vector_buffers_async_read_at() { -#if defined(ASIO_HAS_BOOST_BIND) - namespace bindns = boost; -#else // defined(ASIO_HAS_BOOST_BIND) namespace bindns = std; - using std::placeholders::_1; - using std::placeholders::_2; -#endif // defined(ASIO_HAS_BOOST_BIND) + using bindns::placeholders::_1; + using bindns::placeholders::_2; asio::io_context ioc; test_random_access_device s(ioc); @@ -6638,7 +6595,7 @@ void test_5_arg_vector_buffers_async_read_at() s.reset(read_data, sizeof(read_data)); memset(read_buf, 0, sizeof(read_buf)); called = false; - asio::async_read_at(s, 0, buffers, short_transfer, + asio::async_read_at(s, 0, buffers, short_transfer(), bindns::bind(async_read_handler, _1, _2, sizeof(read_data), &called)); ioc.restart(); @@ -6649,7 +6606,7 @@ void test_5_arg_vector_buffers_async_read_at() s.reset(read_data, sizeof(read_data)); memset(read_buf, 0, sizeof(read_buf)); called = false; - asio::async_read_at(s, 1234, buffers, short_transfer, + asio::async_read_at(s, 1234, buffers, short_transfer(), bindns::bind(async_read_handler, _1, _2, sizeof(read_data), &called)); ioc.restart(); @@ -6661,7 +6618,7 @@ void test_5_arg_vector_buffers_async_read_at() s.next_read_length(1); memset(read_buf, 0, sizeof(read_buf)); called = false; - asio::async_read_at(s, 0, buffers, short_transfer, + asio::async_read_at(s, 0, buffers, short_transfer(), bindns::bind(async_read_handler, _1, _2, sizeof(read_data), &called)); ioc.restart(); @@ -6673,7 +6630,7 @@ void test_5_arg_vector_buffers_async_read_at() s.next_read_length(1); memset(read_buf, 0, sizeof(read_buf)); called = false; - asio::async_read_at(s, 1234, buffers, short_transfer, + asio::async_read_at(s, 1234, buffers, short_transfer(), bindns::bind(async_read_handler, _1, _2, sizeof(read_data), &called)); ioc.restart(); @@ -6685,7 +6642,7 @@ void test_5_arg_vector_buffers_async_read_at() s.next_read_length(10); memset(read_buf, 0, sizeof(read_buf)); called = false; - asio::async_read_at(s, 0, buffers, short_transfer, + asio::async_read_at(s, 0, buffers, short_transfer(), bindns::bind(async_read_handler, _1, _2, sizeof(read_data), &called)); ioc.restart(); @@ -6697,7 +6654,7 @@ void test_5_arg_vector_buffers_async_read_at() s.next_read_length(10); memset(read_buf, 0, sizeof(read_buf)); called = false; - asio::async_read_at(s, 1234, buffers, short_transfer, + asio::async_read_at(s, 1234, buffers, short_transfer(), bindns::bind(async_read_handler, _1, _2, sizeof(read_data), &called)); ioc.restart(); @@ -6708,7 +6665,7 @@ void test_5_arg_vector_buffers_async_read_at() s.reset(read_data, sizeof(read_data)); memset(read_buf, 0, sizeof(read_buf)); int i = asio::async_read_at(s, 1234, buffers, - short_transfer, archetypes::lazy_handler()); + short_transfer(), archetypes::lazy_handler()); ASIO_CHECK(i == 42); ioc.restart(); ioc.run(); @@ -6717,13 +6674,9 @@ void test_5_arg_vector_buffers_async_read_at() void test_5_arg_streambuf_async_read_at() { -#if defined(ASIO_HAS_BOOST_BIND) - namespace bindns = boost; -#else // defined(ASIO_HAS_BOOST_BIND) namespace bindns = std; - using std::placeholders::_1; - using std::placeholders::_2; -#endif // defined(ASIO_HAS_BOOST_BIND) + using bindns::placeholders::_1; + using bindns::placeholders::_2; asio::io_context ioc; test_random_access_device s(ioc); @@ -7382,7 +7335,7 @@ void test_5_arg_streambuf_async_read_at() s.reset(read_data, sizeof(read_data)); sb.consume(sb.size()); called = false; - asio::async_read_at(s, 0, sb, short_transfer, + asio::async_read_at(s, 0, sb, short_transfer(), bindns::bind(async_read_handler, _1, _2, sizeof(read_data), &called)); ioc.restart(); @@ -7394,7 +7347,7 @@ void test_5_arg_streambuf_async_read_at() s.reset(read_data, sizeof(read_data)); sb.consume(sb.size()); called = false; - asio::async_read_at(s, 1234, sb, short_transfer, + asio::async_read_at(s, 1234, sb, short_transfer(), bindns::bind(async_read_handler, _1, _2, sizeof(read_data), &called)); ioc.restart(); @@ -7407,7 +7360,7 @@ void test_5_arg_streambuf_async_read_at() s.next_read_length(1); sb.consume(sb.size()); called = false; - asio::async_read_at(s, 0, sb, short_transfer, + asio::async_read_at(s, 0, sb, short_transfer(), bindns::bind(async_read_handler, _1, _2, sizeof(read_data), &called)); ioc.restart(); @@ -7420,7 +7373,7 @@ void test_5_arg_streambuf_async_read_at() s.next_read_length(1); sb.consume(sb.size()); called = false; - asio::async_read_at(s, 1234, sb, short_transfer, + asio::async_read_at(s, 1234, sb, short_transfer(), bindns::bind(async_read_handler, _1, _2, sizeof(read_data), &called)); ioc.restart(); @@ -7433,7 +7386,7 @@ void test_5_arg_streambuf_async_read_at() s.next_read_length(10); sb.consume(sb.size()); called = false; - asio::async_read_at(s, 0, sb, short_transfer, + asio::async_read_at(s, 0, sb, short_transfer(), bindns::bind(async_read_handler, _1, _2, sizeof(read_data), &called)); ioc.restart(); @@ -7446,7 +7399,7 @@ void test_5_arg_streambuf_async_read_at() s.next_read_length(10); sb.consume(sb.size()); called = false; - asio::async_read_at(s, 1234, sb, short_transfer, + asio::async_read_at(s, 1234, sb, short_transfer(), bindns::bind(async_read_handler, _1, _2, sizeof(read_data), &called)); ioc.restart(); @@ -7458,7 +7411,7 @@ void test_5_arg_streambuf_async_read_at() s.reset(read_data, sizeof(read_data)); sb.consume(sb.size()); int i = asio::async_read_at(s, 1234, sb, - short_transfer, archetypes::lazy_handler()); + short_transfer(), archetypes::lazy_handler()); ASIO_CHECK(i == 42); ioc.restart(); ioc.run(); |