From 44ec6d2e0ee569202b75b73eea40972595866779 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Mon, 15 Nov 2021 04:15:13 +1100 Subject: 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. --- 3rdparty/asio/src/examples/cpp03/tutorial/timer2/.gitignore | 10 ---------- 3rdparty/asio/src/examples/cpp03/tutorial/timer2/timer.cpp | 5 ++--- 2 files changed, 2 insertions(+), 13 deletions(-) delete mode 100644 3rdparty/asio/src/examples/cpp03/tutorial/timer2/.gitignore (limited to '3rdparty/asio/src/examples/cpp03/tutorial/timer2') diff --git a/3rdparty/asio/src/examples/cpp03/tutorial/timer2/.gitignore b/3rdparty/asio/src/examples/cpp03/tutorial/timer2/.gitignore deleted file mode 100644 index 1d47ca67c43..00000000000 --- a/3rdparty/asio/src/examples/cpp03/tutorial/timer2/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -timer -.deps -.dirstamp -*.o -*.obj -*.exe -*.ilk -*.manifest -*.pdb -*.tds diff --git a/3rdparty/asio/src/examples/cpp03/tutorial/timer2/timer.cpp b/3rdparty/asio/src/examples/cpp03/tutorial/timer2/timer.cpp index 3275c22c2f6..10f0b528a44 100644 --- a/3rdparty/asio/src/examples/cpp03/tutorial/timer2/timer.cpp +++ b/3rdparty/asio/src/examples/cpp03/tutorial/timer2/timer.cpp @@ -2,7 +2,7 @@ // timer.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) @@ -10,7 +10,6 @@ #include #include -#include void print(const asio::error_code& /*e*/) { @@ -21,7 +20,7 @@ int main() { asio::io_context io; - asio::deadline_timer t(io, boost::posix_time::seconds(5)); + asio::steady_timer t(io, asio::chrono::seconds(5)); t.async_wait(&print); io.run(); -- cgit v1.2.3