passenger 6.0.19 → 6.0.21

data/src/cxx_supportlib/vendor-modified/boost/asio/io_context_strand.hpp

@@ -2,7 +2,7 @@
 // io_context_strand.hpp
 // ~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2022 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)
@@ -65,8 +65,7 @@ namespace asio {
  * @li @c s.dispatch(a) happens-before @c s.dispatch(b), where both are
  * performed outside the strand
  *   
- * then @c asio_handler_invoke(a1, &a1) happens-before
- * @c asio_handler_invoke(b1, &b1).
+ * then @c a() happens-before @c b()
  * 
  * Note that in the following case:
  * @code async_op_1(..., s.wrap(a));
@@ -110,6 +109,17 @@ public:
     service_.construct(impl_);
   }
 
+  /// Copy constructor.
+  /**
+   * Creates a copy such that both strand objects share the same underlying
+   * state.
+   */
+  strand(const strand& other) noexcept
+    : service_(other.service_),
+      impl_(other.impl_)
+  {
+  }
+
   /// Destructor.
   /**
    * Destroys a strand.
@@ -122,7 +132,7 @@ public:
   }
 
   /// Obtain the underlying execution context.
-  boost::asio::io_context& context() const BOOST_ASIO_NOEXCEPT
+  boost::asio::io_context& context() const noexcept
   {
     return service_.get_io_context();
   }
@@ -131,7 +141,7 @@ public:
   /**
    * The strand delegates this call to its underlying io_context.
    */
-  void on_work_started() const BOOST_ASIO_NOEXCEPT
+  void on_work_started() const noexcept
   {
     context().get_executor().on_work_started();
   }
@@ -140,7 +150,7 @@ public:
   /**
    * The strand delegates this call to its underlying io_context.
    */
-  void on_work_finished() const BOOST_ASIO_NOEXCEPT
+  void on_work_finished() const noexcept
   {
     context().get_executor().on_work_finished();
   }
@@ -161,9 +171,9 @@ public:
    * internal storage needed for function invocation.
    */
   template <typename Function, typename Allocator>
-  void dispatch(BOOST_ASIO_MOVE_ARG(Function) f, const Allocator& a) const
+  void dispatch(Function&& f, const Allocator& a) const
   {
-    typename decay<Function>::type tmp(BOOST_ASIO_MOVE_CAST(Function)(f));
+    decay_t<Function> tmp(static_cast<Function&&>(f));
     service_.dispatch(impl_, tmp);
     (void)a;
   }
@@ -190,11 +200,10 @@ public:
    * @code void handler(); @endcode
    */
   template <typename LegacyCompletionHandler>
-  BOOST_ASIO_INITFN_AUTO_RESULT_TYPE_PREFIX(LegacyCompletionHandler, void ())
-  dispatch(BOOST_ASIO_MOVE_ARG(LegacyCompletionHandler) handler)
-    BOOST_ASIO_INITFN_AUTO_RESULT_TYPE_SUFFIX((
+  auto dispatch(LegacyCompletionHandler&& handler)
+    -> decltype(
       async_initiate<LegacyCompletionHandler, void ()>(
-          declval<initiate_dispatch>(), handler, this)))
+        declval<initiate_dispatch>(), handler, this))
   {
     return async_initiate<LegacyCompletionHandler, void ()>(
         initiate_dispatch(), handler, this);
@@ -215,9 +224,9 @@ public:
    * internal storage needed for function invocation.
    */
   template <typename Function, typename Allocator>
-  void post(BOOST_ASIO_MOVE_ARG(Function) f, const Allocator& a) const
+  void post(Function&& f, const Allocator& a) const
   {
-    typename decay<Function>::type tmp(BOOST_ASIO_MOVE_CAST(Function)(f));
+    decay_t<Function> tmp(static_cast<Function&&>(f));
     service_.post(impl_, tmp);
     (void)a;
   }
@@ -240,11 +249,10 @@ public:
    * @code void handler(); @endcode
    */
   template <typename LegacyCompletionHandler>
-  BOOST_ASIO_INITFN_AUTO_RESULT_TYPE_PREFIX(LegacyCompletionHandler, void ())
-  post(BOOST_ASIO_MOVE_ARG(LegacyCompletionHandler) handler)
-    BOOST_ASIO_INITFN_AUTO_RESULT_TYPE_SUFFIX((
+  auto post(LegacyCompletionHandler&& handler)
+    -> decltype(
       async_initiate<LegacyCompletionHandler, void ()>(
-          declval<initiate_post>(), handler, this)))
+        declval<initiate_post>(), handler, this))
   {
     return async_initiate<LegacyCompletionHandler, void ()>(
         initiate_post(), handler, this);
@@ -265,9 +273,9 @@ public:
    * internal storage needed for function invocation.
    */
   template <typename Function, typename Allocator>
-  void defer(BOOST_ASIO_MOVE_ARG(Function) f, const Allocator& a) const
+  void defer(Function&& f, const Allocator& a) const
   {
-    typename decay<Function>::type tmp(BOOST_ASIO_MOVE_CAST(Function)(f));
+    decay_t<Function> tmp(static_cast<Function&&>(f));
     service_.post(impl_, tmp);
     (void)a;
   }
@@ -313,7 +321,7 @@ public:
    * submitted to the strand using post(), dispatch() or wrap(). Otherwise
    * returns @c false.
    */
-  bool running_in_this_thread() const BOOST_ASIO_NOEXCEPT
+  bool running_in_this_thread() const noexcept
   {
     return service_.running_in_this_thread(impl_);
   }
@@ -323,7 +331,7 @@ public:
    * Two strands are equal if they refer to the same ordered, non-concurrent
    * state.
    */
-  friend bool operator==(const strand& a, const strand& b) BOOST_ASIO_NOEXCEPT
+  friend bool operator==(const strand& a, const strand& b) noexcept
   {
     return a.impl_ == b.impl_;
   }
@@ -333,7 +341,7 @@ public:
    * Two strands are equal if they refer to the same ordered, non-concurrent
    * state.
    */
-  friend bool operator!=(const strand& a, const strand& b) BOOST_ASIO_NOEXCEPT
+  friend bool operator!=(const strand& a, const strand& b) noexcept
   {
     return a.impl_ != b.impl_;
   }
@@ -343,7 +351,7 @@ private:
   struct initiate_dispatch
   {
     template <typename LegacyCompletionHandler>
-    void operator()(BOOST_ASIO_MOVE_ARG(LegacyCompletionHandler) handler,
+    void operator()(LegacyCompletionHandler&& handler,
         strand* self) const
     {
       // If you get an error on the following line it means that your
@@ -360,7 +368,7 @@ private:
   struct initiate_post
   {
     template <typename LegacyCompletionHandler>
-    void operator()(BOOST_ASIO_MOVE_ARG(LegacyCompletionHandler) handler,
+    void operator()(LegacyCompletionHandler&& handler,
         strand* self) const
     {
       // If you get an error on the following line it means that your

data/src/cxx_supportlib/vendor-modified/boost/asio/io_service.hpp

@@ -2,7 +2,7 @@
 // io_service.hpp
 // ~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2022 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)

data/src/cxx_supportlib/vendor-modified/boost/asio/io_service_strand.hpp

@@ -2,7 +2,7 @@
 // io_service_strand.hpp
 // ~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2022 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)

data/src/cxx_supportlib/vendor-modified/boost/asio/ip/address.hpp

@@ -2,7 +2,7 @@
 // ip/address.hpp
 // ~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2022 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)
@@ -16,6 +16,7 @@
 #endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
 
 #include <boost/asio/detail/config.hpp>
+#include <functional>
 #include <string>
 #include <boost/asio/detail/throw_exception.hpp>
 #include <boost/asio/detail/string_view.hpp>
@@ -25,10 +26,6 @@
 #include <boost/asio/ip/address_v6.hpp>
 #include <boost/asio/ip/bad_address_cast.hpp>
 
-#if defined(BOOST_ASIO_HAS_STD_HASH)
-# include <functional>
-#endif // defined(BOOST_ASIO_HAS_STD_HASH)
-
 #if !defined(BOOST_ASIO_NO_IOSTREAM)
 # include <iosfwd>
 #endif // !defined(BOOST_ASIO_NO_IOSTREAM)
@@ -52,48 +49,44 @@ class address
 {
 public:
   /// Default constructor.
-  BOOST_ASIO_DECL address() BOOST_ASIO_NOEXCEPT;
+  BOOST_ASIO_DECL address() noexcept;
 
   /// Construct an address from an IPv4 address.
   BOOST_ASIO_DECL address(
-      const boost::asio::ip::address_v4& ipv4_address) BOOST_ASIO_NOEXCEPT;
+      const boost::asio::ip::address_v4& ipv4_address) noexcept;
 
   /// Construct an address from an IPv6 address.
   BOOST_ASIO_DECL address(
-      const boost::asio::ip::address_v6& ipv6_address) BOOST_ASIO_NOEXCEPT;
+      const boost::asio::ip::address_v6& ipv6_address) noexcept;
 
   /// Copy constructor.
-  BOOST_ASIO_DECL address(const address& other) BOOST_ASIO_NOEXCEPT;
+  BOOST_ASIO_DECL address(const address& other) noexcept;
 
-#if defined(BOOST_ASIO_HAS_MOVE)
   /// Move constructor.
-  BOOST_ASIO_DECL address(address&& other) BOOST_ASIO_NOEXCEPT;
-#endif // defined(BOOST_ASIO_HAS_MOVE)
+  BOOST_ASIO_DECL address(address&& other) noexcept;
 
   /// Assign from another address.
-  BOOST_ASIO_DECL address& operator=(const address& other) BOOST_ASIO_NOEXCEPT;
+  BOOST_ASIO_DECL address& operator=(const address& other) noexcept;
 
-#if defined(BOOST_ASIO_HAS_MOVE)
   /// Move-assign from another address.
-  BOOST_ASIO_DECL address& operator=(address&& other) BOOST_ASIO_NOEXCEPT;
-#endif // defined(BOOST_ASIO_HAS_MOVE)
+  BOOST_ASIO_DECL address& operator=(address&& other) noexcept;
 
   /// Assign from an IPv4 address.
   BOOST_ASIO_DECL address& operator=(
-      const boost::asio::ip::address_v4& ipv4_address) BOOST_ASIO_NOEXCEPT;
+      const boost::asio::ip::address_v4& ipv4_address) noexcept;
 
   /// Assign from an IPv6 address.
   BOOST_ASIO_DECL address& operator=(
-      const boost::asio::ip::address_v6& ipv6_address) BOOST_ASIO_NOEXCEPT;
+      const boost::asio::ip::address_v6& ipv6_address) noexcept;
 
   /// Get whether the address is an IP version 4 address.
-  bool is_v4() const BOOST_ASIO_NOEXCEPT
+  bool is_v4() const noexcept
   {
     return type_ == ipv4;
   }
 
   /// Get whether the address is an IP version 6 address.
-  bool is_v6() const BOOST_ASIO_NOEXCEPT
+  bool is_v6() const noexcept
   {
     return type_ == ipv6;
   }
@@ -134,46 +127,46 @@ public:
 #endif // !defined(BOOST_ASIO_NO_DEPRECATED)
 
   /// Determine whether the address is a loopback address.
-  BOOST_ASIO_DECL bool is_loopback() const BOOST_ASIO_NOEXCEPT;
+  BOOST_ASIO_DECL bool is_loopback() const noexcept;
 
   /// Determine whether the address is unspecified.
-  BOOST_ASIO_DECL bool is_unspecified() const BOOST_ASIO_NOEXCEPT;
+  BOOST_ASIO_DECL bool is_unspecified() const noexcept;
 
   /// Determine whether the address is a multicast address.
-  BOOST_ASIO_DECL bool is_multicast() const BOOST_ASIO_NOEXCEPT;
+  BOOST_ASIO_DECL bool is_multicast() const noexcept;
 
   /// Compare two addresses for equality.
   BOOST_ASIO_DECL friend bool operator==(const address& a1,
-      const address& a2) BOOST_ASIO_NOEXCEPT;
+      const address& a2) noexcept;
 
   /// Compare two addresses for inequality.
   friend bool operator!=(const address& a1,
-      const address& a2) BOOST_ASIO_NOEXCEPT
+      const address& a2) noexcept
   {
     return !(a1 == a2);
   }
 
   /// Compare addresses for ordering.
   BOOST_ASIO_DECL friend bool operator<(const address& a1,
-      const address& a2) BOOST_ASIO_NOEXCEPT;
+      const address& a2) noexcept;
 
   /// Compare addresses for ordering.
   friend bool operator>(const address& a1,
-      const address& a2) BOOST_ASIO_NOEXCEPT
+      const address& a2) noexcept
   {
     return a2 < a1;
   }
 
   /// Compare addresses for ordering.
   friend bool operator<=(const address& a1,
-      const address& a2) BOOST_ASIO_NOEXCEPT
+      const address& a2) noexcept
   {
     return !(a2 < a1);
   }
 
   /// Compare addresses for ordering.
   friend bool operator>=(const address& a1,
-      const address& a2) BOOST_ASIO_NOEXCEPT
+      const address& a2) noexcept
   {
     return !(a1 < a2);
   }
@@ -202,7 +195,7 @@ BOOST_ASIO_DECL address make_address(const char* str);
  * @relates address
  */
 BOOST_ASIO_DECL address make_address(const char* str,
-    boost::system::error_code& ec) BOOST_ASIO_NOEXCEPT;
+    boost::system::error_code& ec) noexcept;
 
 /// Create an address from an IPv4 address string in dotted decimal form,
 /// or from an IPv6 address in hexadecimal notation.
@@ -217,7 +210,7 @@ BOOST_ASIO_DECL address make_address(const std::string& str);
  * @relates address
  */
 BOOST_ASIO_DECL address make_address(const std::string& str,
-    boost::system::error_code& ec) BOOST_ASIO_NOEXCEPT;
+    boost::system::error_code& ec) noexcept;
 
 #if defined(BOOST_ASIO_HAS_STRING_VIEW) \
   || defined(GENERATING_DOCUMENTATION)
@@ -235,7 +228,7 @@ BOOST_ASIO_DECL address make_address(string_view str);
  * @relates address
  */
 BOOST_ASIO_DECL address make_address(string_view str,
-    boost::system::error_code& ec) BOOST_ASIO_NOEXCEPT;
+    boost::system::error_code& ec) noexcept;
 
 #endif // defined(BOOST_ASIO_HAS_STRING_VIEW)
        //  || defined(GENERATING_DOCUMENTATION)
@@ -264,14 +257,13 @@ std::basic_ostream<Elem, Traits>& operator<<(
 } // namespace asio
 } // namespace boost
 
-#if defined(BOOST_ASIO_HAS_STD_HASH)
 namespace std {
 
 template <>
 struct hash<boost::asio::ip::address>
 {
   std::size_t operator()(const boost::asio::ip::address& addr)
-    const BOOST_ASIO_NOEXCEPT
+    const noexcept
   {
     return addr.is_v4()
       ? std::hash<boost::asio::ip::address_v4>()(addr.to_v4())
@@ -280,7 +272,6 @@ struct hash<boost::asio::ip::address>
 };
 
 } // namespace std
-#endif // defined(BOOST_ASIO_HAS_STD_HASH)
 
 #include <boost/asio/detail/pop_options.hpp>
 

data/src/cxx_supportlib/vendor-modified/boost/asio/ip/address_v4.hpp

@@ -2,7 +2,7 @@
 // ip/address_v4.hpp
 // ~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2022 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)
@@ -16,6 +16,7 @@
 #endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
 
 #include <boost/asio/detail/config.hpp>
+#include <functional>
 #include <string>
 #include <boost/asio/detail/array.hpp>
 #include <boost/asio/detail/cstdint.hpp>
@@ -24,10 +25,6 @@
 #include <boost/asio/detail/winsock_init.hpp>
 #include <boost/system/error_code.hpp>
 
-#if defined(BOOST_ASIO_HAS_STD_HASH)
-# include <functional>
-#endif // defined(BOOST_ASIO_HAS_STD_HASH)
-
 #if !defined(BOOST_ASIO_NO_IOSTREAM)
 # include <iosfwd>
 #endif // !defined(BOOST_ASIO_NO_IOSTREAM)
@@ -70,7 +67,7 @@ public:
    * @li <tt>to_bytes()</tt> yields <tt>{0, 0, 0, 0}</tt>; and
    * @li <tt>to_uint() == 0</tt>.
    */
-  address_v4() BOOST_ASIO_NOEXCEPT
+  address_v4() noexcept
   {
     addr_.s_addr = 0;
   }
@@ -93,43 +90,40 @@ public:
   BOOST_ASIO_DECL explicit address_v4(uint_type addr);
 
   /// Copy constructor.
-  address_v4(const address_v4& other) BOOST_ASIO_NOEXCEPT
+  address_v4(const address_v4& other) noexcept
     : addr_(other.addr_)
   {
   }
 
-#if defined(BOOST_ASIO_HAS_MOVE)
   /// Move constructor.
-  address_v4(address_v4&& other) BOOST_ASIO_NOEXCEPT
+  address_v4(address_v4&& other) noexcept
     : addr_(other.addr_)
   {
   }
-#endif // defined(BOOST_ASIO_HAS_MOVE)
 
   /// Assign from another address.
-  address_v4& operator=(const address_v4& other) BOOST_ASIO_NOEXCEPT
+  address_v4& operator=(const address_v4& other) noexcept
   {
     addr_ = other.addr_;
     return *this;
   }
 
-#if defined(BOOST_ASIO_HAS_MOVE)
   /// Move-assign from another address.
-  address_v4& operator=(address_v4&& other) BOOST_ASIO_NOEXCEPT
+  address_v4& operator=(address_v4&& other) noexcept
   {
     addr_ = other.addr_;
     return *this;
   }
-#endif // defined(BOOST_ASIO_HAS_MOVE)
 
   /// Get the address in bytes, in network byte order.
-  BOOST_ASIO_DECL bytes_type to_bytes() const BOOST_ASIO_NOEXCEPT;
+  BOOST_ASIO_DECL bytes_type to_bytes() const noexcept;
 
-  /// Get the address as an unsigned integer in host byte order
-  BOOST_ASIO_DECL uint_type to_uint() const BOOST_ASIO_NOEXCEPT;
+  /// Get the address as an unsigned integer in host byte order.
+  BOOST_ASIO_DECL uint_type to_uint() const noexcept;
 
 #if !defined(BOOST_ASIO_NO_DEPRECATED)
-  /// Get the address as an unsigned long in host byte order
+  /// (Deprecated: Use to_uint().) Get the address as an unsigned long in host
+  /// byte order.
   BOOST_ASIO_DECL unsigned long to_ulong() const;
 #endif // !defined(BOOST_ASIO_NO_DEPRECATED)
 
@@ -168,7 +162,7 @@ public:
    *
    * @returns <tt>(to_uint() & 0xFF000000) == 0x7F000000</tt>.
    */
-  BOOST_ASIO_DECL bool is_loopback() const BOOST_ASIO_NOEXCEPT;
+  BOOST_ASIO_DECL bool is_loopback() const noexcept;
 
   /// Determine whether the address is unspecified.
   /**
@@ -177,7 +171,7 @@ public:
    *
    * @returns <tt>to_uint() == 0</tt>.
    */
-  BOOST_ASIO_DECL bool is_unspecified() const BOOST_ASIO_NOEXCEPT;
+  BOOST_ASIO_DECL bool is_unspecified() const noexcept;
 
 #if !defined(BOOST_ASIO_NO_DEPRECATED)
   /// (Deprecated: Use network_v4 class.) Determine whether the address is a
@@ -201,18 +195,18 @@ public:
    *
    * @returns <tt>(to_uint() & 0xF0000000) == 0xE0000000</tt>.
    */
-  BOOST_ASIO_DECL bool is_multicast() const BOOST_ASIO_NOEXCEPT;
+  BOOST_ASIO_DECL bool is_multicast() const noexcept;
 
   /// Compare two addresses for equality.
   friend bool operator==(const address_v4& a1,
-      const address_v4& a2) BOOST_ASIO_NOEXCEPT
+      const address_v4& a2) noexcept
   {
     return a1.addr_.s_addr == a2.addr_.s_addr;
   }
 
   /// Compare two addresses for inequality.
   friend bool operator!=(const address_v4& a1,
-      const address_v4& a2) BOOST_ASIO_NOEXCEPT
+      const address_v4& a2) noexcept
   {
     return a1.addr_.s_addr != a2.addr_.s_addr;
   }
@@ -224,7 +218,7 @@ public:
    * @returns <tt>a1.to_uint() < a2.to_uint()</tt>.
    */
   friend bool operator<(const address_v4& a1,
-      const address_v4& a2) BOOST_ASIO_NOEXCEPT
+      const address_v4& a2) noexcept
   {
     return a1.to_uint() < a2.to_uint();
   }
@@ -236,7 +230,7 @@ public:
    * @returns <tt>a1.to_uint() > a2.to_uint()</tt>.
    */
   friend bool operator>(const address_v4& a1,
-      const address_v4& a2) BOOST_ASIO_NOEXCEPT
+      const address_v4& a2) noexcept
   {
     return a1.to_uint() > a2.to_uint();
   }
@@ -248,7 +242,7 @@ public:
    * @returns <tt>a1.to_uint() <= a2.to_uint()</tt>.
    */
   friend bool operator<=(const address_v4& a1,
-      const address_v4& a2) BOOST_ASIO_NOEXCEPT
+      const address_v4& a2) noexcept
   {
     return a1.to_uint() <= a2.to_uint();
   }
@@ -260,7 +254,7 @@ public:
    * @returns <tt>a1.to_uint() >= a2.to_uint()</tt>.
    */
   friend bool operator>=(const address_v4& a1,
-      const address_v4& a2) BOOST_ASIO_NOEXCEPT
+      const address_v4& a2) noexcept
   {
     return a1.to_uint() >= a2.to_uint();
   }
@@ -272,7 +266,7 @@ public:
    *
    * @returns A default-constructed @c address_v4 object.
    */
-  static address_v4 any() BOOST_ASIO_NOEXCEPT
+  static address_v4 any() noexcept
   {
     return address_v4();
   }
@@ -284,7 +278,7 @@ public:
    *
    * @returns <tt>address_v4(0x7F000001)</tt>.
    */
-  static address_v4 loopback() BOOST_ASIO_NOEXCEPT
+  static address_v4 loopback() noexcept
   {
     return address_v4(0x7F000001);
   }
@@ -296,7 +290,7 @@ public:
    *
    * @returns <tt>address_v4(0xFFFFFFFF)</tt>.
    */
-  static address_v4 broadcast() BOOST_ASIO_NOEXCEPT
+  static address_v4 broadcast() noexcept
   {
     return address_v4(0xFFFFFFFF);
   }
@@ -347,7 +341,7 @@ BOOST_ASIO_DECL address_v4 make_address_v4(const char* str);
  * @relates address_v4
  */
 BOOST_ASIO_DECL address_v4 make_address_v4(const char* str,
-    boost::system::error_code& ec) BOOST_ASIO_NOEXCEPT;
+    boost::system::error_code& ec) noexcept;
 
 /// Create an IPv4 address from an IP address string in dotted decimal form.
 /**
@@ -360,7 +354,7 @@ BOOST_ASIO_DECL address_v4 make_address_v4(const std::string& str);
  * @relates address_v4
  */
 BOOST_ASIO_DECL address_v4 make_address_v4(const std::string& str,
-    boost::system::error_code& ec) BOOST_ASIO_NOEXCEPT;
+    boost::system::error_code& ec) noexcept;
 
 #if defined(BOOST_ASIO_HAS_STRING_VIEW) \
   || defined(GENERATING_DOCUMENTATION)
@@ -376,7 +370,7 @@ BOOST_ASIO_DECL address_v4 make_address_v4(string_view str);
  * @relates address_v4
  */
 BOOST_ASIO_DECL address_v4 make_address_v4(string_view str,
-    boost::system::error_code& ec) BOOST_ASIO_NOEXCEPT;
+    boost::system::error_code& ec) noexcept;
 
 #endif // defined(BOOST_ASIO_HAS_STRING_VIEW)
        //  || defined(GENERATING_DOCUMENTATION)
@@ -405,21 +399,19 @@ std::basic_ostream<Elem, Traits>& operator<<(
 } // namespace asio
 } // namespace boost
 
-#if defined(BOOST_ASIO_HAS_STD_HASH)
 namespace std {
 
 template <>
 struct hash<boost::asio::ip::address_v4>
 {
   std::size_t operator()(const boost::asio::ip::address_v4& addr)
-    const BOOST_ASIO_NOEXCEPT
+    const noexcept
   {
     return std::hash<unsigned int>()(addr.to_uint());
   }
 };
 
 } // namespace std
-#endif // defined(BOOST_ASIO_HAS_STD_HASH)
 
 #include <boost/asio/detail/pop_options.hpp>