import new upstream nautilus stable release 14.2.8

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

diff --git a/ceph/src/boost/boost/variant/detail/apply_visitor_delayed.hpp b/ceph/src/boost/boost/variant/detail/apply_visitor_delayed.hpp
index 515a93ef013ec54d0d5a71eb379fe27751018e00..0a9006299c1954cd60f304a70e96577defef6a27 100644 (file)
--- a/ceph/src/boost/boost/variant/detail/apply_visitor_delayed.hpp
+++ b/ceph/src/boost/boost/variant/detail/apply_visitor_delayed.hpp
@@ -13,8 +13,6 @@
 #ifndef BOOST_VARIANT_DETAIL_APPLY_VISITOR_DELAYED_HPP
 #define BOOST_VARIANT_DETAIL_APPLY_VISITOR_DELAYED_HPP
 
-#include <boost/variant/detail/generic_result_type.hpp>
-
 #include <boost/variant/detail/apply_visitor_unary.hpp>
 #include <boost/variant/detail/apply_visitor_binary.hpp>
 #include <boost/variant/variant_fwd.hpp> // for BOOST_VARIANT_DO_NOT_USE_VARIADIC_TEMPLATES
@@ -63,8 +61,7 @@ public: // structors
 
 public: // N-ary visitor interface
     template <typename... Visitables>
-        BOOST_VARIANT_AUX_GENERIC_RESULT_TYPE(result_type)
-    operator()(Visitables&... visitables) const
+    result_type operator()(Visitables&... visitables) const
     {
         return apply_visitor(visitor_, visitables...);
     }
@@ -74,8 +71,7 @@ public: // N-ary visitor interface
 public: // unary visitor interface
 
     template <typename Visitable>
-        BOOST_VARIANT_AUX_GENERIC_RESULT_TYPE(result_type)
-    operator()(Visitable& visitable) const
+    result_type operator()(Visitable& visitable) const
     {
         return apply_visitor(visitor_, visitable);
     }
@@ -83,8 +79,7 @@ public: // unary visitor interface
 public: // binary visitor interface
 
     template <typename Visitable1, typename Visitable2>
-        BOOST_VARIANT_AUX_GENERIC_RESULT_TYPE(result_type)
-    operator()(Visitable1& visitable1, Visitable2& visitable2) const
+    result_type operator()(Visitable1& visitable1, Visitable2& visitable2) const
     {
         return apply_visitor(visitor_, visitable1, visitable2);
     }