import new upstream nautilus stable release 14.2.8

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

diff --git a/ceph/src/boost/boost/asio/ip/bad_address_cast.hpp b/ceph/src/boost/boost/asio/ip/bad_address_cast.hpp
index 4e62bcd32b73aea8bf20356ab0bacd2e21df0a34..da06983301d09561f52f5215f198dc518e33abd6 100644 (file)
--- a/ceph/src/boost/boost/asio/ip/bad_address_cast.hpp
+++ b/ceph/src/boost/boost/asio/ip/bad_address_cast.hpp
@@ -2,7 +2,7 @@
 // ip/bad_address_cast.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)
@@ -25,7 +25,12 @@ namespace asio {
 namespace ip {
 
 /// Thrown to indicate a failed address conversion.
-class bad_address_cast : public std::bad_cast
+class bad_address_cast :
+#if defined(BOOST_ASIO_MSVC) && defined(_HAS_EXCEPTIONS) && !_HAS_EXCEPTIONS
+  public std::exception
+#else
+  public std::bad_cast
+#endif
 {
 public:
   /// Default constructor.