import new upstream nautilus stable release 14.2.8

[ceph.git] / ceph / src / boost / boost / asio / ip / icmp.hpp

diff --git a/ceph/src/boost/boost/asio/ip/icmp.hpp b/ceph/src/boost/boost/asio/ip/icmp.hpp
index 4b9d64204830f5bed141719fbf59b7fd4b59efbb..497307f40f10051fab49bfc4387284135206ef0d 100644 (file)
--- a/ceph/src/boost/boost/asio/ip/icmp.hpp
+++ b/ceph/src/boost/boost/asio/ip/icmp.hpp
@@ -2,7 +2,7 @@
 // ip/icmp.hpp
 // ~~~~~~~~~~~
 //
-// Copyright (c) 2003-2018 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2019 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)
@@ -47,33 +47,33 @@ public:
   typedef basic_endpoint<icmp> endpoint;
 
   /// Construct to represent the IPv4 ICMP protocol.
-  static icmp v4()
+  static icmp v4() BOOST_ASIO_NOEXCEPT
   {
     return icmp(BOOST_ASIO_OS_DEF(IPPROTO_ICMP),
         BOOST_ASIO_OS_DEF(AF_INET));
   }
 
   /// Construct to represent the IPv6 ICMP protocol.
-  static icmp v6()
+  static icmp v6() BOOST_ASIO_NOEXCEPT
   {
     return icmp(BOOST_ASIO_OS_DEF(IPPROTO_ICMPV6),
         BOOST_ASIO_OS_DEF(AF_INET6));
   }
 
   /// Obtain an identifier for the type of the protocol.
-  int type() const
+  int type() const BOOST_ASIO_NOEXCEPT
   {
     return BOOST_ASIO_OS_DEF(SOCK_RAW);
   }
 
   /// Obtain an identifier for the protocol.
-  int protocol() const
+  int protocol() const BOOST_ASIO_NOEXCEPT
   {
     return protocol_;
   }
 
   /// Obtain an identifier for the protocol family.
-  int family() const
+  int family() const BOOST_ASIO_NOEXCEPT
   {
     return family_;
   }
@@ -98,7 +98,7 @@ public:
 
 private:
   // Construct with a specific family.
-  explicit icmp(int protocol_id, int protocol_family)
+  explicit icmp(int protocol_id, int protocol_family) BOOST_ASIO_NOEXCEPT
     : protocol_(protocol_id),
       family_(protocol_family)
   {