diff options
Diffstat (limited to '3rdparty/asio/include/asio/ip/address_v6_iterator.hpp')
-rw-r--r-- | 3rdparty/asio/include/asio/ip/address_v6_iterator.hpp | 31 |
1 files changed, 13 insertions, 18 deletions
diff --git a/3rdparty/asio/include/asio/ip/address_v6_iterator.hpp b/3rdparty/asio/include/asio/ip/address_v6_iterator.hpp index 947af07b028..5116f614f08 100644 --- a/3rdparty/asio/include/asio/ip/address_v6_iterator.hpp +++ b/3rdparty/asio/include/asio/ip/address_v6_iterator.hpp @@ -2,7 +2,7 @@ // ip/address_v6_iterator.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com) // Oliver Kowalke (oliver dot kowalke at gmail dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying @@ -54,58 +54,53 @@ public: typedef std::input_iterator_tag iterator_category; /// Construct an iterator that points to the specified address. - basic_address_iterator(const address_v6& addr) ASIO_NOEXCEPT + basic_address_iterator(const address_v6& addr) noexcept : address_(addr) { } /// Copy constructor. basic_address_iterator( - const basic_address_iterator& other) ASIO_NOEXCEPT + const basic_address_iterator& other) noexcept : address_(other.address_) { } -#if defined(ASIO_HAS_MOVE) /// Move constructor. - basic_address_iterator(basic_address_iterator&& other) ASIO_NOEXCEPT - : address_(ASIO_MOVE_CAST(address_v6)(other.address_)) + basic_address_iterator(basic_address_iterator&& other) noexcept + : address_(static_cast<address_v6&&>(other.address_)) { } -#endif // defined(ASIO_HAS_MOVE) /// Assignment operator. basic_address_iterator& operator=( - const basic_address_iterator& other) ASIO_NOEXCEPT + const basic_address_iterator& other) noexcept { address_ = other.address_; return *this; } -#if defined(ASIO_HAS_MOVE) /// Move assignment operator. - basic_address_iterator& operator=( - basic_address_iterator&& other) ASIO_NOEXCEPT + basic_address_iterator& operator=(basic_address_iterator&& other) noexcept { - address_ = ASIO_MOVE_CAST(address_v6)(other.address_); + address_ = static_cast<address_v6&&>(other.address_); return *this; } -#endif // defined(ASIO_HAS_MOVE) /// Dereference the iterator. - const address_v6& operator*() const ASIO_NOEXCEPT + const address_v6& operator*() const noexcept { return address_; } /// Dereference the iterator. - const address_v6* operator->() const ASIO_NOEXCEPT + const address_v6* operator->() const noexcept { return &address_; } /// Pre-increment operator. - basic_address_iterator& operator++() ASIO_NOEXCEPT + basic_address_iterator& operator++() noexcept { for (int i = 15; i >= 0; --i) { @@ -122,7 +117,7 @@ public: } /// Post-increment operator. - basic_address_iterator operator++(int) ASIO_NOEXCEPT + basic_address_iterator operator++(int) noexcept { basic_address_iterator tmp(*this); ++*this; @@ -130,7 +125,7 @@ public: } /// Pre-decrement operator. - basic_address_iterator& operator--() ASIO_NOEXCEPT + basic_address_iterator& operator--() noexcept { for (int i = 15; i >= 0; --i) { |