summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty/asio/src/tests/unit/ssl/stream.cpp
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2021-11-15 04:15:13 +1100
committer Vas Crabb <vas@vastheman.com>2021-11-15 04:15:13 +1100
commit44ec6d2e0ee569202b75b73eea40972595866779 (patch)
treeb286443c264704198789514e0594dc24b3ca9f96 /3rdparty/asio/src/tests/unit/ssl/stream.cpp
parent137f254b918f1f1ebee43dfbed86793b0dae73eb (diff)
3rdparty: Updated ASIO to version 1.20.0.
The doc folder isn't included as it's pretty big. This required include/asio/detail/win_iocp_socket_accept_op.hpp due to mismatched order in the member declarations and initialiser list for the win_iocp_socket_accept_op class. I reversed the declaration order so it matches win_iocp_socket_move_accept_op.
Diffstat (limited to '3rdparty/asio/src/tests/unit/ssl/stream.cpp')
-rw-r--r--3rdparty/asio/src/tests/unit/ssl/stream.cpp26
1 files changed, 15 insertions, 11 deletions
diff --git a/3rdparty/asio/src/tests/unit/ssl/stream.cpp b/3rdparty/asio/src/tests/unit/ssl/stream.cpp
index 542949eb60c..7a6eeb1f1f1 100644
--- a/3rdparty/asio/src/tests/unit/ssl/stream.cpp
+++ b/3rdparty/asio/src/tests/unit/ssl/stream.cpp
@@ -2,7 +2,7 @@
// stream.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)
@@ -75,19 +75,23 @@ void test()
ip::tcp::socket socket1(ioc, ip::tcp::v4());
ssl::stream<ip::tcp::socket&> stream2(socket1, context);
+#if defined(ASIO_HAS_MOVE)
+ ssl::stream<ip::tcp::socket> stream3
+ = ssl::stream<ip::tcp::socket>(ioc, context);
+ ssl::stream<ip::tcp::socket> stream4(std::move(stream3));
+#endif // defined(ASIO_HAS_MOVE)
+
+ // ssl::stream assignment.
+
+#if defined(ASIO_HAS_MOVE)
+ stream3 = std::move(stream4);
+#endif // defined(ASIO_HAS_MOVE)
+
// basic_io_object functions.
ssl::stream<ip::tcp::socket>::executor_type ex = stream1.get_executor();
(void)ex;
-#if !defined(ASIO_NO_DEPRECATED)
- io_context& ioc_ref = stream1.get_io_context();
- (void)ioc_ref;
-
- io_context& ioc_ref2 = stream1.get_io_service();
- (void)ioc_ref2;
-#endif // !defined(ASIO_NO_DEPRECATED)
-
// ssl::stream functions.
SSL* ssl1 = stream1.native_handle();
@@ -97,9 +101,9 @@ void test()
= stream1.lowest_layer();
(void)lowest_layer;
- const ssl::stream<ip::tcp::socket>& stream3 = stream1;
+ const ssl::stream<ip::tcp::socket>& stream5 = stream1;
const ssl::stream<ip::tcp::socket>::lowest_layer_type& lowest_layer2
- = stream3.lowest_layer();
+ = stream5.lowest_layer();
(void)lowest_layer2;
stream1.set_verify_mode(ssl::verify_none);