diff options
Diffstat (limited to '3rdparty/asio/src/tests/unit/deadline_timer.cpp')
-rw-r--r-- | 3rdparty/asio/src/tests/unit/deadline_timer.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/3rdparty/asio/src/tests/unit/deadline_timer.cpp b/3rdparty/asio/src/tests/unit/deadline_timer.cpp index 15d00b0d83b..9bc7f16fcd2 100644 --- a/3rdparty/asio/src/tests/unit/deadline_timer.cpp +++ b/3rdparty/asio/src/tests/unit/deadline_timer.cpp @@ -2,7 +2,7 @@ // deadline_timer.cpp // ~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2024 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) @@ -268,18 +268,18 @@ struct custom_allocation_timer_handler typedef allocator<U> other; }; - explicit allocator(int* count) ASIO_NOEXCEPT + explicit allocator(int* count) noexcept : count_(count) { } - allocator(const allocator& other) ASIO_NOEXCEPT + allocator(const allocator& other) noexcept : count_(other.count_) { } template <typename U> - allocator(const allocator<U>& other) ASIO_NOEXCEPT + allocator(const allocator<U>& other) noexcept : count_(other.count_) { } @@ -316,7 +316,7 @@ struct custom_allocation_timer_handler typedef allocator<int> allocator_type; - allocator_type get_allocator() const ASIO_NOEXCEPT + allocator_type get_allocator() const noexcept { return allocator_type(count_); } @@ -396,7 +396,6 @@ void deadline_timer_async_result_test() ioc.run(); } -#if defined(ASIO_HAS_MOVE) asio::deadline_timer make_timer(asio::io_context& ioc, int* count) { asio::deadline_timer t(ioc); @@ -404,11 +403,9 @@ asio::deadline_timer make_timer(asio::io_context& ioc, int* count) t.async_wait(boost::bind(increment, count)); return t; } -#endif // defined(ASIO_HAS_MOVE) void deadline_timer_move_test() { -#if defined(ASIO_HAS_MOVE) asio::io_context io_context1; asio::io_context io_context2; int count = 0; @@ -426,7 +423,6 @@ void deadline_timer_move_test() io_context1.run(); ASIO_CHECK(count == 2); -#endif // defined(ASIO_HAS_MOVE) } ASIO_TEST_SUITE |