import new upstream nautilus stable release 14.2.8

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

diff --git a/ceph/src/boost/boost/asio/ip/tcp.hpp b/ceph/src/boost/boost/asio/ip/tcp.hpp
index dce1c8ee6a37829f2d2a1472ad9b18ce21f372d8..b73341bb5533f76443c88992b742e6cfd8dfec47 100644 (file)
--- a/ceph/src/boost/boost/asio/ip/tcp.hpp
+++ b/ceph/src/boost/boost/asio/ip/tcp.hpp
@@ -2,7 +2,7 @@
 // ip/tcp.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)
@@ -50,31 +50,31 @@ public:
   typedef basic_endpoint<tcp> endpoint;
 
   /// Construct to represent the IPv4 TCP protocol.
-  static tcp v4()
+  static tcp v4() BOOST_ASIO_NOEXCEPT
   {
     return tcp(BOOST_ASIO_OS_DEF(AF_INET));
   }
 
   /// Construct to represent the IPv6 TCP protocol.
-  static tcp v6()
+  static tcp v6() BOOST_ASIO_NOEXCEPT
   {
     return tcp(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_STREAM);
   }
 
   /// Obtain an identifier for the protocol.
-  int protocol() const
+  int protocol() const BOOST_ASIO_NOEXCEPT
   {
     return BOOST_ASIO_OS_DEF(IPPROTO_TCP);
   }
 
   /// Obtain an identifier for the protocol family.
-  int family() const
+  int family() const BOOST_ASIO_NOEXCEPT
   {
     return family_;
   }
@@ -100,7 +100,7 @@ public:
    * @par Examples
    * Setting the option:
    * @code
-   * boost::asio::ip::tcp::socket socket(io_context); 
+   * boost::asio::ip::tcp::socket socket(my_context);
    * ...
    * boost::asio::ip::tcp::no_delay option(true);
    * socket.set_option(option);
@@ -109,7 +109,7 @@ public:
    * @par
    * Getting the current option value:
    * @code
-   * boost::asio::ip::tcp::socket socket(io_context); 
+   * boost::asio::ip::tcp::socket socket(my_context);
    * ...
    * boost::asio::ip::tcp::no_delay option;
    * socket.get_option(option);
@@ -140,7 +140,7 @@ public:
 
 private:
   // Construct with a specific family.
-  explicit tcp(int protocol_family)
+  explicit tcp(int protocol_family) BOOST_ASIO_NOEXCEPT
     : family_(protocol_family)
   {
   }