Deprecate Phoenix transition headers

There is no purpose in these transition headers, Phoenix V2 was removed 8 years ago.

example/karma/calc2_ast.hpp

@@ -19,9 +19,9 @@
 #define SPIRIT_EXAMPLE_CALC2_AST_APR_30_2008_1011AM
 
 #include <boost/variant.hpp>
-#include <boost/spirit/include/phoenix_operator.hpp>
-#include <boost/spirit/include/phoenix_function.hpp>
-#include <boost/spirit/include/phoenix_statement.hpp>
+#include <boost/phoenix/operator.hpp>
+#include <boost/phoenix/function.hpp>
+#include <boost/phoenix/statement.hpp>
 #include <boost/spirit/include/karma_domain.hpp>
 #include <boost/spirit/include/support_attributes_fwd.hpp>
 

example/karma/calc2_ast_vm.hpp

@@ -19,9 +19,9 @@
 #define SPIRIT_EXAMPLE_CALC2_AST_APR_30_2008_1011AM
 
 #include <boost/variant.hpp>
-#include <boost/spirit/include/phoenix_operator.hpp>
-#include <boost/spirit/include/phoenix_function.hpp>
-#include <boost/spirit/include/phoenix_statement.hpp>
+#include <boost/phoenix/operator.hpp>
+#include <boost/phoenix/function.hpp>
+#include <boost/phoenix/statement.hpp>
 #include <boost/spirit/include/karma_domain.hpp>
 #include <boost/spirit/include/support_attributes_fwd.hpp>
 

example/karma/classify_char.cpp

@@ -13,8 +13,8 @@
 
 #include <boost/spirit/include/qi.hpp>
 #include <boost/spirit/include/karma.hpp>
-#include <boost/spirit/include/phoenix_core.hpp>
-#include <boost/spirit/include/phoenix_operator.hpp>
+#include <boost/phoenix/core.hpp>
+#include <boost/phoenix/operator.hpp>
 #include <boost/fusion/include/std_pair.hpp>
 
 #include <iostream>

example/karma/complex_number.cpp

@@ -14,8 +14,8 @@
 
 #include <boost/spirit/include/qi.hpp>
 #include <boost/spirit/include/karma.hpp>
-#include <boost/spirit/include/phoenix_core.hpp>
-#include <boost/spirit/include/phoenix_operator.hpp>
+#include <boost/phoenix/core.hpp>
+#include <boost/phoenix/operator.hpp>
 #include <boost/fusion/include/std_pair.hpp>
 
 #include <iostream>

example/karma/complex_number_adapt.cpp

@@ -17,8 +17,8 @@
 
 #include <boost/spirit/include/qi.hpp>
 #include <boost/spirit/include/karma.hpp>
-#include <boost/spirit/include/phoenix_core.hpp>
-#include <boost/spirit/include/phoenix_operator.hpp>
+#include <boost/phoenix/core.hpp>
+#include <boost/phoenix/operator.hpp>
 #include <boost/fusion/include/std_pair.hpp>
 #include <boost/fusion/include/adapt_adt.hpp>
 #include <boost/spirit/include/support_adapt_adt_attributes.hpp>

example/karma/complex_number_easier.cpp

@@ -14,8 +14,8 @@
 
 #include <boost/spirit/include/qi.hpp>
 #include <boost/spirit/include/karma.hpp>
-#include <boost/spirit/include/phoenix_core.hpp>
-#include <boost/spirit/include/phoenix_operator.hpp>
+#include <boost/phoenix/core.hpp>
+#include <boost/phoenix/operator.hpp>
 #include <boost/fusion/include/std_pair.hpp>
 
 #include <iostream>

example/karma/generate_code.cpp

@@ -12,7 +12,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #include <boost/spirit/include/karma.hpp>
-#include <boost/spirit/include/phoenix.hpp>
+#include <boost/phoenix.hpp>
 
 #include <iostream>
 #include <string>

example/karma/key_value_sequence.cpp

@@ -10,7 +10,7 @@
 
 #include <boost/spirit/include/karma.hpp>
 #include <boost/spirit/include/karma_stream.hpp>
-#include <boost/spirit/include/phoenix.hpp>
+#include <boost/phoenix.hpp>
 #include <boost/fusion/include/std_pair.hpp>
 
 #include <iostream>

example/karma/mini_xml_karma.cpp

@@ -16,11 +16,11 @@
 
 #include <boost/spirit/include/qi.hpp>
 #include <boost/spirit/include/karma.hpp>
-#include <boost/spirit/include/phoenix_core.hpp>
-#include <boost/spirit/include/phoenix_operator.hpp>
-#include <boost/spirit/include/phoenix_fusion.hpp>
-#include <boost/spirit/include/phoenix_function.hpp>
-#include <boost/spirit/include/phoenix_stl.hpp>
+#include <boost/phoenix/core.hpp>
+#include <boost/phoenix/operator.hpp>
+#include <boost/phoenix/fusion.hpp>
+#include <boost/phoenix/function.hpp>
+#include <boost/phoenix/stl.hpp>
 #include <boost/fusion/include/adapt_struct.hpp>
 #include <boost/variant/recursive_variant.hpp>
 

example/karma/quoted_strings.cpp

@@ -11,7 +11,7 @@
 #include <vector>
 
 #include <boost/spirit/include/karma.hpp>
-#include <boost/spirit/include/phoenix_stl.hpp>
+#include <boost/phoenix/stl.hpp>
 
 namespace client
 {

example/karma/reference.cpp

@@ -9,8 +9,8 @@
 //[reference_karma_includes
 #include <boost/spirit/include/karma.hpp>
 #include <boost/spirit/include/support_utree.hpp>
-#include <boost/spirit/include/phoenix_core.hpp>
-#include <boost/spirit/include/phoenix_operator.hpp>
+#include <boost/phoenix/core.hpp>
+#include <boost/phoenix/operator.hpp>
 #include <boost/fusion/include/std_pair.hpp>
 #include <boost/proto/deep_copy.hpp>
 #include <iostream>

example/lex/example2.cpp

@@ -21,7 +21,7 @@
 
 #include <boost/spirit/include/qi.hpp>
 #include <boost/spirit/include/lex_lexertl.hpp>
-#include <boost/spirit/include/phoenix_operator.hpp>
+#include <boost/phoenix/operator.hpp>
 
 #include <iostream>
 #include <fstream>

example/lex/example4.cpp

@@ -23,7 +23,7 @@
 
 #include <boost/spirit/include/qi.hpp>
 #include <boost/spirit/include/lex_lexertl.hpp>
-#include <boost/spirit/include/phoenix_operator.hpp>
+#include <boost/phoenix/operator.hpp>
 
 #include <iostream>
 #include <fstream>

example/lex/example5.cpp

@@ -25,7 +25,7 @@
 
 #include <boost/spirit/include/qi.hpp>
 #include <boost/spirit/include/lex_lexertl.hpp>
-#include <boost/spirit/include/phoenix_operator.hpp>
+#include <boost/phoenix/operator.hpp>
 
 #include <iostream>
 #include <fstream>

example/lex/example6.cpp

@@ -27,7 +27,7 @@
 
 #include <boost/spirit/include/qi.hpp>
 #include <boost/spirit/include/lex_lexertl.hpp>
-#include <boost/spirit/include/phoenix_operator.hpp>
+#include <boost/phoenix/operator.hpp>
 
 #include <iostream>
 #include <fstream>

example/lex/lexer_debug_support.cpp

@@ -7,7 +7,7 @@
 
 #include <boost/spirit/include/lex_lexertl.hpp>
 #include <boost/spirit/include/qi.hpp>
-#include <boost/spirit/include/phoenix.hpp>
+#include <boost/phoenix.hpp>
 
 namespace lex = boost::spirit::lex;
 namespace qi = boost::spirit::qi;

example/lex/print_number_tokenids.cpp

@@ -21,7 +21,7 @@
 
 #include <boost/spirit/include/qi.hpp>
 #include <boost/spirit/include/lex_lexertl.hpp>
-#include <boost/spirit/include/phoenix_operator.hpp>
+#include <boost/phoenix/operator.hpp>
 
 #include <iostream>
 #include <string>

example/lex/print_numbers.cpp

@@ -21,7 +21,7 @@
 
 #include <boost/spirit/include/qi.hpp>
 #include <boost/spirit/include/lex_lexertl.hpp>
-#include <boost/spirit/include/phoenix_operator.hpp>
+#include <boost/phoenix/operator.hpp>
 
 #include <iostream>
 #include <string>

example/lex/reference.cpp

@@ -7,8 +7,8 @@
 =============================================================================*/
 //[reference_lex_includes
 #include <boost/spirit/include/lex.hpp>
-#include <boost/spirit/include/phoenix_core.hpp>
-#include <boost/spirit/include/phoenix_operator.hpp>
+#include <boost/phoenix/core.hpp>
+#include <boost/phoenix/operator.hpp>
 #include <iostream>
 #include <string>
 //]

example/lex/static_lexer/word_count_lexer_tokens.hpp

@@ -6,9 +6,9 @@
 #if !defined(SPIRIT_LEXER_EXAMPLE_WORD_COUNT_LEXER_TOKENS_FEB_10_2008_0739PM)
 #define SPIRIT_LEXER_EXAMPLE_WORD_COUNT_LEXER_TOKENS_FEB_10_2008_0739PM
 
-#include <boost/spirit/include/phoenix_operator.hpp>
-#include <boost/spirit/include/phoenix_statement.hpp>
-#include <boost/spirit/include/phoenix_core.hpp>
+#include <boost/phoenix/operator.hpp>
+#include <boost/phoenix/statement.hpp>
+#include <boost/phoenix/core.hpp>
 #include <boost/iterator/iterator_traits.hpp>
 
 ///////////////////////////////////////////////////////////////////////////////

example/lex/static_lexer/word_count_static.cpp

@@ -18,9 +18,9 @@
 //[wc_static_include
 #include <boost/spirit/include/lex_static_lexertl.hpp>
 //]
-#include <boost/spirit/include/phoenix_operator.hpp>
-#include <boost/spirit/include/phoenix_statement.hpp>
-#include <boost/spirit/include/phoenix_container.hpp>
+#include <boost/phoenix/operator.hpp>
+#include <boost/phoenix/statement.hpp>
+#include <boost/phoenix/stl/container.hpp>
 
 #include <iostream>
 #include <string>

example/lex/strip_comments.cpp

@@ -35,8 +35,8 @@
 
 #include <boost/spirit/include/qi.hpp>
 #include <boost/spirit/include/lex_lexertl.hpp>
-#include <boost/spirit/include/phoenix_operator.hpp>
-#include <boost/spirit/include/phoenix_container.hpp>
+#include <boost/phoenix/operator.hpp>
+#include <boost/phoenix/stl/container.hpp>
 
 #include <iostream>
 #include <string>

example/lex/strip_comments_lexer.cpp

@@ -34,9 +34,9 @@
 // #define BOOST_SPIRIT_LEXERTL_DEBUG
 
 #include <boost/spirit/include/lex_lexertl.hpp>
-#include <boost/spirit/include/phoenix_operator.hpp>
-#include <boost/spirit/include/phoenix_statement.hpp>
-#include <boost/spirit/include/phoenix_core.hpp>
+#include <boost/phoenix/operator.hpp>
+#include <boost/phoenix/statement.hpp>
+#include <boost/phoenix/core.hpp>
 
 #include <iostream>
 #include <string>

example/lex/word_count.cpp

@@ -37,9 +37,9 @@
 //[wcp_includes
 #include <boost/spirit/include/qi.hpp>
 #include <boost/spirit/include/lex_lexertl.hpp>
-#include <boost/spirit/include/phoenix_operator.hpp>
-#include <boost/spirit/include/phoenix_statement.hpp>
-#include <boost/spirit/include/phoenix_container.hpp>
+#include <boost/phoenix/operator.hpp>
+#include <boost/phoenix/statement.hpp>
+#include <boost/phoenix/stl/container.hpp>
 //]
 
 #include <iostream>

example/lex/word_count_lexer.cpp

@@ -34,10 +34,10 @@
 
 //[wcl_includes
 #include <boost/spirit/include/lex_lexertl.hpp>
-#include <boost/spirit/include/phoenix_operator.hpp>
-#include <boost/spirit/include/phoenix_statement.hpp>
-#include <boost/spirit/include/phoenix_algorithm.hpp>
-#include <boost/spirit/include/phoenix_core.hpp>
+#include <boost/phoenix/operator.hpp>
+#include <boost/phoenix/statement.hpp>
+#include <boost/phoenix/stl/algorithm.hpp>
+#include <boost/phoenix/core.hpp>
 //]
 
 #include <iostream>

example/qi/calc_utree.cpp

@@ -20,8 +20,8 @@
 
 #include <boost/spirit/include/qi.hpp>
 #include <boost/spirit/include/support_utree.hpp>
-#include <boost/spirit/include/phoenix_operator.hpp>
-#include <boost/spirit/include/phoenix_function.hpp>
+#include <boost/phoenix/operator.hpp>
+#include <boost/phoenix/function.hpp>
 
 #include <iostream>
 #include <string>

example/qi/calc_utree_ast.cpp

@@ -20,8 +20,8 @@
 
 #include <boost/spirit/include/support_utree.hpp>
 #include <boost/spirit/include/qi.hpp>
-#include <boost/spirit/include/phoenix_operator.hpp>
-#include <boost/spirit/include/phoenix_function.hpp>
+#include <boost/phoenix/operator.hpp>
+#include <boost/phoenix/function.hpp>
 
 #include <iostream>
 #include <string>

example/qi/compiler_tutorial/calc3.cpp

@@ -23,7 +23,7 @@
 #define BOOST_SPIRIT_NO_PREDEFINED_TERMINALS
 
 #include <boost/spirit/include/qi.hpp>
-#include <boost/spirit/include/phoenix_operator.hpp>
+#include <boost/phoenix/operator.hpp>
 
 #include <iostream>
 #include <string>

example/qi/compiler_tutorial/calc5.cpp

@@ -40,7 +40,7 @@
 #include <boost/variant/recursive_variant.hpp>
 #include <boost/variant/apply_visitor.hpp>
 #include <boost/fusion/include/adapt_struct.hpp>
-#include <boost/spirit/include/phoenix_function.hpp>
+#include <boost/phoenix/function.hpp>
 #include <boost/foreach.hpp>
 
 #include <iostream>

example/qi/compiler_tutorial/calc6.cpp

@@ -43,7 +43,7 @@
 #include <boost/variant/recursive_variant.hpp>
 #include <boost/variant/apply_visitor.hpp>
 #include <boost/fusion/include/adapt_struct.hpp>
-#include <boost/spirit/include/phoenix_function.hpp>
+#include <boost/phoenix/function.hpp>
 #include <boost/foreach.hpp>
 
 #include <iostream>

example/qi/compiler_tutorial/calc7/compiler.hpp

@@ -12,9 +12,9 @@
 #include <vector>
 #include <map>
 #include <boost/function.hpp>
-#include <boost/spirit/include/phoenix_core.hpp>
-#include <boost/spirit/include/phoenix_function.hpp>
-#include <boost/spirit/include/phoenix_operator.hpp>
+#include <boost/phoenix/core.hpp>
+#include <boost/phoenix/function.hpp>
+#include <boost/phoenix/operator.hpp>
 
 namespace client { namespace code_gen
 {

example/qi/compiler_tutorial/calc7/expression_def.hpp

@@ -7,7 +7,7 @@
 #include "expression.hpp"
 #include "error_handler.hpp"
 #include "annotation.hpp"
-#include <boost/spirit/include/phoenix_function.hpp>
+#include <boost/phoenix/function.hpp>
 
 namespace client { namespace parser
 {

example/qi/compiler_tutorial/calc8/compiler.hpp

@@ -12,9 +12,9 @@
 #include <vector>
 #include <map>
 #include <boost/function.hpp>
-#include <boost/spirit/include/phoenix_core.hpp>
-#include <boost/spirit/include/phoenix_function.hpp>
-#include <boost/spirit/include/phoenix_operator.hpp>
+#include <boost/phoenix/core.hpp>
+#include <boost/phoenix/function.hpp>
+#include <boost/phoenix/operator.hpp>
 
 namespace client { namespace code_gen
 {

example/qi/compiler_tutorial/calc8/expression_def.hpp

@@ -7,7 +7,7 @@
 #include "expression.hpp"
 #include "error_handler.hpp"
 #include "annotation.hpp"
-#include <boost/spirit/include/phoenix_function.hpp>
+#include <boost/phoenix/function.hpp>
 
 namespace client { namespace parser
 {

example/qi/compiler_tutorial/conjure1/compiler.hpp

@@ -13,9 +13,9 @@
 #include <map>
 #include <boost/function.hpp>
 #include <boost/shared_ptr.hpp>
-#include <boost/spirit/include/phoenix_core.hpp>
-#include <boost/spirit/include/phoenix_function.hpp>
-#include <boost/spirit/include/phoenix_operator.hpp>
+#include <boost/phoenix/core.hpp>
+#include <boost/phoenix/function.hpp>
+#include <boost/phoenix/operator.hpp>
 
 namespace client { namespace code_gen
 {

example/qi/compiler_tutorial/conjure1/expression_def.hpp

@@ -7,7 +7,7 @@
 #include "expression.hpp"
 #include "error_handler.hpp"
 #include "annotation.hpp"
-#include <boost/spirit/include/phoenix_function.hpp>
+#include <boost/phoenix/function.hpp>
 
 namespace client { namespace parser
 {

example/qi/compiler_tutorial/conjure2/compiler.hpp

@@ -13,9 +13,9 @@
 #include <map>
 #include <boost/function.hpp>
 #include <boost/shared_ptr.hpp>
-#include <boost/spirit/include/phoenix_core.hpp>
-#include <boost/spirit/include/phoenix_function.hpp>
-#include <boost/spirit/include/phoenix_operator.hpp>
+#include <boost/phoenix/core.hpp>
+#include <boost/phoenix/function.hpp>
+#include <boost/phoenix/operator.hpp>
 
 namespace client { namespace code_gen
 {

example/qi/compiler_tutorial/conjure2/expression_def.hpp

@@ -8,7 +8,7 @@
 #include "expression.hpp"
 #include "error_handler.hpp"
 #include "annotation.hpp"
-#include <boost/spirit/include/phoenix_function.hpp>
+#include <boost/phoenix/function.hpp>
 #include <boost/spirit/include/lex_plain_token.hpp>
 
 namespace client { namespace parser

example/qi/compiler_tutorial/conjure3/compiler.hpp

@@ -14,9 +14,9 @@
 
 #include <boost/function.hpp>
 #include <boost/shared_ptr.hpp>
-#include <boost/spirit/include/phoenix_core.hpp>
-#include <boost/spirit/include/phoenix_function.hpp>
-#include <boost/spirit/include/phoenix_operator.hpp>
+#include <boost/phoenix/core.hpp>
+#include <boost/phoenix/function.hpp>
+#include <boost/phoenix/operator.hpp>
 #include <boost/iterator/transform_iterator.hpp>
 
 #include <llvm/DerivedTypes.h>

example/qi/compiler_tutorial/conjure3/expression_def.hpp

@@ -8,7 +8,7 @@
 #include "expression.hpp"
 #include "error_handler.hpp"
 #include "annotation.hpp"
-#include <boost/spirit/include/phoenix_function.hpp>
+#include <boost/phoenix/function.hpp>
 #include <boost/spirit/include/lex_plain_token.hpp>
 
 namespace client { namespace parser

example/qi/compiler_tutorial/mini_c/compiler.hpp

@@ -13,9 +13,9 @@
 #include <map>
 #include <boost/function.hpp>
 #include <boost/shared_ptr.hpp>
-#include <boost/spirit/include/phoenix_core.hpp>
-#include <boost/spirit/include/phoenix_function.hpp>
-#include <boost/spirit/include/phoenix_operator.hpp>
+#include <boost/phoenix/core.hpp>
+#include <boost/phoenix/function.hpp>
+#include <boost/phoenix/operator.hpp>
 
 namespace client { namespace code_gen
 {

example/qi/compiler_tutorial/mini_c/expression_def.hpp

@@ -7,7 +7,7 @@
 #include "expression.hpp"
 #include "error_handler.hpp"
 #include "annotation.hpp"
-#include <boost/spirit/include/phoenix_function.hpp>
+#include <boost/phoenix/function.hpp>
 
 namespace client { namespace parser
 {

example/qi/complex_number.cpp

@@ -14,8 +14,8 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #include <boost/spirit/include/qi.hpp>
-#include <boost/spirit/include/phoenix_core.hpp>
-#include <boost/spirit/include/phoenix_operator.hpp>
+#include <boost/phoenix/core.hpp>
+#include <boost/phoenix/operator.hpp>
 
 #include <iostream>
 #include <string>

example/qi/employee.cpp

@@ -14,9 +14,9 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #include <boost/spirit/include/qi.hpp>
-#include <boost/spirit/include/phoenix_core.hpp>
-#include <boost/spirit/include/phoenix_operator.hpp>
-#include <boost/spirit/include/phoenix_object.hpp>
+#include <boost/phoenix/core.hpp>
+#include <boost/phoenix/operator.hpp>
+#include <boost/phoenix/object.hpp>
 #include <boost/fusion/include/adapt_struct.hpp>
 #include <boost/fusion/include/io.hpp>
 

example/qi/expect.cpp

@@ -10,7 +10,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/spirit/home/qi.hpp>
 #include <boost/spirit/home/qi/nonterminal/grammar.hpp>
-#include <boost/spirit/include/phoenix.hpp>
+#include <boost/phoenix.hpp>
 #include <boost/foreach.hpp>
 
 namespace qi = boost::spirit::qi;

example/qi/mini_xml1.cpp

@@ -13,10 +13,10 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #include <boost/spirit/include/qi.hpp>
-#include <boost/spirit/include/phoenix_core.hpp>
-#include <boost/spirit/include/phoenix_operator.hpp>
-#include <boost/spirit/include/phoenix_fusion.hpp>
-#include <boost/spirit/include/phoenix_stl.hpp>
+#include <boost/phoenix/core.hpp>
+#include <boost/phoenix/operator.hpp>
+#include <boost/phoenix/fusion.hpp>
+#include <boost/phoenix/stl.hpp>
 #include <boost/fusion/include/adapt_struct.hpp>
 #include <boost/variant/recursive_variant.hpp>
 #include <boost/foreach.hpp>

example/qi/mini_xml2.cpp

@@ -13,10 +13,10 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #include <boost/spirit/include/qi.hpp>
-#include <boost/spirit/include/phoenix_core.hpp>
-#include <boost/spirit/include/phoenix_operator.hpp>
-#include <boost/spirit/include/phoenix_fusion.hpp>
-#include <boost/spirit/include/phoenix_stl.hpp>
+#include <boost/phoenix/core.hpp>
+#include <boost/phoenix/operator.hpp>
+#include <boost/phoenix/fusion.hpp>
+#include <boost/phoenix/stl.hpp>
 #include <boost/fusion/include/adapt_struct.hpp>
 #include <boost/variant/recursive_variant.hpp>
 #include <boost/foreach.hpp>

example/qi/mini_xml3.cpp

@@ -13,11 +13,11 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #include <boost/spirit/include/qi.hpp>
-#include <boost/spirit/include/phoenix_core.hpp>
-#include <boost/spirit/include/phoenix_operator.hpp>
-#include <boost/spirit/include/phoenix_fusion.hpp>
-#include <boost/spirit/include/phoenix_stl.hpp>
-#include <boost/spirit/include/phoenix_object.hpp>
+#include <boost/phoenix/core.hpp>
+#include <boost/phoenix/operator.hpp>
+#include <boost/phoenix/fusion.hpp>
+#include <boost/phoenix/stl.hpp>
+#include <boost/phoenix/object.hpp>
 #include <boost/fusion/include/adapt_struct.hpp>
 #include <boost/variant/recursive_variant.hpp>
 #include <boost/foreach.hpp>

example/qi/nabialek.cpp

@@ -17,7 +17,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #include <boost/spirit/include/qi.hpp>
-#include <boost/spirit/include/phoenix_operator.hpp>
+#include <boost/phoenix/operator.hpp>
 #include <iostream>
 #include <string>
 

example/qi/num_list2.cpp

@@ -15,9 +15,9 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #include <boost/spirit/include/qi.hpp>
-#include <boost/spirit/include/phoenix_core.hpp>
-#include <boost/spirit/include/phoenix_operator.hpp>
-#include <boost/spirit/include/phoenix_stl.hpp>
+#include <boost/phoenix/core.hpp>
+#include <boost/phoenix/operator.hpp>
+#include <boost/phoenix/stl.hpp>
 
 #include <iostream>
 #include <string>

example/qi/num_list3.cpp

@@ -15,9 +15,9 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #include <boost/spirit/include/qi.hpp>
-#include <boost/spirit/include/phoenix_core.hpp>
-#include <boost/spirit/include/phoenix_operator.hpp>
-#include <boost/spirit/include/phoenix_stl.hpp>
+#include <boost/phoenix/core.hpp>
+#include <boost/phoenix/operator.hpp>
+#include <boost/phoenix/stl.hpp>
 
 #include <iostream>
 #include <string>

example/qi/num_list4.cpp

@@ -15,9 +15,9 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #include <boost/spirit/include/qi.hpp>
-#include <boost/spirit/include/phoenix_core.hpp>
-#include <boost/spirit/include/phoenix_operator.hpp>
-#include <boost/spirit/include/phoenix_stl.hpp>
+#include <boost/phoenix/core.hpp>
+#include <boost/phoenix/operator.hpp>
+#include <boost/phoenix/stl.hpp>
 
 #include <iostream>
 #include <string>

example/qi/porting_guide_qi.cpp

@@ -7,7 +7,7 @@
 =============================================================================*/
 //[porting_guide_qi_includes
 #include <boost/spirit/include/qi.hpp>
-#include <boost/spirit/include/phoenix_operator.hpp>
+#include <boost/phoenix/operator.hpp>
 #include <iostream>
 #include <string>
 #include <algorithm>

example/qi/reference.cpp

@@ -13,8 +13,8 @@
 //[reference_includes
 #include <boost/spirit/include/support_utree.hpp>
 #include <boost/spirit/include/qi.hpp>
-#include <boost/spirit/include/phoenix_core.hpp>
-#include <boost/spirit/include/phoenix_operator.hpp>
+#include <boost/phoenix/core.hpp>
+#include <boost/phoenix/operator.hpp>
 #include <boost/fusion/include/adapt_struct.hpp>
 #include <boost/assert.hpp>
 #include <boost/predef/other/endian.h>

example/qi/roman.cpp

@@ -15,7 +15,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #include <boost/spirit/include/qi.hpp>
-#include <boost/spirit/include/phoenix_operator.hpp>
+#include <boost/phoenix/operator.hpp>
 
 #include <iostream>
 #include <string>

example/qi/sum.cpp

@@ -15,8 +15,8 @@
 
 //[tutorial_adder_includes
 #include <boost/spirit/include/qi.hpp>
-#include <boost/spirit/include/phoenix_core.hpp>
-#include <boost/spirit/include/phoenix_operator.hpp>
+#include <boost/phoenix/core.hpp>
+#include <boost/phoenix/operator.hpp>
 #include <iostream>
 #include <string>
 //]

example/support/utree/utf8_parser.hpp

@@ -16,10 +16,10 @@
 #include <boost/regex/pending/unicode_iterator.hpp>
 
 #include <boost/spirit/include/qi.hpp>
-#include <boost/spirit/include/phoenix_core.hpp>
-#include <boost/spirit/include/phoenix_container.hpp>
-#include <boost/spirit/include/phoenix_statement.hpp>
-#include <boost/spirit/include/phoenix_operator.hpp>
+#include <boost/phoenix/core.hpp>
+#include <boost/phoenix/stl/container.hpp>
+#include <boost/phoenix/statement.hpp>
+#include <boost/phoenix/operator.hpp>
 #include <boost/spirit/include/support_utree.hpp>
 
 namespace utf8