update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / boost / boost / asio / detail / type_traits.hpp

diff --git a/ceph/src/boost/boost/asio/detail/type_traits.hpp b/ceph/src/boost/boost/asio/detail/type_traits.hpp
index 1556e597e082165942abf3ab2bbe5293e386ce23..a0d4cb49027d5536bb00ca067ad500d87ee3a7f0 100644 (file)
--- a/ceph/src/boost/boost/asio/detail/type_traits.hpp
+++ b/ceph/src/boost/boost/asio/detail/type_traits.hpp
@@ -2,7 +2,7 @@
 // detail/type_traits.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2018 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)
@@ -54,7 +54,13 @@ using std::is_function;
 using std::is_same;
 using std::remove_pointer;
 using std::remove_reference;
+#if defined(BOOST_ASIO_HAS_STD_INVOKE_RESULT)
+template <typename> struct result_of;
+template <typename F, typename... Args>
+struct result_of<F(Args...)> : std::invoke_result<F, Args...> {};
+#else // defined(BOOST_ASIO_HAS_STD_INVOKE_RESULT)
 using std::result_of;
+#endif // defined(BOOST_ASIO_HAS_STD_INVOKE_RESULT)
 using std::true_type;
 #else // defined(BOOST_ASIO_HAS_STD_TYPE_TRAITS)
 using boost::add_const;