import new upstream nautilus stable release 14.2.8

[ceph.git] / ceph / src / boost / boost / variant / detail / multivisitors_cpp11_based.hpp

diff --git a/ceph/src/boost/boost/variant/detail/multivisitors_cpp11_based.hpp b/ceph/src/boost/boost/variant/detail/multivisitors_cpp11_based.hpp
index 56aaf125c862fde24ee1152d289f28d79dc2442b..a29e2209c621c61277b2f709f28f0b1088dcabff 100644 (file)
--- a/ceph/src/boost/boost/variant/detail/multivisitors_cpp11_based.hpp
+++ b/ceph/src/boost/boost/variant/detail/multivisitors_cpp11_based.hpp
@@ -126,7 +126,7 @@ namespace detail { namespace variant {
         typedef typename Visitor::result_type result_type;
 
         template <typename Value>
-        BOOST_VARIANT_AUX_GENERIC_RESULT_TYPE(result_type) operator()(Value&& value) const
+        result_type operator()(Value&& value) const
         {
             return ::boost::apply_visitor(
                 make_one_by_one_visitor_and_value_referer(
@@ -159,12 +159,12 @@ namespace detail { namespace variant {
         typedef typename Visitor::result_type result_type;
 
         template <class Tuple, std::size_t... I>
-        BOOST_VARIANT_AUX_GENERIC_RESULT_TYPE(result_type) do_call(Tuple t, index_sequence<I...>) const {
+        result_type do_call(Tuple t, index_sequence<I...>) const {
             return visitor_(unwrap(std::get<I>(t))...);
         }
 
         template <typename Value>
-        BOOST_VARIANT_AUX_GENERIC_RESULT_TYPE(result_type) operator()(Value&& value) const
+        result_type operator()(Value&& value) const
         {
             return do_call(
                 std::tuple_cat(values_, std::make_tuple(wrap<Value, ! ::boost::is_lvalue_reference<Value>::value>(value))),
@@ -176,7 +176,7 @@ namespace detail { namespace variant {
 }} // namespace detail::variant
 
     template <class Visitor, class T1, class T2, class T3, class... TN>
-    inline BOOST_VARIANT_AUX_GENERIC_RESULT_TYPE(typename Visitor::result_type)
+    inline typename Visitor::result_type
         apply_visitor(const Visitor& visitor, T1&& v1, T2&& v2, T3&& v3, TN&&... vn)
     {
         return ::boost::apply_visitor(
@@ -194,7 +194,7 @@ namespace detail { namespace variant {
     }
     
     template <class Visitor, class T1, class T2, class T3, class... TN>
-    inline BOOST_VARIANT_AUX_GENERIC_RESULT_TYPE(typename Visitor::result_type)
+    inline typename Visitor::result_type
         apply_visitor(Visitor& visitor, T1&& v1, T2&& v2, T3&& v3, TN&&... vn)
     {
         return ::boost::apply_visitor(