]> git.proxmox.com Git - ceph.git/blobdiff - ceph/src/boost/libs/asio/test/ip/tcp.cpp
update sources to v12.2.3
[ceph.git] / ceph / src / boost / libs / asio / test / ip / tcp.cpp
index a4ef36535dbb71cc0db859178838bb34e45505fd..66c8aad9a214b58030b45e5c0a55721734d73bc9 100644 (file)
@@ -2,7 +2,7 @@
 // tcp.cpp
 // ~~~~~~~
 //
-// 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)
 #include <boost/asio/ip/tcp.hpp>
 
 #include <cstring>
-#include <boost/asio/io_service.hpp>
+#include <boost/asio/io_context.hpp>
 #include <boost/asio/read.hpp>
 #include <boost/asio/write.hpp>
 #include "../unit_test.hpp"
-#include "../archetypes/gettable_socket_option.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"
 
@@ -57,8 +58,8 @@ void test()
 
   try
   {
-    io_service ios;
-    ip::tcp::socket sock(ios);
+    io_context ioc;
+    ip::tcp::socket sock(ioc);
 
     // no_delay class.
 
@@ -91,8 +92,8 @@ void test()
   using namespace boost::asio;
   namespace ip = boost::asio::ip;
 
-  io_service ios;
-  ip::tcp::socket sock(ios, ip::tcp::v4());
+  io_context ioc;
+  ip::tcp::socket sock(ioc, ip::tcp::v4());
   boost::system::error_code ec;
 
   // no_delay class.
@@ -137,25 +138,71 @@ void test()
 
 namespace ip_tcp_socket_compile {
 
-void connect_handler(const boost::system::error_code&)
+struct connect_handler
 {
-}
+  connect_handler() {}
+  void operator()(const boost::system::error_code&) {}
+#if defined(BOOST_ASIO_HAS_MOVE)
+  connect_handler(connect_handler&&) {}
+private:
+  connect_handler(const connect_handler&);
+#endif // defined(BOOST_ASIO_HAS_MOVE)
+};
 
-void send_handler(const boost::system::error_code&, std::size_t)
+struct wait_handler
 {
-}
+  wait_handler() {}
+  void operator()(const boost::system::error_code&) {}
+#if defined(BOOST_ASIO_HAS_MOVE)
+  wait_handler(wait_handler&&) {}
+private:
+  wait_handler(const wait_handler&);
+#endif // defined(BOOST_ASIO_HAS_MOVE)
+};
 
-void receive_handler(const boost::system::error_code&, std::size_t)
+struct send_handler
 {
-}
+  send_handler() {}
+  void operator()(const boost::system::error_code&, std::size_t) {}
+#if defined(BOOST_ASIO_HAS_MOVE)
+  send_handler(send_handler&&) {}
+private:
+  send_handler(const send_handler&);
+#endif // defined(BOOST_ASIO_HAS_MOVE)
+};
 
-void write_some_handler(const boost::system::error_code&, std::size_t)
+struct receive_handler
 {
-}
+  receive_handler() {}
+  void operator()(const boost::system::error_code&, std::size_t) {}
+#if defined(BOOST_ASIO_HAS_MOVE)
+  receive_handler(receive_handler&&) {}
+private:
+  receive_handler(const receive_handler&);
+#endif // defined(BOOST_ASIO_HAS_MOVE)
+};
 
-void read_some_handler(const boost::system::error_code&, std::size_t)
+struct write_some_handler
 {
-}
+  write_some_handler() {}
+  void operator()(const boost::system::error_code&, std::size_t) {}
+#if defined(BOOST_ASIO_HAS_MOVE)
+  write_some_handler(write_some_handler&&) {}
+private:
+  write_some_handler(const write_some_handler&);
+#endif // defined(BOOST_ASIO_HAS_MOVE)
+};
+
+struct read_some_handler
+{
+  read_some_handler() {}
+  void operator()(const boost::system::error_code&, std::size_t) {}
+#if defined(BOOST_ASIO_HAS_MOVE)
+  read_some_handler(read_some_handler&&) {}
+private:
+  read_some_handler(const read_some_handler&);
+#endif // defined(BOOST_ASIO_HAS_MOVE)
+};
 
 void test()
 {
@@ -170,7 +217,7 @@ void test()
 
   try
   {
-    io_service ios;
+    io_context ioc;
     char mutable_char_buffer[128] = "";
     const char const_char_buffer[128] = "";
     array<boost::asio::mutable_buffer, 2> mutable_buffers = {{
@@ -188,19 +235,22 @@ void test()
     archetypes::gettable_socket_option<double> gettable_socket_option3;
     archetypes::io_control_command io_control_command;
     archetypes::lazy_handler lazy;
+#if !defined(BOOST_ASIO_NO_DEPRECATED)
+    archetypes::deprecated_lazy_handler dlazy;
+#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
     boost::system::error_code ec;
 
     // basic_stream_socket constructors.
 
-    ip::tcp::socket socket1(ios);
-    ip::tcp::socket socket2(ios, ip::tcp::v4());
-    ip::tcp::socket socket3(ios, ip::tcp::v6());
-    ip::tcp::socket socket4(ios, ip::tcp::endpoint(ip::tcp::v4(), 0));
-    ip::tcp::socket socket5(ios, ip::tcp::endpoint(ip::tcp::v6(), 0));
+    ip::tcp::socket socket1(ioc);
+    ip::tcp::socket socket2(ioc, ip::tcp::v4());
+    ip::tcp::socket socket3(ioc, ip::tcp::v6());
+    ip::tcp::socket socket4(ioc, ip::tcp::endpoint(ip::tcp::v4(), 0));
+    ip::tcp::socket socket5(ioc, ip::tcp::endpoint(ip::tcp::v6(), 0));
 #if !defined(BOOST_ASIO_WINDOWS_RUNTIME)
     ip::tcp::socket::native_handle_type native_socket1
       = ::socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
-    ip::tcp::socket socket6(ios, ip::tcp::v4(), native_socket1);
+    ip::tcp::socket socket6(ioc, ip::tcp::v4(), native_socket1);
 #endif // !defined(BOOST_ASIO_WINDOWS_RUNTIME)
 
 #if defined(BOOST_ASIO_HAS_MOVE)
@@ -210,14 +260,19 @@ void test()
     // basic_stream_socket operators.
 
 #if defined(BOOST_ASIO_HAS_MOVE)
-    socket1 = ip::tcp::socket(ios);
+    socket1 = ip::tcp::socket(ioc);
     socket1 = std::move(socket2);
 #endif // defined(BOOST_ASIO_HAS_MOVE)
 
     // basic_io_object functions.
 
-    io_service& ios_ref = socket1.get_io_service();
-    (void)ios_ref;
+#if !defined(BOOST_ASIO_NO_DEPRECATED)
+    io_context& ioc_ref = socket1.get_io_context();
+    (void)ioc_ref;
+#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
+
+    ip::tcp::socket::executor_type ex = socket1.get_executor();
+    (void)ex;
 
     // basic_socket functions.
 
@@ -249,12 +304,12 @@ void test()
     socket1.close();
     socket1.close(ec);
 
-    ip::tcp::socket::native_type native_socket4 = socket1.native();
-    (void)native_socket4;
+    socket1.release();
+    socket1.release(ec);
 
-    ip::tcp::socket::native_handle_type native_socket5
+    ip::tcp::socket::native_handle_type native_socket4
       = socket1.native_handle();
-    (void)native_socket5;
+    (void)native_socket4;
 
     socket1.cancel();
     socket1.cancel(ec);
@@ -280,13 +335,21 @@ void test()
     socket1.connect(ip::tcp::endpoint(ip::tcp::v6(), 0), ec);
 
     socket1.async_connect(ip::tcp::endpoint(ip::tcp::v4(), 0),
-        &connect_handler);
+        connect_handler());
     socket1.async_connect(ip::tcp::endpoint(ip::tcp::v6(), 0),
-        &connect_handler);
+        connect_handler());
     int i1 = socket1.async_connect(ip::tcp::endpoint(ip::tcp::v4(), 0), lazy);
     (void)i1;
     int i2 = socket1.async_connect(ip::tcp::endpoint(ip::tcp::v6(), 0), lazy);
     (void)i2;
+#if !defined(BOOST_ASIO_NO_DEPRECATED)
+    double d1 = socket1.async_connect(
+        ip::tcp::endpoint(ip::tcp::v4(), 0), dlazy);
+    (void)d1;
+    double d2 = socket1.async_connect(
+        ip::tcp::endpoint(ip::tcp::v6(), 0), dlazy);
+    (void)d2;
+#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
 
     socket1.set_option(settable_socket_option1);
     socket1.set_option(settable_socket_option1, ec);
@@ -324,6 +387,17 @@ void test()
     socket1.shutdown(socket_base::shutdown_both);
     socket1.shutdown(socket_base::shutdown_both, ec);
 
+    socket1.wait(socket_base::wait_read);
+    socket1.wait(socket_base::wait_write, ec);
+
+    socket1.async_wait(socket_base::wait_read, wait_handler());
+    int i3 = socket1.async_wait(socket_base::wait_write, lazy);
+    (void)i3;
+#if !defined(BOOST_ASIO_NO_DEPRECATED)
+    double d3 = socket1.async_wait(socket_base::wait_write, dlazy);
+    (void)d3;
+#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
+
     // basic_stream_socket functions.
 
     socket1.send(buffer(mutable_char_buffer));
@@ -342,36 +416,59 @@ void test()
     socket1.send(const_buffers, in_flags, ec);
     socket1.send(null_buffers(), in_flags, ec);
 
-    socket1.async_send(buffer(mutable_char_buffer), &send_handler);
-    socket1.async_send(buffer(const_char_buffer), &send_handler);
-    socket1.async_send(mutable_buffers, &send_handler);
-    socket1.async_send(const_buffers, &send_handler);
-    socket1.async_send(null_buffers(), &send_handler);
-    socket1.async_send(buffer(mutable_char_buffer), in_flags, &send_handler);
-    socket1.async_send(buffer(const_char_buffer), in_flags, &send_handler);
-    socket1.async_send(mutable_buffers, in_flags, &send_handler);
-    socket1.async_send(const_buffers, in_flags, &send_handler);
-    socket1.async_send(null_buffers(), in_flags, &send_handler);
-    int i3 = socket1.async_send(buffer(mutable_char_buffer), lazy);
-    (void)i3;
-    int i4 = socket1.async_send(buffer(const_char_buffer), lazy);
+    socket1.async_send(buffer(mutable_char_buffer), send_handler());
+    socket1.async_send(buffer(const_char_buffer), send_handler());
+    socket1.async_send(mutable_buffers, send_handler());
+    socket1.async_send(const_buffers, send_handler());
+    socket1.async_send(null_buffers(), send_handler());
+    socket1.async_send(buffer(mutable_char_buffer), in_flags, send_handler());
+    socket1.async_send(buffer(const_char_buffer), in_flags, send_handler());
+    socket1.async_send(mutable_buffers, in_flags, send_handler());
+    socket1.async_send(const_buffers, in_flags, send_handler());
+    socket1.async_send(null_buffers(), in_flags, send_handler());
+    int i4 = socket1.async_send(buffer(mutable_char_buffer), lazy);
     (void)i4;
-    int i5 = socket1.async_send(mutable_buffers, lazy);
+    int i5 = socket1.async_send(buffer(const_char_buffer), lazy);
     (void)i5;
-    int i6 = socket1.async_send(const_buffers, lazy);
+    int i6 = socket1.async_send(mutable_buffers, lazy);
     (void)i6;
-    int i7 = socket1.async_send(null_buffers(), lazy);
+    int i7 = socket1.async_send(const_buffers, lazy);
     (void)i7;
-    int i8 = socket1.async_send(buffer(mutable_char_buffer), in_flags, lazy);
+    int i8 = socket1.async_send(null_buffers(), lazy);
     (void)i8;
-    int i9 = socket1.async_send(buffer(const_char_buffer), in_flags, lazy);
+    int i9 = socket1.async_send(buffer(mutable_char_buffer), in_flags, lazy);
     (void)i9;
-    int i10 = socket1.async_send(mutable_buffers, in_flags, lazy);
+    int i10 = socket1.async_send(buffer(const_char_buffer), in_flags, lazy);
     (void)i10;
-    int i11 = socket1.async_send(const_buffers, in_flags, lazy);
+    int i11 = socket1.async_send(mutable_buffers, in_flags, lazy);
     (void)i11;
-    int i12 = socket1.async_send(null_buffers(), in_flags, lazy);
+    int i12 = socket1.async_send(const_buffers, in_flags, lazy);
     (void)i12;
+    int i13 = socket1.async_send(null_buffers(), in_flags, lazy);
+    (void)i13;
+#if !defined(BOOST_ASIO_NO_DEPRECATED)
+    double d4 = socket1.async_send(buffer(mutable_char_buffer), dlazy);
+    (void)d4;
+    double d5 = socket1.async_send(buffer(const_char_buffer), dlazy);
+    (void)d5;
+    double d6 = socket1.async_send(mutable_buffers, dlazy);
+    (void)d6;
+    double d7 = socket1.async_send(const_buffers, dlazy);
+    (void)d7;
+    double d8 = socket1.async_send(null_buffers(), dlazy);
+    (void)d8;
+    double d9 = socket1.async_send(
+        buffer(mutable_char_buffer), in_flags, dlazy);
+    (void)d9;
+    double d10 = socket1.async_send(buffer(const_char_buffer), in_flags, dlazy);
+    (void)d10;
+    double d11 = socket1.async_send(mutable_buffers, in_flags, dlazy);
+    (void)d11;
+    double d12 = socket1.async_send(const_buffers, in_flags, dlazy);
+    (void)d12;
+    double d13 = socket1.async_send(null_buffers(), in_flags, dlazy);
+    (void)d13;
+#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
 
     socket1.receive(buffer(mutable_char_buffer));
     socket1.receive(mutable_buffers);
@@ -383,26 +480,41 @@ void test()
     socket1.receive(mutable_buffers, in_flags, ec);
     socket1.receive(null_buffers(), in_flags, ec);
 
-    socket1.async_receive(buffer(mutable_char_buffer), &receive_handler);
-    socket1.async_receive(mutable_buffers, &receive_handler);
-    socket1.async_receive(null_buffers(), &receive_handler);
+    socket1.async_receive(buffer(mutable_char_buffer), receive_handler());
+    socket1.async_receive(mutable_buffers, receive_handler());
+    socket1.async_receive(null_buffers(), receive_handler());
     socket1.async_receive(buffer(mutable_char_buffer), in_flags,
-        &receive_handler);
-    socket1.async_receive(mutable_buffers, in_flags, &receive_handler);
-    socket1.async_receive(null_buffers(), in_flags, &receive_handler);
-    int i13 = socket1.async_receive(buffer(mutable_char_buffer), lazy);
-    (void)i13;
-    int i14 = socket1.async_receive(mutable_buffers, lazy);
+        receive_handler());
+    socket1.async_receive(mutable_buffers, in_flags, receive_handler());
+    socket1.async_receive(null_buffers(), in_flags, receive_handler());
+    int i14 = socket1.async_receive(buffer(mutable_char_buffer), lazy);
     (void)i14;
-    int i15 = socket1.async_receive(null_buffers(), lazy);
+    int i15 = socket1.async_receive(mutable_buffers, lazy);
     (void)i15;
-    int i16 = socket1.async_receive(buffer(mutable_char_buffer), in_flags,
-        lazy);
+    int i16 = socket1.async_receive(null_buffers(), lazy);
     (void)i16;
-    int i17 = socket1.async_receive(mutable_buffers, in_flags, lazy);
+    int i17 = socket1.async_receive(buffer(mutable_char_buffer), in_flags,
+        lazy);
     (void)i17;
-    int i18 = socket1.async_receive(null_buffers(), in_flags, lazy);
+    int i18 = socket1.async_receive(mutable_buffers, in_flags, lazy);
     (void)i18;
+    int i19 = socket1.async_receive(null_buffers(), in_flags, lazy);
+    (void)i19;
+#if !defined(BOOST_ASIO_NO_DEPRECATED)
+    double d14 = socket1.async_receive(buffer(mutable_char_buffer), dlazy);
+    (void)d14;
+    double d15 = socket1.async_receive(mutable_buffers, dlazy);
+    (void)d15;
+    double d16 = socket1.async_receive(null_buffers(), dlazy);
+    (void)d16;
+    double d17 = socket1.async_receive(buffer(mutable_char_buffer), in_flags,
+        dlazy);
+    (void)d17;
+    double d18 = socket1.async_receive(mutable_buffers, in_flags, dlazy);
+    (void)d18;
+    double d19 = socket1.async_receive(null_buffers(), in_flags, dlazy);
+    (void)d19;
+#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
 
     socket1.write_some(buffer(mutable_char_buffer));
     socket1.write_some(buffer(const_char_buffer));
@@ -415,21 +527,33 @@ void test()
     socket1.write_some(const_buffers, ec);
     socket1.write_some(null_buffers(), ec);
 
-    socket1.async_write_some(buffer(mutable_char_buffer), &write_some_handler);
-    socket1.async_write_some(buffer(const_char_buffer), &write_some_handler);
-    socket1.async_write_some(mutable_buffers, &write_some_handler);
-    socket1.async_write_some(const_buffers, &write_some_handler);
-    socket1.async_write_some(null_buffers(), &write_some_handler);
-    int i19 = socket1.async_write_some(buffer(mutable_char_buffer), lazy);
-    (void)i19;
-    int i20 = socket1.async_write_some(buffer(const_char_buffer), lazy);
+    socket1.async_write_some(buffer(mutable_char_buffer), write_some_handler());
+    socket1.async_write_some(buffer(const_char_buffer), write_some_handler());
+    socket1.async_write_some(mutable_buffers, write_some_handler());
+    socket1.async_write_some(const_buffers, write_some_handler());
+    socket1.async_write_some(null_buffers(), write_some_handler());
+    int i20 = socket1.async_write_some(buffer(mutable_char_buffer), lazy);
     (void)i20;
-    int i21 = socket1.async_write_some(mutable_buffers, lazy);
+    int i21 = socket1.async_write_some(buffer(const_char_buffer), lazy);
     (void)i21;
-    int i22 = socket1.async_write_some(const_buffers, lazy);
+    int i22 = socket1.async_write_some(mutable_buffers, lazy);
     (void)i22;
-    int i23 = socket1.async_write_some(null_buffers(), lazy);
+    int i23 = socket1.async_write_some(const_buffers, lazy);
     (void)i23;
+    int i24 = socket1.async_write_some(null_buffers(), lazy);
+    (void)i24;
+#if !defined(BOOST_ASIO_NO_DEPRECATED)
+    double d20 = socket1.async_write_some(buffer(mutable_char_buffer), dlazy);
+    (void)d20;
+    double d21 = socket1.async_write_some(buffer(const_char_buffer), dlazy);
+    (void)d21;
+    double d22 = socket1.async_write_some(mutable_buffers, dlazy);
+    (void)d22;
+    double d23 = socket1.async_write_some(const_buffers, dlazy);
+    (void)d23;
+    double d24 = socket1.async_write_some(null_buffers(), dlazy);
+    (void)d24;
+#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
 
     socket1.read_some(buffer(mutable_char_buffer));
     socket1.read_some(mutable_buffers);
@@ -438,15 +562,23 @@ void test()
     socket1.read_some(mutable_buffers, ec);
     socket1.read_some(null_buffers(), ec);
 
-    socket1.async_read_some(buffer(mutable_char_buffer), &read_some_handler);
-    socket1.async_read_some(mutable_buffers, &read_some_handler);
-    socket1.async_read_some(null_buffers(), &read_some_handler);
-    int i24 = socket1.async_read_some(buffer(mutable_char_buffer), lazy);
-    (void)i24;
-    int i25 = socket1.async_read_some(mutable_buffers, lazy);
+    socket1.async_read_some(buffer(mutable_char_buffer), read_some_handler());
+    socket1.async_read_some(mutable_buffers, read_some_handler());
+    socket1.async_read_some(null_buffers(), read_some_handler());
+    int i25 = socket1.async_read_some(buffer(mutable_char_buffer), lazy);
     (void)i25;
-    int i26 = socket1.async_read_some(null_buffers(), lazy);
+    int i26 = socket1.async_read_some(mutable_buffers, lazy);
     (void)i26;
+    int i27 = socket1.async_read_some(null_buffers(), lazy);
+    (void)i27;
+#if !defined(BOOST_ASIO_NO_DEPRECATED)
+    double d25 = socket1.async_read_some(buffer(mutable_char_buffer), dlazy);
+    (void)d25;
+    double d26 = socket1.async_read_some(mutable_buffers, dlazy);
+    (void)d26;
+    double d27 = socket1.async_read_some(null_buffers(), dlazy);
+    (void)d27;
+#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
   }
   catch (std::exception&)
   {
@@ -528,14 +660,14 @@ void test()
   using std::placeholders::_2;
 #endif // defined(BOOST_ASIO_HAS_BOOST_BIND)
 
-  io_service ios;
+  io_context ioc;
 
-  ip::tcp::acceptor acceptor(ios, ip::tcp::endpoint(ip::tcp::v4(), 0));
+  ip::tcp::acceptor acceptor(ioc, ip::tcp::endpoint(ip::tcp::v4(), 0));
   ip::tcp::endpoint server_endpoint = acceptor.local_endpoint();
   server_endpoint.address(ip::address_v4::loopback());
 
-  ip::tcp::socket client_side_socket(ios);
-  ip::tcp::socket server_side_socket(ios);
+  ip::tcp::socket client_side_socket(ioc);
+  ip::tcp::socket server_side_socket(ioc);
 
   client_side_socket.connect(server_endpoint);
   acceptor.accept(server_side_socket);
@@ -544,23 +676,23 @@ void test()
 
   bool read_noop_completed = false;
   client_side_socket.async_read_some(
-      boost::asio::mutable_buffers_1(0, 0),
+      boost::asio::mutable_buffer(0, 0),
       bindns::bind(handle_read_noop,
         _1, _2, &read_noop_completed));
 
-  ios.run();
+  ioc.run();
   BOOST_ASIO_CHECK(read_noop_completed);
 
   // No-op write.
 
   bool write_noop_completed = false;
   client_side_socket.async_write_some(
-      boost::asio::const_buffers_1(0, 0),
+      boost::asio::const_buffer(0, 0),
       bindns::bind(handle_write_noop,
         _1, _2, &write_noop_completed));
 
-  ios.reset();
-  ios.run();
+  ioc.restart();
+  ioc.run();
   BOOST_ASIO_CHECK(write_noop_completed);
 
   // Read and write to transfer data.
@@ -578,8 +710,8 @@ void test()
       bindns::bind(handle_write,
         _1, _2, &write_completed));
 
-  ios.reset();
-  ios.run();
+  ioc.restart();
+  ioc.run();
   BOOST_ASIO_CHECK(read_completed);
   BOOST_ASIO_CHECK(write_completed);
   BOOST_ASIO_CHECK(memcmp(read_buffer, write_data, sizeof(write_data)) == 0);
@@ -592,14 +724,14 @@ void test()
       bindns::bind(handle_read_cancel,
         _1, _2, &read_cancel_completed));
 
-  ios.reset();
-  ios.poll();
+  ioc.restart();
+  ioc.poll();
   BOOST_ASIO_CHECK(!read_cancel_completed);
 
   server_side_socket.cancel();
 
-  ios.reset();
-  ios.run();
+  ioc.restart();
+  ioc.run();
   BOOST_ASIO_CHECK(read_cancel_completed);
 
   // A read when the peer closes socket should fail with eof.
@@ -612,8 +744,8 @@ void test()
 
   server_side_socket.close();
 
-  ios.reset();
-  ios.run();
+  ioc.restart();
+  ioc.run();
   BOOST_ASIO_CHECK(read_eof_completed);
 }
 
@@ -628,9 +760,39 @@ void test()
 
 namespace ip_tcp_acceptor_compile {
 
-void accept_handler(const boost::system::error_code&)
+struct wait_handler
 {
-}
+  wait_handler() {}
+  void operator()(const boost::system::error_code&) {}
+#if defined(BOOST_ASIO_HAS_MOVE)
+  wait_handler(wait_handler&&) {}
+private:
+  wait_handler(const wait_handler&);
+#endif // defined(BOOST_ASIO_HAS_MOVE)
+};
+
+struct accept_handler
+{
+  accept_handler() {}
+  void operator()(const boost::system::error_code&) {}
+#if defined(BOOST_ASIO_HAS_MOVE)
+  accept_handler(accept_handler&&) {}
+private:
+  accept_handler(const accept_handler&);
+#endif // defined(BOOST_ASIO_HAS_MOVE)
+};
+
+#if defined(BOOST_ASIO_HAS_MOVE)
+struct move_accept_handler
+{
+  move_accept_handler() {}
+  void operator()(
+      const boost::system::error_code&, boost::asio::ip::tcp::socket) {}
+  move_accept_handler(move_accept_handler&&) {}
+private:
+  move_accept_handler(const move_accept_handler&) {}
+};
+#endif // defined(BOOST_ASIO_HAS_MOVE)
 
 void test()
 {
@@ -639,8 +801,8 @@ void test()
 
   try
   {
-    io_service ios;
-    ip::tcp::socket peer_socket(ios);
+    io_context ioc;
+    ip::tcp::socket peer_socket(ioc);
     ip::tcp::endpoint peer_endpoint;
     archetypes::settable_socket_option<void> settable_socket_option1;
     archetypes::settable_socket_option<int> settable_socket_option2;
@@ -650,19 +812,22 @@ void test()
     archetypes::gettable_socket_option<double> gettable_socket_option3;
     archetypes::io_control_command io_control_command;
     archetypes::lazy_handler lazy;
+#if !defined(BOOST_ASIO_NO_DEPRECATED)
+    archetypes::deprecated_lazy_handler dlazy;
+#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
     boost::system::error_code ec;
 
     // basic_socket_acceptor constructors.
 
-    ip::tcp::acceptor acceptor1(ios);
-    ip::tcp::acceptor acceptor2(ios, ip::tcp::v4());
-    ip::tcp::acceptor acceptor3(ios, ip::tcp::v6());
-    ip::tcp::acceptor acceptor4(ios, ip::tcp::endpoint(ip::tcp::v4(), 0));
-    ip::tcp::acceptor acceptor5(ios, ip::tcp::endpoint(ip::tcp::v6(), 0));
+    ip::tcp::acceptor acceptor1(ioc);
+    ip::tcp::acceptor acceptor2(ioc, ip::tcp::v4());
+    ip::tcp::acceptor acceptor3(ioc, ip::tcp::v6());
+    ip::tcp::acceptor acceptor4(ioc, ip::tcp::endpoint(ip::tcp::v4(), 0));
+    ip::tcp::acceptor acceptor5(ioc, ip::tcp::endpoint(ip::tcp::v6(), 0));
 #if !defined(BOOST_ASIO_WINDOWS_RUNTIME)
     ip::tcp::acceptor::native_handle_type native_acceptor1
       = ::socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
-    ip::tcp::acceptor acceptor6(ios, ip::tcp::v4(), native_acceptor1);
+    ip::tcp::acceptor acceptor6(ioc, ip::tcp::v4(), native_acceptor1);
 #endif // !defined(BOOST_ASIO_WINDOWS_RUNTIME)
 
 #if defined(BOOST_ASIO_HAS_MOVE)
@@ -672,14 +837,19 @@ void test()
     // basic_socket_acceptor operators.
 
 #if defined(BOOST_ASIO_HAS_MOVE)
-    acceptor1 = ip::tcp::acceptor(ios);
+    acceptor1 = ip::tcp::acceptor(ioc);
     acceptor1 = std::move(acceptor2);
 #endif // defined(BOOST_ASIO_HAS_MOVE)
 
     // basic_io_object functions.
 
-    io_service& ios_ref = acceptor1.get_io_service();
-    (void)ios_ref;
+#if !defined(BOOST_ASIO_NO_DEPRECATED)
+    io_context& ioc_ref = acceptor1.get_io_context();
+    (void)ioc_ref;
+#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
+
+    ip::tcp::acceptor::executor_type ex = acceptor1.get_executor();
+    (void)ex;
 
     // basic_socket_acceptor functions.
 
@@ -703,12 +873,12 @@ void test()
     acceptor1.close();
     acceptor1.close(ec);
 
-    ip::tcp::acceptor::native_type native_acceptor4 = acceptor1.native();
-    (void)native_acceptor4;
+    acceptor1.release();
+    acceptor1.release(ec);
 
-    ip::tcp::acceptor::native_handle_type native_acceptor5
+    ip::tcp::acceptor::native_handle_type native_acceptor4
       = acceptor1.native_handle();
-    (void)native_acceptor5;
+    (void)native_acceptor4;
 
     acceptor1.cancel();
     acceptor1.cancel(ec);
@@ -748,17 +918,49 @@ void test()
     ip::tcp::endpoint endpoint1 = acceptor1.local_endpoint();
     ip::tcp::endpoint endpoint2 = acceptor1.local_endpoint(ec);
 
+    acceptor1.wait(socket_base::wait_read);
+    acceptor1.wait(socket_base::wait_write, ec);
+
+    acceptor1.async_wait(socket_base::wait_read, wait_handler());
+    int i1 = acceptor1.async_wait(socket_base::wait_write, lazy);
+    (void)i1;
+#if !defined(BOOST_ASIO_NO_DEPRECATED)
+    double d1 = acceptor1.async_wait(socket_base::wait_write, dlazy);
+    (void)d1;
+#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
+
     acceptor1.accept(peer_socket);
     acceptor1.accept(peer_socket, ec);
     acceptor1.accept(peer_socket, peer_endpoint);
     acceptor1.accept(peer_socket, peer_endpoint, ec);
 
-    acceptor1.async_accept(peer_socket, &accept_handler);
-    acceptor1.async_accept(peer_socket, peer_endpoint, &accept_handler);
-    int i1 = acceptor1.async_accept(peer_socket, lazy);
-    (void)i1;
-    int i2 = acceptor1.async_accept(peer_socket, peer_endpoint, lazy);
+#if defined(BOOST_ASIO_HAS_MOVE)
+    peer_socket = acceptor1.accept();
+    peer_socket = acceptor1.accept(ioc);
+    peer_socket = acceptor1.accept(peer_endpoint);
+    peer_socket = acceptor1.accept(ioc, peer_endpoint);
+    (void)peer_socket;
+#endif // defined(BOOST_ASIO_HAS_MOVE)
+
+    acceptor1.async_accept(peer_socket, accept_handler());
+    acceptor1.async_accept(peer_socket, peer_endpoint, accept_handler());
+    int i2 = acceptor1.async_accept(peer_socket, lazy);
     (void)i2;
+    int i3 = acceptor1.async_accept(peer_socket, peer_endpoint, lazy);
+    (void)i3;
+#if !defined(BOOST_ASIO_NO_DEPRECATED)
+    double d2 = acceptor1.async_accept(peer_socket, dlazy);
+    (void)d2;
+    double d3 = acceptor1.async_accept(peer_socket, peer_endpoint, dlazy);
+    (void)d3;
+#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
+
+#if defined(BOOST_ASIO_HAS_MOVE)
+    acceptor1.async_accept(move_accept_handler());
+    acceptor1.async_accept(ioc, move_accept_handler());
+    acceptor1.async_accept(peer_endpoint, move_accept_handler());
+    acceptor1.async_accept(ioc, peer_endpoint, move_accept_handler());
+#endif // defined(BOOST_ASIO_HAS_MOVE)
   }
   catch (std::exception&)
   {
@@ -791,14 +993,14 @@ void test()
   using namespace boost::asio;
   namespace ip = boost::asio::ip;
 
-  io_service ios;
+  io_context ioc;
 
-  ip::tcp::acceptor acceptor(ios, ip::tcp::endpoint(ip::tcp::v4(), 0));
+  ip::tcp::acceptor acceptor(ioc, ip::tcp::endpoint(ip::tcp::v4(), 0));
   ip::tcp::endpoint server_endpoint = acceptor.local_endpoint();
   server_endpoint.address(ip::address_v4::loopback());
 
-  ip::tcp::socket client_side_socket(ios);
-  ip::tcp::socket server_side_socket(ios);
+  ip::tcp::socket client_side_socket(ioc);
+  ip::tcp::socket server_side_socket(ioc);
 
   client_side_socket.connect(server_endpoint);
   acceptor.accept(server_side_socket);
@@ -810,9 +1012,6 @@ void test()
   ip::tcp::endpoint client_endpoint;
   acceptor.accept(server_side_socket, client_endpoint);
 
-  ip::tcp::acceptor::non_blocking_io command(false);
-  acceptor.io_control(command);
-
   ip::tcp::endpoint client_side_local_endpoint
     = client_side_socket.local_endpoint();
   BOOST_ASIO_CHECK(client_side_local_endpoint.port() == client_endpoint.port());
@@ -828,7 +1027,7 @@ void test()
   acceptor.async_accept(server_side_socket, &handle_accept);
   client_side_socket.async_connect(server_endpoint, &handle_connect);
 
-  ios.run();
+  ioc.run();
 
   client_side_socket.close();
   server_side_socket.close();
@@ -836,8 +1035,8 @@ void test()
   acceptor.async_accept(server_side_socket, client_endpoint, &handle_accept);
   client_side_socket.async_connect(server_endpoint, &handle_connect);
 
-  ios.reset();
-  ios.run();
+  ioc.restart();
+  ioc.run();
 
   client_side_local_endpoint = client_side_socket.local_endpoint();
   BOOST_ASIO_CHECK(client_side_local_endpoint.port() == client_endpoint.port());
@@ -858,10 +1057,29 @@ void test()
 
 namespace ip_tcp_resolver_compile {
 
-void resolve_handler(const boost::system::error_code&,
-    boost::asio::ip::tcp::resolver::iterator)
+struct resolve_handler
 {
-}
+  resolve_handler() {}
+  void operator()(const boost::system::error_code&,
+      boost::asio::ip::tcp::resolver::results_type) {}
+#if defined(BOOST_ASIO_HAS_MOVE)
+  resolve_handler(resolve_handler&&) {}
+private:
+  resolve_handler(const resolve_handler&);
+#endif // defined(BOOST_ASIO_HAS_MOVE)
+};
+
+struct legacy_resolve_handler
+{
+  legacy_resolve_handler() {}
+  void operator()(const boost::system::error_code&,
+      boost::asio::ip::tcp::resolver::iterator) {}
+#if defined(BOOST_ASIO_HAS_MOVE)
+  legacy_resolve_handler(legacy_resolve_handler&&) {}
+private:
+  legacy_resolve_handler(const legacy_resolve_handler&);
+#endif // defined(BOOST_ASIO_HAS_MOVE)
+};
 
 void test()
 {
@@ -870,44 +1088,151 @@ void test()
 
   try
   {
-    io_service ios;
+    io_context ioc;
     archetypes::lazy_handler lazy;
+#if !defined(BOOST_ASIO_NO_DEPRECATED)
+    archetypes::deprecated_lazy_handler dlazy;
+#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
     boost::system::error_code ec;
+#if !defined(BOOST_ASIO_NO_DEPRECATED)
     ip::tcp::resolver::query q(ip::tcp::v4(), "localhost", "0");
+#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
     ip::tcp::endpoint e(ip::address_v4::loopback(), 0);
 
     // basic_resolver constructors.
 
-    ip::tcp::resolver resolver(ios);
+    ip::tcp::resolver resolver(ioc);
+
+#if defined(BOOST_ASIO_HAS_MOVE)
+    ip::tcp::resolver resolver2(std::move(resolver));
+#endif // defined(BOOST_ASIO_HAS_MOVE)
+
+    // basic_resolver operators.
+
+#if defined(BOOST_ASIO_HAS_MOVE)
+    resolver = ip::tcp::resolver(ioc);
+    resolver = std::move(resolver2);
+#endif // defined(BOOST_ASIO_HAS_MOVE)
 
     // basic_io_object functions.
 
-    io_service& ios_ref = resolver.get_io_service();
-    (void)ios_ref;
+#if !defined(BOOST_ASIO_NO_DEPRECATED)
+    io_context& ioc_ref = resolver.get_io_context();
+    (void)ioc_ref;
+#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
+
+    ip::tcp::resolver::executor_type ex = resolver.get_executor();
+    (void)ex;
 
     // basic_resolver functions.
 
     resolver.cancel();
 
-    ip::tcp::resolver::iterator iter1 = resolver.resolve(q);
-    (void)iter1;
+#if !defined(BOOST_ASIO_NO_DEPRECATED)
+    ip::tcp::resolver::results_type results1 = resolver.resolve(q);
+    (void)results1;
+
+    ip::tcp::resolver::results_type results2 = resolver.resolve(q, ec);
+    (void)results2;
+#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
+
+    ip::tcp::resolver::results_type results3 = resolver.resolve("", "");
+    (void)results3;
+
+    ip::tcp::resolver::results_type results4 = resolver.resolve("", "", ec);
+    (void)results4;
+
+    ip::tcp::resolver::results_type results5 =
+      resolver.resolve("", "", ip::tcp::resolver::flags());
+    (void)results5;
 
-    ip::tcp::resolver::iterator iter2 = resolver.resolve(q, ec);
-    (void)iter2;
+    ip::tcp::resolver::results_type results6 =
+      resolver.resolve("", "", ip::tcp::resolver::flags(), ec);
+    (void)results6;
 
-    ip::tcp::resolver::iterator iter3 = resolver.resolve(e);
-    (void)iter3;
+    ip::tcp::resolver::results_type results7 =
+      resolver.resolve(ip::tcp::v4(), "", "");
+    (void)results7;
 
-    ip::tcp::resolver::iterator iter4 = resolver.resolve(e, ec);
-    (void)iter4;
+    ip::tcp::resolver::results_type results8 =
+      resolver.resolve(ip::tcp::v4(), "", "", ec);
+    (void)results8;
 
-    resolver.async_resolve(q, &resolve_handler);
+    ip::tcp::resolver::results_type results9 =
+      resolver.resolve(ip::tcp::v4(), "", "", ip::tcp::resolver::flags());
+    (void)results9;
+
+    ip::tcp::resolver::results_type results10 =
+      resolver.resolve(ip::tcp::v4(), "", "", ip::tcp::resolver::flags(), ec);
+    (void)results10;
+
+    ip::tcp::resolver::results_type results11 = resolver.resolve(e);
+    (void)results11;
+
+    ip::tcp::resolver::results_type results12 = resolver.resolve(e, ec);
+    (void)results12;
+
+#if !defined(BOOST_ASIO_NO_DEPRECATED)
+    resolver.async_resolve(q, resolve_handler());
+    resolver.async_resolve(q, legacy_resolve_handler());
     int i1 = resolver.async_resolve(q, lazy);
     (void)i1;
+    double d1 = resolver.async_resolve(q, dlazy);
+    (void)d1;
+#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
 
-    resolver.async_resolve(e, &resolve_handler);
-    int i2 = resolver.async_resolve(e, lazy);
+    resolver.async_resolve("", "", resolve_handler());
+    resolver.async_resolve("", "", legacy_resolve_handler());
+    int i2 = resolver.async_resolve("", "", lazy);
     (void)i2;
+#if !defined(BOOST_ASIO_NO_DEPRECATED)
+    double d2 = resolver.async_resolve("", "", dlazy);
+    (void)d2;
+#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
+
+    resolver.async_resolve("", "",
+        ip::tcp::resolver::flags(), resolve_handler());
+    resolver.async_resolve("", "",
+        ip::tcp::resolver::flags(), legacy_resolve_handler());
+    int i3 = resolver.async_resolve("", "",
+        ip::tcp::resolver::flags(), lazy);
+    (void)i3;
+#if !defined(BOOST_ASIO_NO_DEPRECATED)
+    double d3 = resolver.async_resolve("", "",
+        ip::tcp::resolver::flags(), dlazy);
+    (void)d3;
+#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
+
+    resolver.async_resolve(ip::tcp::v4(), "", "", resolve_handler());
+    resolver.async_resolve(ip::tcp::v4(), "", "", legacy_resolve_handler());
+    int i4 = resolver.async_resolve(ip::tcp::v4(), "", "", lazy);
+    (void)i4;
+#if !defined(BOOST_ASIO_NO_DEPRECATED)
+    double d4 = resolver.async_resolve(ip::tcp::v4(), "", "", dlazy);
+    (void)d4;
+#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
+
+    resolver.async_resolve(ip::tcp::v4(),
+        "", "", ip::tcp::resolver::flags(), resolve_handler());
+    resolver.async_resolve(ip::tcp::v4(),
+        "", "", ip::tcp::resolver::flags(), legacy_resolve_handler());
+    int i5 = resolver.async_resolve(ip::tcp::v4(),
+        "", "", ip::tcp::resolver::flags(), lazy);
+    (void)i5;
+#if !defined(BOOST_ASIO_NO_DEPRECATED)
+    double d5 = resolver.async_resolve(ip::tcp::v4(),
+        "", "", ip::tcp::resolver::flags(), dlazy);
+    (void)d5;
+#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
+
+    resolver.async_resolve(e, resolve_handler());
+    resolver.async_resolve(e, legacy_resolve_handler());
+    int i6 = resolver.async_resolve(e, lazy);
+    (void)i6;
+#if !defined(BOOST_ASIO_NO_DEPRECATED)
+    double d6 = resolver.async_resolve(e, dlazy);
+    (void)d6;
+#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
   }
   catch (std::exception&)
   {
@@ -918,6 +1243,145 @@ void test()
 
 //------------------------------------------------------------------------------
 
+// ip_tcp_resolver_entry_compile test
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// The following test checks that all public member functions on the class
+// ip::tcp::resolver::entry compile and link correctly. Runtime failures are
+// ignored.
+
+namespace ip_tcp_resolver_entry_compile {
+
+void test()
+{
+  using namespace boost::asio;
+  namespace ip = boost::asio::ip;
+  const ip::tcp::endpoint endpoint;
+  const std::string host_name;
+  const std::string service_name;
+  const std::allocator<char> alloc;
+
+  try
+  {
+    // basic_resolver_entry constructors.
+
+    const ip::basic_resolver_entry<ip::tcp> entry1;
+    ip::basic_resolver_entry<ip::tcp> entry2(endpoint, host_name, service_name);
+    ip::basic_resolver_entry<ip::tcp> entry3(entry1);
+#if defined(BOOST_ASIO_HAS_MOVE)
+    ip::basic_resolver_entry<ip::tcp> entry4(std::move(entry2));
+#endif // defined(BOOST_ASIO_HAS_MOVE)
+
+    // basic_resolver_entry functions.
+
+    ip::tcp::endpoint e1 = entry1.endpoint();
+    (void)e1;
+
+    ip::tcp::endpoint e2 = entry1;
+    (void)e2;
+
+    std::string s1 = entry1.host_name();
+    (void)s1;
+
+    std::string s2 = entry1.host_name(alloc);
+    (void)s2;
+
+    std::string s3 = entry1.service_name();
+    (void)s3;
+
+    std::string s4 = entry1.service_name(alloc);
+    (void)s4;
+  }
+  catch (std::exception&)
+  {
+  }
+}
+
+} // namespace ip_tcp_resolver_entry_compile
+
+//------------------------------------------------------------------------------
+
+// ip_tcp_iostream_compile test
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// The following test checks that all public types and member functions on the
+// class ip::tcp::iostream compile and link correctly. Runtime failures are
+// ignored.
+
+namespace ip_tcp_iostream_compile {
+
+void test()
+{
+#if !defined(BOOST_ASIO_NO_IOSTREAM)
+  using namespace boost::asio;
+  namespace ip = boost::asio::ip;
+
+  boost::asio::io_context ioc;
+  boost::asio::ip::tcp::socket sock(ioc);
+
+  // basic_socket_iostream typedefs.
+
+  (void)static_cast<ip::tcp::iostream::protocol_type*>(0);
+  (void)static_cast<ip::tcp::iostream::endpoint_type*>(0);
+  (void)static_cast<ip::tcp::iostream::clock_type*>(0);
+  (void)static_cast<ip::tcp::iostream::time_point*>(0);
+  (void)static_cast<ip::tcp::iostream::duration*>(0);
+  (void)static_cast<ip::tcp::iostream::traits_type*>(0);
+
+  // basic_socket_iostream constructors.
+
+  ip::tcp::iostream ios1;
+
+#if defined(BOOST_ASIO_HAS_STD_IOSTREAM_MOVE)
+  ip::tcp::iostream ios2(std::move(sock));
+#endif // defined(BOOST_ASIO_HAS_STD_IOSTREAM_MOVE)
+
+  ip::tcp::iostream ios3("hostname", "service");
+
+  // basic_socket_iostream operators.
+
+#if defined(BOOST_ASIO_HAS_STD_IOSTREAM_MOVE)
+  ios1 = ip::tcp::iostream();
+
+  ios2 = std::move(ios1);
+#endif // defined(BOOST_ASIO_HAS_STD_IOSTREAM_MOVE)
+
+  // basic_socket_iostream members.
+
+  ios1.connect("hostname", "service");
+
+  ios1.close();
+
+  (void)static_cast<std::streambuf*>(ios1.rdbuf());
+
+#if defined(BOOST_ASIO_ENABLE_OLD_SERVICES)
+  basic_socket<ip::tcp, stream_socket_service<ip::tcp> >& sref = ios1.socket();
+#else // defined(BOOST_ASIO_ENABLE_OLD_SERVICES)
+  basic_socket<ip::tcp>& sref = ios1.socket();
+#endif // defined(BOOST_ASIO_ENABLE_OLD_SERVICES)
+  (void)sref;
+
+  boost::system::error_code ec = ios1.error();
+  (void)ec;
+
+  ip::tcp::iostream::time_point tp = ios1.expiry();
+  (void)tp;
+
+  ios1.expires_at(tp);
+
+  ip::tcp::iostream::duration d;
+  ios1.expires_after(d);
+
+  // iostream operators.
+
+  int i = 0;
+  ios1 >> i;
+  ios1 << i;
+#endif // !defined(BOOST_ASIO_NO_IOSTREAM)
+}
+
+} // namespace ip_tcp_iostream_compile
+
+//------------------------------------------------------------------------------
+
 BOOST_ASIO_TEST_SUITE
 (
   "ip/tcp",
@@ -928,4 +1392,7 @@ BOOST_ASIO_TEST_SUITE
   BOOST_ASIO_TEST_CASE(ip_tcp_acceptor_compile::test)
   BOOST_ASIO_TEST_CASE(ip_tcp_acceptor_runtime::test)
   BOOST_ASIO_TEST_CASE(ip_tcp_resolver_compile::test)
+  BOOST_ASIO_TEST_CASE(ip_tcp_resolver_entry_compile::test)
+  BOOST_ASIO_TEST_CASE(ip_tcp_resolver_entry_compile::test)
+  BOOST_ASIO_COMPILE_TEST_CASE(ip_tcp_iostream_compile::test)
 )