diff options
Diffstat (limited to '3rdparty/asio/src/tests/unit/ip/icmp.cpp')
-rw-r--r-- | 3rdparty/asio/src/tests/unit/ip/icmp.cpp | 173 |
1 files changed, 33 insertions, 140 deletions
diff --git a/3rdparty/asio/src/tests/unit/ip/icmp.cpp b/3rdparty/asio/src/tests/unit/ip/icmp.cpp index 4a4f5e843f3..644e7bb9cde 100644 --- a/3rdparty/asio/src/tests/unit/ip/icmp.cpp +++ b/3rdparty/asio/src/tests/unit/ip/icmp.cpp @@ -2,7 +2,7 @@ // icmp.cpp // ~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2021 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) @@ -21,7 +21,6 @@ #include "asio/placeholders.hpp" #include "../unit_test.hpp" #include "../archetypes/async_result.hpp" -#include "../archetypes/deprecated_async_result.hpp" #include "../archetypes/gettable_socket_option.hpp" #include "../archetypes/io_control_command.hpp" #include "../archetypes/settable_socket_option.hpp" @@ -76,6 +75,7 @@ void test() try { io_context ioc; + const io_context::executor_type ioc_ex = ioc.get_executor(); char mutable_char_buffer[128] = ""; const char const_char_buffer[128] = ""; socket_base::message_flags in_flags = 0; @@ -87,9 +87,6 @@ void test() archetypes::gettable_socket_option<double> gettable_socket_option3; archetypes::io_control_command io_control_command; archetypes::lazy_handler lazy; -#if !defined(ASIO_NO_DEPRECATED) - archetypes::deprecated_lazy_handler dlazy; -#endif // !defined(ASIO_NO_DEPRECATED) asio::error_code ec; // basic_datagram_socket constructors. @@ -105,8 +102,19 @@ void test() ip::icmp::socket socket6(ioc, ip::icmp::v4(), native_socket1); #endif // !defined(ASIO_WINDOWS_RUNTIME) + ip::icmp::socket socket7(ioc_ex); + ip::icmp::socket socket8(ioc_ex, ip::icmp::v4()); + ip::icmp::socket socket9(ioc_ex, ip::icmp::v6()); + ip::icmp::socket socket10(ioc_ex, ip::icmp::endpoint(ip::icmp::v4(), 0)); + ip::icmp::socket socket11(ioc_ex, ip::icmp::endpoint(ip::icmp::v6(), 0)); +#if !defined(ASIO_WINDOWS_RUNTIME) + ip::icmp::socket::native_handle_type native_socket2 + = ::socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + ip::icmp::socket socket12(ioc_ex, ip::icmp::v4(), native_socket2); +#endif // !defined(ASIO_WINDOWS_RUNTIME) + #if defined(ASIO_HAS_MOVE) - ip::icmp::socket socket7(std::move(socket6)); + ip::icmp::socket socket13(std::move(socket6)); #endif // defined(ASIO_HAS_MOVE) // basic_datagram_socket operators. @@ -118,11 +126,6 @@ void test() // basic_io_object functions. -#if !defined(ASIO_NO_DEPRECATED) - io_context& ioc_ref = socket1.get_io_context(); - (void)ioc_ref; -#endif // !defined(ASIO_NO_DEPRECATED) - ip::icmp::socket::executor_type ex = socket1.get_executor(); (void)ex; @@ -131,9 +134,9 @@ void test() ip::icmp::socket::lowest_layer_type& lowest_layer = socket1.lowest_layer(); (void)lowest_layer; - const ip::icmp::socket& socket8 = socket1; + const ip::icmp::socket& socket14 = socket1; const ip::icmp::socket::lowest_layer_type& lowest_layer2 - = socket8.lowest_layer(); + = socket14.lowest_layer(); (void)lowest_layer2; socket1.open(ip::icmp::v4()); @@ -142,12 +145,12 @@ void test() socket1.open(ip::icmp::v6(), ec); #if !defined(ASIO_WINDOWS_RUNTIME) - ip::icmp::socket::native_handle_type native_socket2 - = ::socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); - socket1.assign(ip::icmp::v4(), native_socket2); ip::icmp::socket::native_handle_type native_socket3 = ::socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); - socket1.assign(ip::icmp::v4(), native_socket3, ec); + socket1.assign(ip::icmp::v4(), native_socket3); + ip::icmp::socket::native_handle_type native_socket4 + = ::socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + socket1.assign(ip::icmp::v4(), native_socket4, ec); #endif // !defined(ASIO_WINDOWS_RUNTIME) bool is_open = socket1.is_open(); @@ -156,9 +159,12 @@ void test() socket1.close(); socket1.close(ec); - ip::icmp::socket::native_handle_type native_socket4 + socket1.release(); + socket1.release(ec); + + ip::icmp::socket::native_handle_type native_socket5 = socket1.native_handle(); - (void)native_socket4; + (void)native_socket5; socket1.cancel(); socket1.cancel(ec); @@ -191,14 +197,6 @@ void test() (void)i1; int i2 = socket1.async_connect(ip::icmp::endpoint(ip::icmp::v6(), 0), lazy); (void)i2; -#if !defined(ASIO_NO_DEPRECATED) - double d1 = socket1.async_connect( - ip::icmp::endpoint(ip::icmp::v4(), 0), dlazy); - (void)d1; - double d2 = socket1.async_connect( - ip::icmp::endpoint(ip::icmp::v6(), 0), dlazy); - (void)d2; -#endif // !defined(ASIO_NO_DEPRECATED) socket1.set_option(settable_socket_option1); socket1.set_option(settable_socket_option1, ec); @@ -228,10 +226,14 @@ void test() socket1.native_non_blocking(false, ec); ip::icmp::endpoint endpoint1 = socket1.local_endpoint(); + (void)endpoint1; ip::icmp::endpoint endpoint2 = socket1.local_endpoint(ec); + (void)endpoint2; ip::icmp::endpoint endpoint3 = socket1.remote_endpoint(); + (void)endpoint3; ip::icmp::endpoint endpoint4 = socket1.remote_endpoint(ec); + (void)endpoint4; socket1.shutdown(socket_base::shutdown_both); socket1.shutdown(socket_base::shutdown_both, ec); @@ -266,21 +268,6 @@ void test() (void)i7; int i8 = socket1.async_send(null_buffers(), in_flags, lazy); (void)i8; -#if !defined(ASIO_NO_DEPRECATED) - double d3 = socket1.async_send(buffer(mutable_char_buffer), dlazy); - (void)d3; - double d4 = socket1.async_send(buffer(const_char_buffer), dlazy); - (void)d4; - double d5 = socket1.async_send(null_buffers(), dlazy); - (void)d5; - double d6 = socket1.async_send( - buffer(mutable_char_buffer), in_flags, dlazy); - (void)d6; - double d7 = socket1.async_send(buffer(const_char_buffer), in_flags, dlazy); - (void)d7; - double d8 = socket1.async_send(null_buffers(), in_flags, dlazy); - (void)d8; -#endif // !defined(ASIO_NO_DEPRECATED) socket1.send_to(buffer(mutable_char_buffer), ip::icmp::endpoint(ip::icmp::v4(), 0)); @@ -379,44 +366,6 @@ void test() int i20 = socket1.async_send_to(null_buffers(), ip::icmp::endpoint(ip::icmp::v6(), 0), in_flags, lazy); (void)i20; -#if !defined(ASIO_NO_DEPRECATED) - double d9 = socket1.async_send_to(buffer(mutable_char_buffer), - ip::icmp::endpoint(ip::icmp::v4(), 0), dlazy); - (void)d9; - double d10 = socket1.async_send_to(buffer(mutable_char_buffer), - ip::icmp::endpoint(ip::icmp::v6(), 0), dlazy); - (void)d10; - double d11 = socket1.async_send_to(buffer(const_char_buffer), - ip::icmp::endpoint(ip::icmp::v4(), 0), dlazy); - (void)d11; - double d12 = socket1.async_send_to(buffer(const_char_buffer), - ip::icmp::endpoint(ip::icmp::v6(), 0), dlazy); - (void)d12; - double d13 = socket1.async_send_to(null_buffers(), - ip::icmp::endpoint(ip::icmp::v4(), 0), dlazy); - (void)d13; - double d14 = socket1.async_send_to(null_buffers(), - ip::icmp::endpoint(ip::icmp::v6(), 0), dlazy); - (void)d14; - double d15 = socket1.async_send_to(buffer(mutable_char_buffer), - ip::icmp::endpoint(ip::icmp::v4(), 0), in_flags, dlazy); - (void)d15; - double d16 = socket1.async_send_to(buffer(mutable_char_buffer), - ip::icmp::endpoint(ip::icmp::v6(), 0), in_flags, dlazy); - (void)d16; - double d17 = socket1.async_send_to(buffer(const_char_buffer), - ip::icmp::endpoint(ip::icmp::v4(), 0), in_flags, dlazy); - (void)d17; - double d18 = socket1.async_send_to(buffer(const_char_buffer), - ip::icmp::endpoint(ip::icmp::v6(), 0), in_flags, dlazy); - (void)d18; - double d19 = socket1.async_send_to(null_buffers(), - ip::icmp::endpoint(ip::icmp::v4(), 0), in_flags, dlazy); - (void)d19; - double d20 = socket1.async_send_to(null_buffers(), - ip::icmp::endpoint(ip::icmp::v6(), 0), in_flags, dlazy); - (void)d20; -#endif // !defined(ASIO_NO_DEPRECATED) socket1.receive(buffer(mutable_char_buffer)); socket1.receive(null_buffers()); @@ -439,17 +388,6 @@ void test() (void)i23; int i24 = socket1.async_receive(null_buffers(), in_flags, lazy); (void)i24; -#if !defined(ASIO_NO_DEPRECATED) - double d21 = socket1.async_receive(buffer(mutable_char_buffer), dlazy); - (void)d21; - double d22 = socket1.async_receive(null_buffers(), dlazy); - (void)d22; - double d23 = socket1.async_receive(buffer(mutable_char_buffer), - in_flags, dlazy); - (void)d23; - double d24 = socket1.async_receive(null_buffers(), in_flags, dlazy); - (void)d24; -#endif // !defined(ASIO_NO_DEPRECATED) ip::icmp::endpoint endpoint; socket1.receive_from(buffer(mutable_char_buffer), endpoint); @@ -479,20 +417,6 @@ void test() int i28 = socket1.async_receive_from(null_buffers(), endpoint, in_flags, lazy); (void)i28; -#if !defined(ASIO_NO_DEPRECATED) - double d25 = socket1.async_receive_from(buffer(mutable_char_buffer), - endpoint, dlazy); - (void)d25; - double d26 = socket1.async_receive_from(null_buffers(), - endpoint, dlazy); - (void)d26; - double d27 = socket1.async_receive_from(buffer(mutable_char_buffer), - endpoint, in_flags, dlazy); - (void)d27; - double d28 = socket1.async_receive_from(null_buffers(), - endpoint, in_flags, dlazy); - (void)d28; -#endif // !defined(ASIO_NO_DEPRECATED) } catch (std::exception&) { @@ -530,10 +454,8 @@ void test() try { io_context ioc; + const io_context::executor_type ioc_ex = ioc.get_executor(); archetypes::lazy_handler lazy; -#if !defined(ASIO_NO_DEPRECATED) - archetypes::deprecated_lazy_handler dlazy; -#endif // !defined(ASIO_NO_DEPRECATED) asio::error_code ec; #if !defined(ASIO_NO_DEPRECATED) ip::icmp::resolver::query q(ip::icmp::v4(), "localhost", "0"); @@ -543,25 +465,21 @@ void test() // basic_resolver constructors. ip::icmp::resolver resolver(ioc); + ip::icmp::resolver resolver2(ioc_ex); #if defined(ASIO_HAS_MOVE) - ip::icmp::resolver resolver2(std::move(resolver)); + ip::icmp::resolver resolver3(std::move(resolver)); #endif // defined(ASIO_HAS_MOVE) // basic_resolver operators. #if defined(ASIO_HAS_MOVE) resolver = ip::icmp::resolver(ioc); - resolver = std::move(resolver2); + resolver = std::move(resolver3); #endif // defined(ASIO_HAS_MOVE) // basic_io_object functions. -#if !defined(ASIO_NO_DEPRECATED) - io_context& ioc_ref = resolver.get_io_context(); - (void)ioc_ref; -#endif // !defined(ASIO_NO_DEPRECATED) - ip::icmp::resolver::executor_type ex = resolver.get_executor(); (void)ex; @@ -617,55 +535,30 @@ void test() resolver.async_resolve(q, resolve_handler()); int i1 = resolver.async_resolve(q, lazy); (void)i1; - double d1 = resolver.async_resolve(q, dlazy); - (void)d1; #endif // !defined(ASIO_NO_DEPRECATED) resolver.async_resolve("", "", resolve_handler()); int i2 = resolver.async_resolve("", "", lazy); (void)i2; -#if !defined(ASIO_NO_DEPRECATED) - double d2 = resolver.async_resolve("", "", dlazy); - (void)d2; -#endif // !defined(ASIO_NO_DEPRECATED) resolver.async_resolve("", "", ip::icmp::resolver::flags(), resolve_handler()); int i3 = resolver.async_resolve("", "", ip::icmp::resolver::flags(), lazy); (void)i3; -#if !defined(ASIO_NO_DEPRECATED) - double d3 = resolver.async_resolve("", "", - ip::icmp::resolver::flags(), dlazy); - (void)d3; -#endif // !defined(ASIO_NO_DEPRECATED) - resolver.async_resolve(ip::icmp::v4(), "", "", resolve_handler()); int i4 = resolver.async_resolve(ip::icmp::v4(), "", "", lazy); (void)i4; -#if !defined(ASIO_NO_DEPRECATED) - double d4 = resolver.async_resolve(ip::icmp::v4(), "", "", dlazy); - (void)d4; -#endif // !defined(ASIO_NO_DEPRECATED) resolver.async_resolve(ip::icmp::v4(), "", "", ip::icmp::resolver::flags(), resolve_handler()); int i5 = resolver.async_resolve(ip::icmp::v4(), "", "", ip::icmp::resolver::flags(), lazy); (void)i5; -#if !defined(ASIO_NO_DEPRECATED) - double d5 = resolver.async_resolve(ip::icmp::v4(), - "", "", ip::icmp::resolver::flags(), dlazy); - (void)d5; -#endif // !defined(ASIO_NO_DEPRECATED) resolver.async_resolve(e, resolve_handler()); int i6 = resolver.async_resolve(e, lazy); (void)i6; -#if !defined(ASIO_NO_DEPRECATED) - double d6 = resolver.async_resolve(e, dlazy); - (void)d6; -#endif // !defined(ASIO_NO_DEPRECATED) } catch (std::exception&) { |