X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=ceph%2Fsrc%2Fboost%2Fboost%2Fspirit%2Frepository%2Fhome%2Fqi%2Fdirective%2Fkwd.hpp;h=4c1a2b0c0ad04a0a8d21bee4fa3f51ca1c1d904e;hb=92f5a8d42d07f9929ae4fa7e01342fe8d96808a8;hp=e7338df4329e6e9f80a943005e292891807199d9;hpb=a0324939f9d0e1905d5df8f57442f09dc70af83d;p=ceph.git

diff --git a/ceph/src/boost/boost/spirit/repository/home/qi/directive/kwd.hpp b/ceph/src/boost/boost/spirit/repository/home/qi/directive/kwd.hpp
index e7338df43..4c1a2b0c0 100644
--- a/ceph/src/boost/boost/spirit/repository/home/qi/directive/kwd.hpp
+++ b/ceph/src/boost/boost/spirit/repository/home/qi/directive/kwd.hpp
@@ -25,6 +25,11 @@
 #include <boost/fusion/include/at.hpp>
 #include <vector>
 
+#if defined(_MSC_VER)
+# pragma warning(push)
+# pragma warning(disable: 4127) // conditional expression is constant
+#endif
+
 namespace boost { namespace spirit
 {
     ///////////////////////////////////////////////////////////////////////////
@@ -172,9 +177,8 @@ template <typename T>
         }
 
 
-    private:
         // silence MSVC warning C4512: assignment operator could not be generated
-        kwd_pass_iterator& operator= (kwd_pass_iterator const&);
+        BOOST_DELETED_FUNCTION(kwd_pass_iterator& operator= (kwd_pass_iterator const&))
     };
 
     template <typename T>
@@ -203,9 +207,8 @@ template <typename T>
         }
         T const exact;
 
-    private:
         // silence MSVC warning C4512: assignment operator could not be generated
-        kwd_exact_iterator& operator= (kwd_exact_iterator const&);
+        BOOST_DELETED_FUNCTION(kwd_exact_iterator& operator= (kwd_exact_iterator const&))
     };
 
     template <typename T>
@@ -235,9 +238,8 @@ template <typename T>
         T const min;
         T const max;
 
-    private:
         // silence MSVC warning C4512: assignment operator could not be generated
-        kwd_finite_iterator& operator= (kwd_finite_iterator const&);
+        BOOST_DELETED_FUNCTION(kwd_finite_iterator& operator= (kwd_finite_iterator const&))
     };
 
     template <typename T>
@@ -255,9 +257,8 @@ template <typename T>
         }
         T const min;
 
-    private:
         // silence MSVC warning C4512: assignment operator could not be generated
-        kwd_infinite_iterator& operator= (kwd_infinite_iterator const&);
+        BOOST_DELETED_FUNCTION(kwd_infinite_iterator& operator= (kwd_infinite_iterator const&))
     };
 
     // This class enables the transportation of parameters needed to call
@@ -439,11 +440,12 @@ template <typename T>
                 no_case_keyword,
                 spirit::qi::no_case_literal_string< KeywordType, true>,
                 spirit::qi::literal_string<KeywordType, true> >::type keyword_string_type;
-       keyword_string_type keyword;
-    private:
+        keyword_string_type keyword;
+
         // silence MSVC warning C4512: assignment operator could not be generated
-        kwd_parser& operator= (kwd_parser const&);
+        BOOST_DELETED_FUNCTION(kwd_parser& operator= (kwd_parser const&))
 
+    private:
         template <typename Iterator, typename Context, typename Skipper>
         static spirit::qi::detail::fail_function<Iterator, Context, Skipper>
         fail_function(
@@ -585,10 +587,11 @@ template <typename Subject, typename KeywordType, typename LoopIter, typename Di
         LoopIter iter;
 
         KeywordType keyword;
-    private:
+
         // silence MSVC warning C4512: assignment operator could not be generated
-        complex_kwd_parser& operator= (complex_kwd_parser const&);
+        BOOST_DELETED_FUNCTION(complex_kwd_parser& operator= (complex_kwd_parser const&))
 
+    private:
         template <typename Iterator, typename Context, typename Skipper>
         static spirit::qi::detail::fail_function<Iterator, Context, Skipper>
         fail_function(
@@ -1201,5 +1204,9 @@ namespace boost { namespace spirit { namespace traits
 
 }}}
 
+#if defined(_MSC_VER)
+# pragma warning(pop)
+#endif
+
 #endif