diff options
Diffstat (limited to '3rdparty/asio/include/asio/ip/basic_resolver_iterator.hpp')
-rw-r--r-- | 3rdparty/asio/include/asio/ip/basic_resolver_iterator.hpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/3rdparty/asio/include/asio/ip/basic_resolver_iterator.hpp b/3rdparty/asio/include/asio/ip/basic_resolver_iterator.hpp index e93cf1f797b..b494f7ae02c 100644 --- a/3rdparty/asio/include/asio/ip/basic_resolver_iterator.hpp +++ b/3rdparty/asio/include/asio/ip/basic_resolver_iterator.hpp @@ -2,7 +2,7 @@ // ip/basic_resolver_iterator.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// 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) @@ -79,15 +79,13 @@ public: { } -#if defined(ASIO_HAS_MOVE) || defined(GENERATING_DOCUMENTATION) /// Move constructor. basic_resolver_iterator(basic_resolver_iterator&& other) - : values_(ASIO_MOVE_CAST(values_ptr_type)(other.values_)), + : values_(static_cast<values_ptr_type&&>(other.values_)), index_(other.index_) { other.index_ = 0; } -#endif // defined(ASIO_HAS_MOVE) || defined(GENERATING_DOCUMENTATION) /// Assignment operator. basic_resolver_iterator& operator=(const basic_resolver_iterator& other) @@ -97,20 +95,18 @@ public: return *this; } -#if defined(ASIO_HAS_MOVE) || defined(GENERATING_DOCUMENTATION) /// Move-assignment operator. basic_resolver_iterator& operator=(basic_resolver_iterator&& other) { if (this != &other) { - values_ = ASIO_MOVE_CAST(values_ptr_type)(other.values_); + values_ = static_cast<values_ptr_type&&>(other.values_); index_ = other.index_; other.index_ = 0; } return *this; } -#endif // defined(ASIO_HAS_MOVE) || defined(GENERATING_DOCUMENTATION) /// Dereference an iterator. const basic_resolver_entry<InternetProtocol>& operator*() const @@ -178,7 +174,7 @@ protected: return (*values_)[index_]; } - typedef std::vector<basic_resolver_entry<InternetProtocol> > values_type; + typedef std::vector<basic_resolver_entry<InternetProtocol>> values_type; typedef asio::detail::shared_ptr<values_type> values_ptr_type; values_ptr_type values_; std::size_t index_; |