import new upstream nautilus stable release 14.2.8

[ceph.git] / ceph / src / boost / boost / spirit / home / qi / detail / alternative_function.hpp

diff --git a/ceph/src/boost/boost/spirit/home/qi/detail/alternative_function.hpp b/ceph/src/boost/boost/spirit/home/qi/detail/alternative_function.hpp
index 9bd0f73c7b008e3a26b707616286483f3c9066c3..347cd1a4429ef92c1c0cebaf1ce2da27fee18917 100644 (file)
--- a/ceph/src/boost/boost/spirit/home/qi/detail/alternative_function.hpp
+++ b/ceph/src/boost/boost/spirit/home/qi/detail/alternative_function.hpp
@@ -30,9 +30,7 @@ namespace boost { namespace spirit { namespace qi { namespace detail
         typedef typename variant_type::types types;
         typedef typename mpl::end<types>::type end;
 
-        typedef typename
-            mpl::find_if<types, is_same<mpl::_1, Expected> >::type
-        iter_1;
+        typedef typename mpl::find<types, Expected>::type iter_1;
 
         typedef typename
             mpl::eval_if<
@@ -176,9 +174,8 @@ namespace boost { namespace spirit { namespace qi { namespace detail
         Skipper const& skipper;
         Attribute& attr;
 
-    private:
         // silence MSVC warning C4512: assignment operator could not be generated
-        alternative_function& operator= (alternative_function const&);
+        BOOST_DELETED_FUNCTION(alternative_function& operator= (alternative_function const&))
     };
 
     template <typename Iterator, typename Context, typename Skipper>
@@ -204,9 +201,8 @@ namespace boost { namespace spirit { namespace qi { namespace detail
         Context& context;
         Skipper const& skipper;
 
-    private:
         // silence MSVC warning C4512: assignment operator could not be generated
-        alternative_function& operator= (alternative_function const&);
+        BOOST_DELETED_FUNCTION(alternative_function& operator= (alternative_function const&))
     };
 
 }}}}