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. --- .../src/examples/cpp03/tutorial/timer5/timer.cpp | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to '3rdparty/asio/src/examples/cpp03/tutorial/timer5/timer.cpp') diff --git a/3rdparty/asio/src/examples/cpp03/tutorial/timer5/timer.cpp b/3rdparty/asio/src/examples/cpp03/tutorial/timer5/timer.cpp index a798e85aacf..f17c9d67f94 100644 --- a/3rdparty/asio/src/examples/cpp03/tutorial/timer5/timer.cpp +++ b/3rdparty/asio/src/examples/cpp03/tutorial/timer5/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,16 +10,15 @@ #include #include -#include -#include +#include class printer { public: printer(asio::io_context& io) - : strand_(io), - timer1_(io, boost::posix_time::seconds(1)), - timer2_(io, boost::posix_time::seconds(1)), + : strand_(asio::make_strand(io)), + timer1_(io, asio::chrono::seconds(1)), + timer2_(io, asio::chrono::seconds(1)), count_(0) { timer1_.async_wait(asio::bind_executor(strand_, @@ -41,7 +40,7 @@ public: std::cout << "Timer 1: " << count_ << std::endl; ++count_; - timer1_.expires_at(timer1_.expires_at() + boost::posix_time::seconds(1)); + timer1_.expires_at(timer1_.expiry() + asio::chrono::seconds(1)); timer1_.async_wait(asio::bind_executor(strand_, boost::bind(&printer::print1, this))); @@ -55,7 +54,7 @@ public: std::cout << "Timer 2: " << count_ << std::endl; ++count_; - timer2_.expires_at(timer2_.expires_at() + boost::posix_time::seconds(1)); + timer2_.expires_at(timer2_.expiry() + asio::chrono::seconds(1)); timer2_.async_wait(asio::bind_executor(strand_, boost::bind(&printer::print2, this))); @@ -63,9 +62,9 @@ public: } private: - asio::io_context::strand strand_; - asio::deadline_timer timer1_; - asio::deadline_timer timer2_; + asio::strand strand_; + asio::steady_timer timer1_; + asio::steady_timer timer2_; int count_; }; -- cgit v1.2.3