import quincy beta 17.1.0

[ceph.git] / ceph / src / boost / libs / spirit / test / lex / dedent_handling_phoenix.cpp

diff --git a/ceph/src/boost/libs/spirit/test/lex/dedent_handling_phoenix.cpp b/ceph/src/boost/libs/spirit/test/lex/dedent_handling_phoenix.cpp
index fa1616ed640ae78c116221eae15f37a5bd0351d1..bbdcb3ae5abdb043dafc2ced05f97f987b4a0c8b 100644 (file)
--- a/ceph/src/boost/libs/spirit/test/lex/dedent_handling_phoenix.cpp
+++ b/ceph/src/boost/libs/spirit/test/lex/dedent_handling_phoenix.cpp
@@ -9,7 +9,9 @@
 #include <boost/detail/lightweight_test.hpp>
 #include <boost/spirit/include/lex.hpp>
 #include <boost/spirit/include/lex_lexertl.hpp>
-#include <boost/spirit/include/phoenix.hpp>
+#include <boost/spirit/include/phoenix_core.hpp>
+#include <boost/spirit/include/phoenix_operator.hpp>
+#include <boost/spirit/include/phoenix_statement.hpp>
 
 namespace lex = boost::spirit::lex;
 namespace phoenix = boost::phoenix;
@@ -34,11 +36,11 @@ struct multi_tokens : lex::lexer<Lexer>
         this->self = 
                 a [ ++phoenix::ref(level) ]
             |   b
-            |   c [
+            |   c [(
                       _state = "in_dedenting",
                       _end = _start,
                       _pass = pass_flags::pass_ignore
-                  ]
+                  )]
             ;
 
         d = ".";
@@ -72,9 +74,8 @@ struct dumper
 
     std::stringstream& strm;
 
-private:
     // silence MSVC warning C4512: assignment operator could not be generated
-    dumper& operator= (dumper const&);
+    BOOST_DELETED_FUNCTION(dumper& operator= (dumper const&));
 };
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -83,7 +84,6 @@ int main()
     typedef lex::lexertl::token<std::string::iterator> token_type;
     typedef lex::lexertl::actor_lexer<token_type> base_lexer_type;
     typedef multi_tokens<base_lexer_type> lexer_type;
-    typedef lexer_type::iterator_type iterator;
 
     std::string in("AAABBC");
     std::string::iterator first(in.begin());