Boost-Commit :

Date view	Thread view	Subject view	Author view

From: joel_at_[hidden]
Date: 2008-04-08 21:29:26

Author: djowel
Date: 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
New Revision: 44118
URL: http://svn.boost.org/trac/boost/changeset/44118

Log:
In preparation for spirit2:
* flat includes
* home directory
* forwarding headers
* classic spirit

Text files modified:
   trunk/libs/spirit/example/fundamental/ast_calc.cpp | 6 +++---
   trunk/libs/spirit/example/fundamental/bind.cpp | 2 +-
   trunk/libs/spirit/example/fundamental/boiler_plate.cpp | 2 +-
   trunk/libs/spirit/example/fundamental/calc_debug.cpp | 2 +-
   trunk/libs/spirit/example/fundamental/calc_plain.cpp | 2 +-
   trunk/libs/spirit/example/fundamental/comments.cpp | 6 +++---
   trunk/libs/spirit/example/fundamental/complex_number.cpp | 2 +-
   trunk/libs/spirit/example/fundamental/distinct/distinct_parser.cpp | 4 ++--
   trunk/libs/spirit/example/fundamental/distinct/distinct_parser_dynamic.cpp | 4 ++--
   trunk/libs/spirit/example/fundamental/error_handling.cpp | 4 ++--
   trunk/libs/spirit/example/fundamental/error_reporting.cpp | 4 ++--
   trunk/libs/spirit/example/fundamental/file_parser.cpp | 4 ++--
   trunk/libs/spirit/example/fundamental/full_calc.cpp | 2 +-
   trunk/libs/spirit/example/fundamental/functor_parser.cpp | 6 +++---
   trunk/libs/spirit/example/fundamental/list_parser.cpp | 8 ++++----
   trunk/libs/spirit/example/fundamental/matching_tags.cpp | 4 ++--
   trunk/libs/spirit/example/fundamental/more_calculators/ast_calc2.cpp | 4 ++--
   trunk/libs/spirit/example/fundamental/more_calculators/calc_with_variables.cpp | 4 ++--
   trunk/libs/spirit/example/fundamental/more_calculators/phoenix_subrule_calc.cpp | 4 ++--
   trunk/libs/spirit/example/fundamental/more_calculators/primitive_calc.cpp | 6 +++---
   trunk/libs/spirit/example/fundamental/more_calculators/rpn_calc.cpp | 6 +++---
   trunk/libs/spirit/example/fundamental/more_calculators/vmachine_calc.cpp | 2 +-
   trunk/libs/spirit/example/fundamental/no_actions.cpp | 2 +-
   trunk/libs/spirit/example/fundamental/number_list.cpp | 4 ++--
   trunk/libs/spirit/example/fundamental/parse_tree_calc1.cpp | 6 +++---
   trunk/libs/spirit/example/fundamental/parser_context.cpp | 4 ++--
   trunk/libs/spirit/example/fundamental/phoenix_calc.cpp | 4 ++--
   trunk/libs/spirit/example/fundamental/position_iterator/position_iterator.cpp | 6 +++---
   trunk/libs/spirit/example/fundamental/refactoring.cpp | 4 ++--
   trunk/libs/spirit/example/fundamental/regular_expression.cpp | 4 ++--
   trunk/libs/spirit/example/fundamental/roman_numerals.cpp | 4 ++--
   trunk/libs/spirit/example/fundamental/stuff_vector.cpp | 8 ++++----
   trunk/libs/spirit/example/fundamental/stuff_vector2.cpp | 10 +++++-----
   trunk/libs/spirit/example/fundamental/subrule_calc.cpp | 2 +-
   trunk/libs/spirit/example/fundamental/sum.cpp | 6 +++---
   trunk/libs/spirit/example/fundamental/thousand_separated.cpp | 4 ++--
   trunk/libs/spirit/example/intermediate/ipv4.cpp | 10 +++++-----
   trunk/libs/spirit/example/intermediate/ipv4_opt.cpp | 10 +++++-----
   trunk/libs/spirit/example/intermediate/lazy_parser.cpp | 10 +++++-----
   trunk/libs/spirit/example/intermediate/parameters.cpp | 12 ++++++------
   trunk/libs/spirit/example/intermediate/regex_convert.cpp | 4 ++--
   trunk/libs/spirit/example/intermediate/simple_xml/actions.hpp | 2 +-
   trunk/libs/spirit/example/intermediate/simple_xml/driver.cpp | 2 +-
   trunk/libs/spirit/example/intermediate/simple_xml/xml_g.hpp | 6 +++---
   trunk/libs/spirit/example/techniques/dynamic_rule.cpp | 2 +-
   trunk/libs/spirit/example/techniques/epsilon.cpp | 4 ++--
   trunk/libs/spirit/example/techniques/multiple_scanners.cpp | 2 +-
   trunk/libs/spirit/example/techniques/nabialek.cpp | 10 +++++-----
   trunk/libs/spirit/example/techniques/no_rules/no_rule1.cpp | 2 +-
   trunk/libs/spirit/example/techniques/no_rules/no_rule2.cpp | 2 +-
   trunk/libs/spirit/example/techniques/no_rules/no_rule3.cpp | 2 +-
   trunk/libs/spirit/example/techniques/no_rules_with_typeof/opaque_rule_parser.cpp | 8 ++++----
   trunk/libs/spirit/example/techniques/no_rules_with_typeof/rule_parser_1_1.cpp | 12 ++++++------
   trunk/libs/spirit/example/techniques/no_rules_with_typeof/rule_parser_1_2.cpp | 12 ++++++------
   trunk/libs/spirit/example/techniques/no_rules_with_typeof/rule_parser_2_1.cpp | 8 ++++----
   trunk/libs/spirit/example/techniques/no_rules_with_typeof/rule_parser_2_2.cpp | 8 ++++----
   trunk/libs/spirit/example/techniques/right_recursion.cpp | 2 +-
   trunk/libs/spirit/example/techniques/typeof.cpp | 2 +-
   trunk/libs/spirit/phoenix/example/fundamental/closures.cpp | 14 +++++++-------
   trunk/libs/spirit/phoenix/example/fundamental/sample10.cpp | 12 ++++++------
   trunk/libs/spirit/phoenix/example/fundamental/sample2.cpp | 4 ++--
   trunk/libs/spirit/phoenix/example/fundamental/sample3.cpp | 4 ++--
   trunk/libs/spirit/phoenix/example/fundamental/sample4.cpp | 8 ++++----
   trunk/libs/spirit/phoenix/example/fundamental/sample5.cpp | 4 ++--
   trunk/libs/spirit/phoenix/example/fundamental/sample6.cpp | 8 ++++----
   trunk/libs/spirit/phoenix/example/fundamental/sample7.cpp | 10 +++++-----
   trunk/libs/spirit/phoenix/example/fundamental/sample8.cpp | 10 +++++-----
   trunk/libs/spirit/phoenix/example/fundamental/sample9.cpp | 10 +++++-----
   trunk/libs/spirit/phoenix/test/binary_tests.cpp | 4 ++--
   trunk/libs/spirit/phoenix/test/binders_tests.cpp | 6 +++---
   trunk/libs/spirit/phoenix/test/functors_tests.cpp | 8 ++++----
   trunk/libs/spirit/phoenix/test/iostream_tests.cpp | 8 ++++----
   trunk/libs/spirit/phoenix/test/mixed_binary_tests.cpp | 4 ++--
   trunk/libs/spirit/phoenix/test/more_expressions_tests.cpp | 8 ++++----
   trunk/libs/spirit/phoenix/test/new_test.cpp | 4 ++--
   trunk/libs/spirit/phoenix/test/primitives_tests.cpp | 2 +-
   trunk/libs/spirit/phoenix/test/statements_tests.cpp | 10 +++++-----
   trunk/libs/spirit/phoenix/test/stl_tests.cpp | 12 ++++++------
   trunk/libs/spirit/phoenix/test/tuples_tests.cpp | 2 +-
   trunk/libs/spirit/phoenix/test/unary_tests.cpp | 4 ++--
   trunk/libs/spirit/test/actor/assign_key_test.cpp | 10 +++++-----
   trunk/libs/spirit/test/actor/assign_test.cpp | 4 ++--
   trunk/libs/spirit/test/actor/clear_test.cpp | 4 ++--
   trunk/libs/spirit/test/actor/decrement_test.cpp | 4 ++--
   trunk/libs/spirit/test/actor/erase_at_test.cpp | 4 ++--
   trunk/libs/spirit/test/actor/increment_test.cpp | 4 ++--
   trunk/libs/spirit/test/actor/insert_at_test.cpp | 2 +-
   trunk/libs/spirit/test/actor/insert_key_test.cpp | 10 +++++-----
   trunk/libs/spirit/test/actor/push_back_test.cpp | 6 +++---
   trunk/libs/spirit/test/actor/push_front_test.cpp | 6 +++---
   trunk/libs/spirit/test/actor/swap_test.cpp | 4 ++--
   trunk/libs/spirit/test/ast_calc_tests.cpp | 6 +++---
   trunk/libs/spirit/test/bug_000008.cpp | 4 ++--
   trunk/libs/spirit/test/bug_fixes.cpp | 28 ++++++++++++++--------------
   trunk/libs/spirit/test/char_strings_test.cpp | 4 ++--
   trunk/libs/spirit/test/char_strings_test_fail.cpp | 4 ++--
   trunk/libs/spirit/test/chset_tests.cpp | 2 +-
   trunk/libs/spirit/test/closure_tests.cpp | 8 ++++----
   trunk/libs/spirit/test/confix_tests.cpp | 4 ++--
   trunk/libs/spirit/test/custom_real_parser.cpp | 4 ++--
   trunk/libs/spirit/test/directives_tests.cpp | 4 ++--
   trunk/libs/spirit/test/distinct_tests.cpp | 4 ++--
   trunk/libs/spirit/test/epsilon_tests.cpp | 2 +-
   trunk/libs/spirit/test/escape_char_parser_tests.cpp | 6 +++---
   trunk/libs/spirit/test/exception_tests.cpp | 4 ++--
   trunk/libs/spirit/test/file_iterator_tests.cpp | 2 +-
   trunk/libs/spirit/test/fixed_size_queue_fail_tests.cpp | 2 +-
   trunk/libs/spirit/test/fixed_size_queue_tests.cpp | 2 +-
   trunk/libs/spirit/test/for_p_as_parser_tests.cpp | 4 ++--
   trunk/libs/spirit/test/for_tests.cpp | 6 +++---
   trunk/libs/spirit/test/fundamental_tests.cpp | 6 +++---
   trunk/libs/spirit/test/grammar_def_test.cpp | 6 +++---
   trunk/libs/spirit/test/grammar_mt_tests.cpp | 6 +++---
   trunk/libs/spirit/test/grammar_multi_instance_tst.cpp | 2 +-
   trunk/libs/spirit/test/grammar_tests.cpp | 4 ++--
   trunk/libs/spirit/test/group_match_bug.cpp | 8 ++++----
   trunk/libs/spirit/test/if_p_as_parser_tests.cpp | 4 ++--
   trunk/libs/spirit/test/if_p_int_as_condition_test.cpp | 6 +++---
   trunk/libs/spirit/test/if_tests.cpp | 6 +++---
   trunk/libs/spirit/test/lazy_tests.cpp | 10 +++++-----
   trunk/libs/spirit/test/loops_tests.cpp | 4 ++--
   trunk/libs/spirit/test/match_tests.cpp | 2 +-
   trunk/libs/spirit/test/mix_and_match_trees.cpp | 6 +++---
   trunk/libs/spirit/test/multi_pass_compile_tests.cpp | 4 ++--
   trunk/libs/spirit/test/multi_pass_tests.cpp | 2 +-
   trunk/libs/spirit/test/negated_eps_p_test.cpp | 6 +++---
   trunk/libs/spirit/test/numerics_tests.cpp | 4 ++--
   trunk/libs/spirit/test/operators_tests.cpp | 2 +-
   trunk/libs/spirit/test/owi_mt_tests.cpp | 2 +-
   trunk/libs/spirit/test/owi_st_tests.cpp | 2 +-
   trunk/libs/spirit/test/parametric_tests.cpp | 8 ++++----
   trunk/libs/spirit/test/parser_context_test.cpp | 4 ++--
   trunk/libs/spirit/test/parser_traits_tests.cpp | 4 ++--
   trunk/libs/spirit/test/position_iterator_tests.cpp | 2 +-
   trunk/libs/spirit/test/post_skips.cpp | 14 +++++++-------
   trunk/libs/spirit/test/primitives_tests.cpp | 2 +-
   trunk/libs/spirit/test/repeat_ast_tests.cpp | 8 ++++----
   trunk/libs/spirit/test/rule_tests.cpp | 4 ++--
   trunk/libs/spirit/test/scanner_tests.cpp | 2 +-
   trunk/libs/spirit/test/scanner_value_type_tests.cpp | 2 +-
   trunk/libs/spirit/test/scoped_lock_tests.cpp | 4 ++--
   trunk/libs/spirit/test/select_p_with_rule.cpp | 6 +++---
   trunk/libs/spirit/test/sf_bug_720917.cpp | 2 +-
   trunk/libs/spirit/test/shortest_alternative_tests.cpp | 2 +-
   trunk/libs/spirit/test/subrule_tests.cpp | 2 +-
   trunk/libs/spirit/test/switch_problem.cpp | 12 ++++++------
   trunk/libs/spirit/test/switch_tests_eps_default.cpp | 18 +++++++++---------
   trunk/libs/spirit/test/switch_tests_general_def.cpp | 18 +++++++++---------
   trunk/libs/spirit/test/switch_tests_single.cpp | 18 +++++++++---------
   trunk/libs/spirit/test/switch_tests_wo_default.cpp | 18 +++++++++---------
   trunk/libs/spirit/test/symbols_add_null.cpp | 4 ++--
   trunk/libs/spirit/test/symbols_find_null.cpp | 4 ++--
   trunk/libs/spirit/test/symbols_tests.cpp | 4 ++--
   trunk/libs/spirit/test/traverse_tests.cpp | 6 +++---
   trunk/libs/spirit/test/tree_tests.cpp | 6 +++---
   trunk/libs/spirit/test/tree_to_xml.cpp | 6 +++---
   trunk/libs/spirit/test/typeof_support/typeof_actor.cpp | 4 ++--
   trunk/libs/spirit/test/typeof_support/typeof_attribute.cpp | 4 ++--
   trunk/libs/spirit/test/typeof_support/typeof_core.cpp | 4 ++--
   trunk/libs/spirit/test/typeof_support/typeof_debug.cpp | 4 ++--
   trunk/libs/spirit/test/typeof_support/typeof_dynamic.cpp | 8 ++++----
   trunk/libs/spirit/test/typeof_support/typeof_error_handling.cpp | 4 ++--
   trunk/libs/spirit/test/typeof_support/typeof_iterator.cpp | 4 ++--
   trunk/libs/spirit/test/typeof_support/typeof_symbols.cpp | 4 ++--
   trunk/libs/spirit/test/typeof_support/typeof_tree.cpp | 6 +++---
   trunk/libs/spirit/test/typeof_support/typeof_utility.cpp | 8 ++++----
   trunk/libs/spirit/test/while_p_as_parser_tests.cpp | 4 ++--
   trunk/libs/spirit/test/while_tests.cpp | 6 +++---
   168 files changed, 467 insertions(+), 467 deletions(-)

Modified: trunk/libs/spirit/example/fundamental/ast_calc.cpp
==============================================================================
--- trunk/libs/spirit/example/fundamental/ast_calc.cpp (original)
+++ trunk/libs/spirit/example/fundamental/ast_calc.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -14,9 +14,9 @@
///////////////////////////////////////////////////////////////////////////////
#define BOOST_SPIRIT_DUMP_PARSETREE_AS_XML

-#include <boost/spirit/core.hpp>
-#include <boost/spirit/tree/ast.hpp>
-#include <boost/spirit/tree/tree_to_xml.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/ast.hpp>
+#include <boost/spirit/include/include/tree_to_xml.hpp>
#include "tree_calc_grammar.hpp"

#include <iostream>

Modified: trunk/libs/spirit/example/fundamental/bind.cpp
==============================================================================
--- trunk/libs/spirit/example/fundamental/bind.cpp (original)
+++ trunk/libs/spirit/example/fundamental/bind.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -14,7 +14,7 @@
// [ JDG 9/29/2002 ]
//
///////////////////////////////////////////////////////////////////////////////
-#include <boost/spirit/core.hpp>
+#include <boost/spirit/include/core.hpp>
#include <boost/bind.hpp>
#include <iostream>
#include <vector>

Modified: trunk/libs/spirit/example/fundamental/boiler_plate.cpp
==============================================================================
--- trunk/libs/spirit/example/fundamental/boiler_plate.cpp (original)
+++ trunk/libs/spirit/example/fundamental/boiler_plate.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -13,7 +13,7 @@
// [ JDG 9/17/2002 ]
//
///////////////////////////////////////////////////////////////////////////////
-#include <boost/spirit/core.hpp>
+#include <boost/spirit/include/core.hpp>
#include <iostream>
#include <string>

Modified: trunk/libs/spirit/example/fundamental/calc_debug.cpp
==============================================================================
--- trunk/libs/spirit/example/fundamental/calc_debug.cpp (original)
+++ trunk/libs/spirit/example/fundamental/calc_debug.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -20,7 +20,7 @@
////////////////////////////////////////////////////////////////////////////

#define BOOST_SPIRIT_DEBUG
-#include <boost/spirit/core.hpp>
+#include <boost/spirit/include/core.hpp>
#include <iostream>
#include <stack>
#include <functional>

Modified: trunk/libs/spirit/example/fundamental/calc_plain.cpp
==============================================================================
--- trunk/libs/spirit/example/fundamental/calc_plain.cpp (original)
+++ trunk/libs/spirit/example/fundamental/calc_plain.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -15,7 +15,7 @@
// [ JDG 5/10/2002 ]
//
////////////////////////////////////////////////////////////////////////////
-#include <boost/spirit/core.hpp>
+#include <boost/spirit/include/core.hpp>
#include <iostream>
#include <string>

Modified: trunk/libs/spirit/example/fundamental/comments.cpp
==============================================================================
--- trunk/libs/spirit/example/fundamental/comments.cpp (original)
+++ trunk/libs/spirit/example/fundamental/comments.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -23,9 +23,9 @@
#include <iostream>
#include <cassert>

-#include <boost/spirit/core.hpp>
-#include <boost/spirit/utility/confix.hpp>
-#include <boost/spirit/utility/chset.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/include/confix.hpp>
+#include <boost/spirit/include/include/chset.hpp>

///////////////////////////////////////////////////////////////////////////////

Modified: trunk/libs/spirit/example/fundamental/complex_number.cpp
==============================================================================
--- trunk/libs/spirit/example/fundamental/complex_number.cpp (original)
+++ trunk/libs/spirit/example/fundamental/complex_number.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -13,7 +13,7 @@
// [ JDG 5/10/2002 ]
//
///////////////////////////////////////////////////////////////////////////////
-#include <boost/spirit/core.hpp>
+#include <boost/spirit/include/core.hpp>
#include <iostream>
#include <complex>
#include <string>

Modified: trunk/libs/spirit/example/fundamental/distinct/distinct_parser.cpp
==============================================================================
--- trunk/libs/spirit/example/fundamental/distinct/distinct_parser.cpp (original)
+++ trunk/libs/spirit/example/fundamental/distinct/distinct_parser.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -9,8 +9,8 @@
#include <cassert>
#include <iostream>
#include <boost/cstdlib.hpp>
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/utility/distinct.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/distinct.hpp>

using namespace std;
using namespace boost;

Modified: trunk/libs/spirit/example/fundamental/distinct/distinct_parser_dynamic.cpp
==============================================================================
--- trunk/libs/spirit/example/fundamental/distinct/distinct_parser_dynamic.cpp (original)
+++ trunk/libs/spirit/example/fundamental/distinct/distinct_parser_dynamic.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -9,8 +9,8 @@
#include <cassert>
#include <iostream>
#include <boost/cstdlib.hpp>
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/utility/distinct.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/distinct.hpp>

using namespace std;
using namespace boost;

Modified: trunk/libs/spirit/example/fundamental/error_handling.cpp
==============================================================================
--- trunk/libs/spirit/example/fundamental/error_handling.cpp (original)
+++ trunk/libs/spirit/example/fundamental/error_handling.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -12,8 +12,8 @@
// Error Handling" chapter in the User's Guide.
//
///////////////////////////////////////////////////////////////////////////////
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/error_handling/exceptions.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/exceptions.hpp>
#include <iostream>
#include <cassert>

Modified: trunk/libs/spirit/example/fundamental/error_reporting.cpp
==============================================================================
--- trunk/libs/spirit/example/fundamental/error_reporting.cpp (original)
+++ trunk/libs/spirit/example/fundamental/error_reporting.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -14,8 +14,8 @@
// [ Pavel Baranov 8/27/2003 ]
//
///////////////////////////////////////////////////////////////////////////////
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/utility/functor_parser.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/functor_parser.hpp>
#include <iostream>
#include <string>

Modified: trunk/libs/spirit/example/fundamental/file_parser.cpp
==============================================================================
--- trunk/libs/spirit/example/fundamental/file_parser.cpp (original)
+++ trunk/libs/spirit/example/fundamental/file_parser.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -15,8 +15,8 @@
//
///////////////////////////////////////////////////////////////////////////////

-#include <boost/spirit/core.hpp>
-#include <boost/spirit/iterator/file_iterator.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/file_iterator.hpp>
#include <iostream>

///////////////////////////////////////////////////////////////////////////////

Modified: trunk/libs/spirit/example/fundamental/full_calc.cpp
==============================================================================
--- trunk/libs/spirit/example/fundamental/full_calc.cpp (original)
+++ trunk/libs/spirit/example/fundamental/full_calc.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -16,7 +16,7 @@
// [ JDG 9/18/2002 ]
//
////////////////////////////////////////////////////////////////////////////
-#include <boost/spirit/core.hpp>
+#include <boost/spirit/include/core.hpp>
#include <iostream>
#include <stack>
#include <functional>

Modified: trunk/libs/spirit/example/fundamental/functor_parser.cpp
==============================================================================
--- trunk/libs/spirit/example/fundamental/functor_parser.cpp (original)
+++ trunk/libs/spirit/example/fundamental/functor_parser.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -7,9 +7,9 @@
License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
=============================================================================*/
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/utility/functor_parser.hpp>
-#include <boost/spirit/actor/assign_actor.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/functor_parser.hpp>
+#include <boost/spirit/include/assign_actor.hpp>
#include <iostream>
#include <vector>
#include <string>

Modified: trunk/libs/spirit/example/fundamental/list_parser.cpp
==============================================================================
--- trunk/libs/spirit/example/fundamental/list_parser.cpp (original)
+++ trunk/libs/spirit/example/fundamental/list_parser.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -20,10 +20,10 @@
#include <cassert>
#include <vector>

-#include <boost/spirit/core.hpp>
-#include <boost/spirit/utility/confix.hpp>
-#include <boost/spirit/utility/lists.hpp>
-#include <boost/spirit/utility/escape_char.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/confix.hpp>
+#include <boost/spirit/include/lists.hpp>
+#include <boost/spirit/include/escape_char.hpp>

///////////////////////////////////////////////////////////////////////////////
using namespace std;

Modified: trunk/libs/spirit/example/fundamental/matching_tags.cpp
==============================================================================
--- trunk/libs/spirit/example/fundamental/matching_tags.cpp (original)
+++ trunk/libs/spirit/example/fundamental/matching_tags.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -15,8 +15,8 @@
// [ JDG 6/30/2002 ]
//
////////////////////////////////////////////////////////////////////////////
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/attribute.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/attribute.hpp>
#include <iostream>
#include <string>

Modified: trunk/libs/spirit/example/fundamental/more_calculators/ast_calc2.cpp
==============================================================================
--- trunk/libs/spirit/example/fundamental/more_calculators/ast_calc2.cpp (original)
+++ trunk/libs/spirit/example/fundamental/more_calculators/ast_calc2.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -6,8 +6,8 @@
License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
=============================================================================*/
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/tree/ast.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/ast.hpp>

#include <iostream>
#include <stack>

Modified: trunk/libs/spirit/example/fundamental/more_calculators/calc_with_variables.cpp
==============================================================================
--- trunk/libs/spirit/example/fundamental/more_calculators/calc_with_variables.cpp (original)
+++ trunk/libs/spirit/example/fundamental/more_calculators/calc_with_variables.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -13,8 +13,8 @@
// [ JDG 9/18/2002 ]
//
///////////////////////////////////////////////////////////////////////////////
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/symbols/symbols.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/symbols.hpp>
#include <iostream>
#include <stack>
#include <functional>

Modified: trunk/libs/spirit/example/fundamental/more_calculators/phoenix_subrule_calc.cpp
==============================================================================
--- trunk/libs/spirit/example/fundamental/more_calculators/phoenix_subrule_calc.cpp (original)
+++ trunk/libs/spirit/example/fundamental/more_calculators/phoenix_subrule_calc.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -17,8 +17,8 @@

//#define BOOST_SPIRIT_DEBUG // define this for debug output

-#include <boost/spirit/core.hpp>
-#include <boost/spirit/attribute.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/attribute.hpp>
#include <iostream>
#include <string>

Modified: trunk/libs/spirit/example/fundamental/more_calculators/primitive_calc.cpp
==============================================================================
--- trunk/libs/spirit/example/fundamental/more_calculators/primitive_calc.cpp (original)
+++ trunk/libs/spirit/example/fundamental/more_calculators/primitive_calc.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -14,9 +14,9 @@
// [ JDG 6/28/2002 ]
//
///////////////////////////////////////////////////////////////////////////////
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/phoenix/primitives.hpp>
-#include <boost/spirit/phoenix/operators.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/primitives.hpp>
+#include <boost/spirit/include/operators.hpp>
#include <iostream>
#include <string>

Modified: trunk/libs/spirit/example/fundamental/more_calculators/rpn_calc.cpp
==============================================================================
--- trunk/libs/spirit/example/fundamental/more_calculators/rpn_calc.cpp (original)
+++ trunk/libs/spirit/example/fundamental/more_calculators/rpn_calc.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -16,9 +16,9 @@
// [ JDG 6/29/2002 ]
//
///////////////////////////////////////////////////////////////////////////////
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/attribute.hpp>
-#include <boost/spirit/phoenix/functions.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/attribute.hpp>
+#include <boost/spirit/include/functions.hpp>
#include <iostream>
#include <string>

Modified: trunk/libs/spirit/example/fundamental/more_calculators/vmachine_calc.cpp
==============================================================================
--- trunk/libs/spirit/example/fundamental/more_calculators/vmachine_calc.cpp (original)
+++ trunk/libs/spirit/example/fundamental/more_calculators/vmachine_calc.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -14,7 +14,7 @@
// [ JDG 9/18/2002 ]
//
////////////////////////////////////////////////////////////////////////////
-#include <boost/spirit/core.hpp>
+#include <boost/spirit/include/core.hpp>
#include <iostream>
#include <vector>
#include <string>

Modified: trunk/libs/spirit/example/fundamental/no_actions.cpp
==============================================================================
--- trunk/libs/spirit/example/fundamental/no_actions.cpp (original)
+++ trunk/libs/spirit/example/fundamental/no_actions.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -18,7 +18,7 @@
#include <cassert>
#include <iostream>
#include <boost/cstdlib.hpp>
-#include <boost/spirit/core.hpp>
+#include <boost/spirit/include/core.hpp>

using namespace std;
using namespace boost;

Modified: trunk/libs/spirit/example/fundamental/number_list.cpp
==============================================================================
--- trunk/libs/spirit/example/fundamental/number_list.cpp (original)
+++ trunk/libs/spirit/example/fundamental/number_list.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -14,8 +14,8 @@
// [ JDG 5/10/2002 ]
//
///////////////////////////////////////////////////////////////////////////////
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/actor/push_back_actor.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/push_back_actor.hpp>
#include <iostream>
#include <vector>
#include <string>

Modified: trunk/libs/spirit/example/fundamental/parse_tree_calc1.cpp
==============================================================================
--- trunk/libs/spirit/example/fundamental/parse_tree_calc1.cpp (original)
+++ trunk/libs/spirit/example/fundamental/parse_tree_calc1.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -14,8 +14,8 @@
///////////////////////////////////////////////////////////////////////////////
#define BOOST_SPIRIT_DUMP_PARSETREE_AS_XML

-#include <boost/spirit/core.hpp>
-#include <boost/spirit/tree/parse_tree.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/parse_tree.hpp>

#include <iostream>
#include <stack>
@@ -23,7 +23,7 @@
#include <string>

#ifdef BOOST_SPIRIT_DUMP_PARSETREE_AS_XML
-#include <boost/spirit/tree/tree_to_xml.hpp>
+#include <boost/spirit/include/tree_to_xml.hpp>
#include <map>
#endif

Modified: trunk/libs/spirit/example/fundamental/parser_context.cpp
==============================================================================
--- trunk/libs/spirit/example/fundamental/parser_context.cpp (original)
+++ trunk/libs/spirit/example/fundamental/parser_context.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -24,8 +24,8 @@
//-----------------------------------------------------------------------------
#include <iostream>
#include <boost/cstdlib.hpp>
-#include <boost/spirit/phoenix.hpp>
-#include <boost/spirit/core.hpp>
+#include <boost/spirit/include/phoenix.hpp>
+#include <boost/spirit/include/core.hpp>

using namespace std;
using namespace boost;

Modified: trunk/libs/spirit/example/fundamental/phoenix_calc.cpp
==============================================================================
--- trunk/libs/spirit/example/fundamental/phoenix_calc.cpp (original)
+++ trunk/libs/spirit/example/fundamental/phoenix_calc.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -14,8 +14,8 @@
// [ JDG 6/29/2002 ]
//
////////////////////////////////////////////////////////////////////////////
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/attribute.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/attribute.hpp>
#include <iostream>
#include <string>

Modified: trunk/libs/spirit/example/fundamental/position_iterator/position_iterator.cpp
==============================================================================
--- trunk/libs/spirit/example/fundamental/position_iterator/position_iterator.cpp (original)
+++ trunk/libs/spirit/example/fundamental/position_iterator/position_iterator.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -15,9 +15,9 @@
// [ JCAB 9/28/2002 ]
//
///////////////////////////////////////////////////////////////////////////////
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/iterator/position_iterator.hpp>
-#include <boost/spirit/utility/functor_parser.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/position_iterator.hpp>
+#include <boost/spirit/include/functor_parser.hpp>
#include <iostream>
#include <fstream>
#include <vector>

Modified: trunk/libs/spirit/example/fundamental/refactoring.cpp
==============================================================================
--- trunk/libs/spirit/example/fundamental/refactoring.cpp (original)
+++ trunk/libs/spirit/example/fundamental/refactoring.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -13,8 +13,8 @@
#include <iostream>
#include <string>

-#include <boost/spirit/core.hpp>
-#include <boost/spirit/meta/refactoring.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/refactoring.hpp>

///////////////////////////////////////////////////////////////////////////////
// used namespaces

Modified: trunk/libs/spirit/example/fundamental/regular_expression.cpp
==============================================================================
--- trunk/libs/spirit/example/fundamental/regular_expression.cpp (original)
+++ trunk/libs/spirit/example/fundamental/regular_expression.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -19,7 +19,7 @@
#include <iostream>

#include <boost/version.hpp>
-#include <boost/spirit/core.hpp>
+#include <boost/spirit/include/core.hpp>

///////////////////////////////////////////////////////////////////////////////
//
@@ -38,7 +38,7 @@
#if BOOST_VERSION <= 103200
#define BOOST_SPIRIT_NO_REGEX_LIB
#endif
-#include <boost/spirit/utility/regex.hpp>
+#include <boost/spirit/include/regex.hpp>

///////////////////////////////////////////////////////////////////////////////
// used namespaces

Modified: trunk/libs/spirit/example/fundamental/roman_numerals.cpp
==============================================================================
--- trunk/libs/spirit/example/fundamental/roman_numerals.cpp (original)
+++ trunk/libs/spirit/example/fundamental/roman_numerals.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -14,8 +14,8 @@
// [ JDG 8/22/2002 ]
//
///////////////////////////////////////////////////////////////////////////////
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/symbols/symbols.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/symbols.hpp>
#include <iostream>
#include <string>

Modified: trunk/libs/spirit/example/fundamental/stuff_vector.cpp
==============================================================================
--- trunk/libs/spirit/example/fundamental/stuff_vector.cpp (original)
+++ trunk/libs/spirit/example/fundamental/stuff_vector.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -15,10 +15,10 @@
// [ JDG 1/12/2004 ]
//
///////////////////////////////////////////////////////////////////////////////
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/phoenix/primitives.hpp>
-#include <boost/spirit/phoenix/operators.hpp>
-#include <boost/spirit/phoenix/functions.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/primitives.hpp>
+#include <boost/spirit/include/operators.hpp>
+#include <boost/spirit/include/functions.hpp>
#include <iostream>
#include <string>

Modified: trunk/libs/spirit/example/fundamental/stuff_vector2.cpp
==============================================================================
--- trunk/libs/spirit/example/fundamental/stuff_vector2.cpp (original)
+++ trunk/libs/spirit/example/fundamental/stuff_vector2.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -15,11 +15,11 @@
// [ JDG 1/12/2004 ]
//
///////////////////////////////////////////////////////////////////////////////
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/phoenix/primitives.hpp>
-#include <boost/spirit/phoenix/operators.hpp>
-#include <boost/spirit/phoenix/functions.hpp>
-#include <boost/spirit/phoenix/casts.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/primitives.hpp>
+#include <boost/spirit/include/operators.hpp>
+#include <boost/spirit/include/functions.hpp>
+#include <boost/spirit/include/casts.hpp>
#include <iostream>
#include <string>

Modified: trunk/libs/spirit/example/fundamental/subrule_calc.cpp
==============================================================================
--- trunk/libs/spirit/example/fundamental/subrule_calc.cpp (original)
+++ trunk/libs/spirit/example/fundamental/subrule_calc.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -17,7 +17,7 @@

//#define BOOST_SPIRIT_DEBUG // define this for debug output

-#include <boost/spirit/core.hpp>
+#include <boost/spirit/include/core.hpp>
#include <iostream>
#include <string>

Modified: trunk/libs/spirit/example/fundamental/sum.cpp
==============================================================================
--- trunk/libs/spirit/example/fundamental/sum.cpp (original)
+++ trunk/libs/spirit/example/fundamental/sum.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -14,9 +14,9 @@
// [ JDG 6/28/2002 ]
//
///////////////////////////////////////////////////////////////////////////////
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/phoenix/primitives.hpp>
-#include <boost/spirit/phoenix/operators.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/primitives.hpp>
+#include <boost/spirit/include/operators.hpp>
#include <iostream>
#include <string>

Modified: trunk/libs/spirit/example/fundamental/thousand_separated.cpp
==============================================================================
--- trunk/libs/spirit/example/fundamental/thousand_separated.cpp (original)
+++ trunk/libs/spirit/example/fundamental/thousand_separated.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -15,8 +15,8 @@
// [ JDG 12/16/2003 ]
//
///////////////////////////////////////////////////////////////////////////////
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/actor/assign_actor.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/assign_actor.hpp>
#include <iostream>
#include <string>

Modified: trunk/libs/spirit/example/intermediate/ipv4.cpp
==============================================================================
--- trunk/libs/spirit/example/intermediate/ipv4.cpp (original)
+++ trunk/libs/spirit/example/intermediate/ipv4.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -6,11 +6,11 @@
License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
=============================================================================*/
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/actor/push_back_actor.hpp>
-#include <boost/spirit/dynamic/if.hpp>
-#include <boost/spirit/dynamic/for.hpp>
-#include <boost/spirit/phoenix.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/push_back_actor.hpp>
+#include <boost/spirit/include/if.hpp>
+#include <boost/spirit/include/for.hpp>
+#include <boost/spirit/include/phoenix.hpp>
#include <iostream>
#include <string>
#include <vector>

Modified: trunk/libs/spirit/example/intermediate/ipv4_opt.cpp
==============================================================================
--- trunk/libs/spirit/example/intermediate/ipv4_opt.cpp (original)
+++ trunk/libs/spirit/example/intermediate/ipv4_opt.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -6,11 +6,11 @@
License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
=============================================================================*/
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/actor/push_back_actor.hpp>
-#include <boost/spirit/dynamic/if.hpp>
-#include <boost/spirit/dynamic/for.hpp>
-#include <boost/spirit/phoenix.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/push_back_actor.hpp>
+#include <boost/spirit/include/if.hpp>
+#include <boost/spirit/include/for.hpp>
+#include <boost/spirit/include/phoenix.hpp>
#include <iostream>
#include <string>
#include <vector>

Modified: trunk/libs/spirit/example/intermediate/lazy_parser.cpp
==============================================================================
--- trunk/libs/spirit/example/intermediate/lazy_parser.cpp (original)
+++ trunk/libs/spirit/example/intermediate/lazy_parser.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -32,11 +32,11 @@
//-----------------------------------------------------------------------------
#include <cassert>
#include <boost/cstdlib.hpp>
-#include <boost/spirit/phoenix.hpp>
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/symbols.hpp>
-#include <boost/spirit/attribute.hpp>
-#include <boost/spirit/dynamic.hpp>
+#include <boost/spirit/include/phoenix.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/symbols.hpp>
+#include <boost/spirit/include/attribute.hpp>
+#include <boost/spirit/include/dynamic.hpp>

using namespace boost;
using namespace spirit;

Modified: trunk/libs/spirit/example/intermediate/parameters.cpp
==============================================================================
--- trunk/libs/spirit/example/intermediate/parameters.cpp (original)
+++ trunk/libs/spirit/example/intermediate/parameters.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -23,13 +23,13 @@
#pragma warning(disable: 4355)
#endif // defined(_MSC_VER) && !defined(__COMO__)

-#include <boost/spirit/core.hpp>
-#include <boost/spirit/symbols/symbols.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/symbols.hpp>

-#include <boost/spirit/phoenix/tuples.hpp>
-#include <boost/spirit/phoenix/tuple_helpers.hpp>
-#include <boost/spirit/phoenix/primitives.hpp>
-#include <boost/spirit/attribute/closure.hpp>
+#include <boost/spirit/include/tuples.hpp>
+#include <boost/spirit/include/tuple_helpers.hpp>
+#include <boost/spirit/include/primitives.hpp>
+#include <boost/spirit/include/closure.hpp>

///////////////////////////////////////////////////////////////////////////////
// used namespaces

Modified: trunk/libs/spirit/example/intermediate/regex_convert.cpp
==============================================================================
--- trunk/libs/spirit/example/intermediate/regex_convert.cpp (original)
+++ trunk/libs/spirit/example/intermediate/regex_convert.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -33,7 +33,7 @@
#include <iterator>

#include <boost/function.hpp>
-#include <boost/spirit/core.hpp>
+#include <boost/spirit/include/core.hpp>

///////////////////////////////////////////////////////////////////////////////
//
@@ -47,7 +47,7 @@
//
///////////////////////////////////////////////////////////////////////////////
#define BOOST_SPIRIT_NO_REGEX_LIB
-#include <boost/spirit/utility/regex.hpp>
+#include <boost/spirit/include/regex.hpp>

using namespace boost::spirit;
using namespace std;

Modified: trunk/libs/spirit/example/intermediate/simple_xml/actions.hpp
==============================================================================
--- trunk/libs/spirit/example/intermediate/simple_xml/actions.hpp (original)
+++ trunk/libs/spirit/example/intermediate/simple_xml/actions.hpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -4,7 +4,7 @@

#ifndef ACTIONS_H
#define ACTIONS_H
-#include <boost/spirit/phoenix.hpp>
+#include <boost/spirit/include/phoenix.hpp>
#include <boost/variant.hpp>
#include "tag.hpp"

Modified: trunk/libs/spirit/example/intermediate/simple_xml/driver.cpp
==============================================================================
--- trunk/libs/spirit/example/intermediate/simple_xml/driver.cpp (original)
+++ trunk/libs/spirit/example/intermediate/simple_xml/driver.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -3,7 +3,7 @@
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

#include "xml_g.hpp"
-#include <boost/spirit/utility.hpp>
+#include <boost/spirit/include/utility.hpp>
#include <iostream>

namespace std

Modified: trunk/libs/spirit/example/intermediate/simple_xml/xml_g.hpp
==============================================================================
--- trunk/libs/spirit/example/intermediate/simple_xml/xml_g.hpp (original)
+++ trunk/libs/spirit/example/intermediate/simple_xml/xml_g.hpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -30,9 +30,9 @@
#define BOOST_SPIRIT_DEBUG_FLAGS (BOOST_SPIRIT_DEBUG_FLAGS_MAX - BOOST_SPIRIT_DEBUG_FLAGS_CLOSURES)
#endif

-#include <boost/spirit/core.hpp>
-#include <boost/spirit/attribute.hpp>
-#include <boost/spirit/phoenix.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/attribute.hpp>
+#include <boost/spirit/include/phoenix.hpp>
#include "tag.hpp"
#include "actions.hpp"
#include <boost/variant.hpp>

Modified: trunk/libs/spirit/example/techniques/dynamic_rule.cpp
==============================================================================
--- trunk/libs/spirit/example/techniques/dynamic_rule.cpp (original)
+++ trunk/libs/spirit/example/techniques/dynamic_rule.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -20,7 +20,7 @@
#define BOOST_SPIRIT_DEBUG
#include <boost/spirit.hpp>

-#include <boost/spirit/actor/assign_actor.hpp>
+#include <boost/spirit/include/assign_actor.hpp>

int main(int argc, char* argv[])
{

Modified: trunk/libs/spirit/example/techniques/epsilon.cpp
==============================================================================
--- trunk/libs/spirit/example/techniques/epsilon.cpp (original)
+++ trunk/libs/spirit/example/techniques/epsilon.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -27,8 +27,8 @@
#include <cassert>
#include <iostream>
#include <boost/cstdlib.hpp>
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/phoenix.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/phoenix.hpp>

using namespace std;
using namespace boost;

Modified: trunk/libs/spirit/example/techniques/multiple_scanners.cpp
==============================================================================
--- trunk/libs/spirit/example/techniques/multiple_scanners.cpp (original)
+++ trunk/libs/spirit/example/techniques/multiple_scanners.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -14,7 +14,7 @@
#define BOOST_SPIRIT_RULE_SCANNERTYPE_LIMIT 3

#include <iostream>
-#include <boost/spirit/core.hpp>
+#include <boost/spirit/include/core.hpp>

using namespace boost::spirit;

Modified: trunk/libs/spirit/example/techniques/nabialek.cpp
==============================================================================
--- trunk/libs/spirit/example/techniques/nabialek.cpp (original)
+++ trunk/libs/spirit/example/techniques/nabialek.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -11,11 +11,11 @@

#define BOOST_SPIRIT_DEBUG

-#include <boost/spirit/core.hpp>
-#include <boost/spirit/error_handling.hpp>
-#include <boost/spirit/iterator.hpp>
-#include <boost/spirit/symbols.hpp>
-#include <boost/spirit/utility.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/error_handling.hpp>
+#include <boost/spirit/include/iterator.hpp>
+#include <boost/spirit/include/symbols.hpp>
+#include <boost/spirit/include/utility.hpp>

using namespace boost::spirit;

Modified: trunk/libs/spirit/example/techniques/no_rules/no_rule1.cpp
==============================================================================
--- trunk/libs/spirit/example/techniques/no_rules/no_rule1.cpp (original)
+++ trunk/libs/spirit/example/techniques/no_rules/no_rule1.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -12,7 +12,7 @@
// *** for information regarding this snippet

#include <iostream>
-#include <boost/spirit/core.hpp>
+#include <boost/spirit/include/core.hpp>

using namespace boost::spirit;

Modified: trunk/libs/spirit/example/techniques/no_rules/no_rule2.cpp
==============================================================================
--- trunk/libs/spirit/example/techniques/no_rules/no_rule2.cpp (original)
+++ trunk/libs/spirit/example/techniques/no_rules/no_rule2.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -12,7 +12,7 @@
// *** for information regarding this snippet

#include <iostream>
-#include <boost/spirit/core.hpp>
+#include <boost/spirit/include/core.hpp>

using namespace boost::spirit;

Modified: trunk/libs/spirit/example/techniques/no_rules/no_rule3.cpp
==============================================================================
--- trunk/libs/spirit/example/techniques/no_rules/no_rule3.cpp (original)
+++ trunk/libs/spirit/example/techniques/no_rules/no_rule3.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -12,7 +12,7 @@
// *** for information regarding this snippet

#include <iostream>
-#include <boost/spirit/core.hpp>
+#include <boost/spirit/include/core.hpp>

using namespace boost::spirit;

Modified: trunk/libs/spirit/example/techniques/no_rules_with_typeof/opaque_rule_parser.cpp
==============================================================================
--- trunk/libs/spirit/example/techniques/no_rules_with_typeof/opaque_rule_parser.cpp (original)
+++ trunk/libs/spirit/example/techniques/no_rules_with_typeof/opaque_rule_parser.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -8,16 +8,16 @@
==============================================================================*/
//------------------------------------------------------------------------------
// This example demonstrates the opaque rule parser.
-// See boost/spirit/utility/rule_parser.hpp for details.
+// See boost/spirit/include/rule_parser.hpp for details.
//------------------------------------------------------------------------------
#include <iostream>

#include <boost/typeof/typeof.hpp>

-#include <boost/spirit/core.hpp>
-#include <boost/spirit/core/typeof.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/typeof.hpp>

-#include <boost/spirit/utility/rule_parser.hpp>
+#include <boost/spirit/include/rule_parser.hpp>

#include BOOST_TYPEOF_INCREMENT_REGISTRATION_GROUP()

Modified: trunk/libs/spirit/example/techniques/no_rules_with_typeof/rule_parser_1_1.cpp
==============================================================================
--- trunk/libs/spirit/example/techniques/no_rules_with_typeof/rule_parser_1_1.cpp (original)
+++ trunk/libs/spirit/example/techniques/no_rules_with_typeof/rule_parser_1_1.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -8,20 +8,20 @@
==============================================================================*/
//------------------------------------------------------------------------------
// This example uses typeof to build a nonrecursive grammar.
-// See boost/spirit/utility/rule_parser.hpp for details.
+// See boost/spirit/include/rule_parser.hpp for details.
//------------------------------------------------------------------------------
#include <string>
#include <iostream>

#include <boost/typeof/typeof.hpp>

-#include <boost/spirit/core.hpp>
-#include <boost/spirit/core/typeof.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/typeof.hpp>

-#include <boost/spirit/utility/confix.hpp>
-#include <boost/spirit/utility/typeof.hpp>
+#include <boost/spirit/include/confix.hpp>
+#include <boost/spirit/include/typeof.hpp>

-#include <boost/spirit/utility/rule_parser.hpp>
+#include <boost/spirit/include/rule_parser.hpp>

// It's important to create an own registration group, even if there are no
// manual Typeof registrations like in this case.

Modified: trunk/libs/spirit/example/techniques/no_rules_with_typeof/rule_parser_1_2.cpp
==============================================================================
--- trunk/libs/spirit/example/techniques/no_rules_with_typeof/rule_parser_1_2.cpp (original)
+++ trunk/libs/spirit/example/techniques/no_rules_with_typeof/rule_parser_1_2.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -8,20 +8,20 @@
==============================================================================*/
//------------------------------------------------------------------------------
// This example uses typeof to build a nonrecursive grammar.
-// See boost/spirit/utility/rule_parser.hpp for details.
+// See boost/spirit/include/rule_parser.hpp for details.
//------------------------------------------------------------------------------
#include <string>
#include <iostream>

#include <boost/typeof/typeof.hpp>

-#include <boost/spirit/core.hpp>
-#include <boost/spirit/core/typeof.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/typeof.hpp>

-#include <boost/spirit/utility/confix.hpp>
-#include <boost/spirit/utility/typeof.hpp>
+#include <boost/spirit/include/confix.hpp>
+#include <boost/spirit/include/typeof.hpp>

-#include <boost/spirit/utility/rule_parser.hpp>
+#include <boost/spirit/include/rule_parser.hpp>

// It's important to create an own registration group, even if there are no
// manual Typeof registrations like in this case.

Modified: trunk/libs/spirit/example/techniques/no_rules_with_typeof/rule_parser_2_1.cpp
==============================================================================
--- trunk/libs/spirit/example/techniques/no_rules_with_typeof/rule_parser_2_1.cpp (original)
+++ trunk/libs/spirit/example/techniques/no_rules_with_typeof/rule_parser_2_1.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -9,7 +9,7 @@
==============================================================================*/
//------------------------------------------------------------------------------
// This example shows a recursive grammar built using subrules and typeof.
-// See boost/spirit/utility/rule_parser.hpp for details.
+// See boost/spirit/include/rule_parser.hpp for details.
// This example is based on subrule_calc.cpp.
//------------------------------------------------------------------------------
#include <string>
@@ -17,10 +17,10 @@

#include <boost/typeof/typeof.hpp>

-#include <boost/spirit/core.hpp>
-#include <boost/spirit/core/typeof.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/typeof.hpp>

-#include <boost/spirit/utility/rule_parser.hpp>
+#include <boost/spirit/include/rule_parser.hpp>

// Don't forget to
#include BOOST_TYPEOF_INCREMENT_REGISTRATION_GROUP()

Modified: trunk/libs/spirit/example/techniques/no_rules_with_typeof/rule_parser_2_2.cpp
==============================================================================
--- trunk/libs/spirit/example/techniques/no_rules_with_typeof/rule_parser_2_2.cpp (original)
+++ trunk/libs/spirit/example/techniques/no_rules_with_typeof/rule_parser_2_2.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -10,7 +10,7 @@
//------------------------------------------------------------------------------
// This example demonstrates how to make recursive grammars scale with typeof.
// It uses a rule parser with member variables and the parser_reference utility.
-// See boost/spirit/utility/rule_parser.hpp for details.
+// See boost/spirit/include/rule_parser.hpp for details.
// This example is based on subrule_calc.cpp.
//------------------------------------------------------------------------------
#include <string>
@@ -28,10 +28,10 @@

#include <boost/typeof/typeof.hpp>

-#include <boost/spirit/core.hpp>
-#include <boost/spirit/core/typeof.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/typeof.hpp>

-#include <boost/spirit/utility/rule_parser.hpp>
+#include <boost/spirit/include/rule_parser.hpp>

// Don't forget to

Modified: trunk/libs/spirit/example/techniques/right_recursion.cpp
==============================================================================
--- trunk/libs/spirit/example/techniques/right_recursion.cpp (original)
+++ trunk/libs/spirit/example/techniques/right_recursion.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -9,7 +9,7 @@
#include <iostream>

#define BOOST_SPIRIT_DEBUG
-#include <boost/spirit/core.hpp>
+#include <boost/spirit/include/core.hpp>

using namespace boost::spirit;

Modified: trunk/libs/spirit/example/techniques/typeof.cpp
==============================================================================
--- trunk/libs/spirit/example/techniques/typeof.cpp (original)
+++ trunk/libs/spirit/example/techniques/typeof.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -12,7 +12,7 @@
// *** this snippet.

#include <iostream>
-#include <boost/spirit/core.hpp>
+#include <boost/spirit/include/core.hpp>
#include <boost/typeof/typeof.hpp>

using namespace boost::spirit;

Modified: trunk/libs/spirit/phoenix/example/fundamental/closures.cpp
==============================================================================
--- trunk/libs/spirit/phoenix/example/fundamental/closures.cpp (original)
+++ trunk/libs/spirit/phoenix/example/fundamental/closures.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -12,13 +12,13 @@
#include <cassert>

#define PHOENIX_LIMIT 15
-#include <boost/spirit/phoenix/operators.hpp>
-#include <boost/spirit/phoenix/primitives.hpp>
-#include <boost/spirit/phoenix/composite.hpp>
-#include <boost/spirit/phoenix/special_ops.hpp>
-#include <boost/spirit/phoenix/statements.hpp>
-#include <boost/spirit/phoenix/functions.hpp>
-#include <boost/spirit/phoenix/closures.hpp>
+#include <boost/spirit/include/operators.hpp>
+#include <boost/spirit/include/primitives.hpp>
+#include <boost/spirit/include/composite.hpp>
+#include <boost/spirit/include/special_ops.hpp>
+#include <boost/spirit/include/statements.hpp>
+#include <boost/spirit/include/functions.hpp>
+#include <boost/spirit/include/closures.hpp>

//////////////////////////////////
using namespace std;

Modified: trunk/libs/spirit/phoenix/example/fundamental/sample10.cpp
==============================================================================
--- trunk/libs/spirit/phoenix/example/fundamental/sample10.cpp (original)
+++ trunk/libs/spirit/phoenix/example/fundamental/sample10.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -11,12 +11,12 @@
#include <iostream>

#define PHOENIX_LIMIT 5
-#include <boost/spirit/phoenix/operators.hpp>
-#include <boost/spirit/phoenix/primitives.hpp>
-#include <boost/spirit/phoenix/composite.hpp>
-#include <boost/spirit/phoenix/special_ops.hpp>
-#include <boost/spirit/phoenix/statements.hpp>
-#include <boost/spirit/phoenix/functions.hpp>
+#include <boost/spirit/include/operators.hpp>
+#include <boost/spirit/include/primitives.hpp>
+#include <boost/spirit/include/composite.hpp>
+#include <boost/spirit/include/special_ops.hpp>
+#include <boost/spirit/include/statements.hpp>
+#include <boost/spirit/include/functions.hpp>

namespace phoenix {

Modified: trunk/libs/spirit/phoenix/example/fundamental/sample2.cpp
==============================================================================
--- trunk/libs/spirit/phoenix/example/fundamental/sample2.cpp (original)
+++ trunk/libs/spirit/phoenix/example/fundamental/sample2.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -9,8 +9,8 @@
#include <vector>
#include <algorithm>
#include <iostream>
-#include <boost/spirit/phoenix/operators.hpp>
-#include <boost/spirit/phoenix/primitives.hpp>
+#include <boost/spirit/include/operators.hpp>
+#include <boost/spirit/include/primitives.hpp>

using namespace std;
using namespace phoenix;

Modified: trunk/libs/spirit/phoenix/example/fundamental/sample3.cpp
==============================================================================
--- trunk/libs/spirit/phoenix/example/fundamental/sample3.cpp (original)
+++ trunk/libs/spirit/phoenix/example/fundamental/sample3.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -9,8 +9,8 @@
#include <vector>
#include <algorithm>
#include <iostream>
-#include <boost/spirit/phoenix/functions.hpp>
-#include <boost/spirit/phoenix/primitives.hpp>
+#include <boost/spirit/include/functions.hpp>
+#include <boost/spirit/include/primitives.hpp>

using namespace std;
using namespace phoenix;

Modified: trunk/libs/spirit/phoenix/example/fundamental/sample4.cpp
==============================================================================
--- trunk/libs/spirit/phoenix/example/fundamental/sample4.cpp (original)
+++ trunk/libs/spirit/phoenix/example/fundamental/sample4.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -9,10 +9,10 @@
#include <vector>
#include <algorithm>
#include <iostream>
-#include <boost/spirit/phoenix/operators.hpp>
-#include <boost/spirit/phoenix/primitives.hpp>
-#include <boost/spirit/phoenix/statements.hpp>
-#include <boost/spirit/phoenix/special_ops.hpp>
+#include <boost/spirit/include/operators.hpp>
+#include <boost/spirit/include/primitives.hpp>
+#include <boost/spirit/include/statements.hpp>
+#include <boost/spirit/include/special_ops.hpp>

using namespace std;
using namespace phoenix;

Modified: trunk/libs/spirit/phoenix/example/fundamental/sample5.cpp
==============================================================================
--- trunk/libs/spirit/phoenix/example/fundamental/sample5.cpp (original)
+++ trunk/libs/spirit/phoenix/example/fundamental/sample5.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -9,8 +9,8 @@
#include <vector>
#include <algorithm>
#include <iostream>
-#include <boost/spirit/phoenix/operators.hpp>
-#include <boost/spirit/phoenix/primitives.hpp>
+#include <boost/spirit/include/operators.hpp>
+#include <boost/spirit/include/primitives.hpp>

using namespace std;
using namespace phoenix;

Modified: trunk/libs/spirit/phoenix/example/fundamental/sample6.cpp
==============================================================================
--- trunk/libs/spirit/phoenix/example/fundamental/sample6.cpp (original)
+++ trunk/libs/spirit/phoenix/example/fundamental/sample6.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -9,10 +9,10 @@
#include <vector>
#include <algorithm>
#include <iostream>
-#include <boost/spirit/phoenix/operators.hpp>
-#include <boost/spirit/phoenix/primitives.hpp>
-#include <boost/spirit/phoenix/composite.hpp>
-#include <boost/spirit/phoenix/special_ops.hpp>
+#include <boost/spirit/include/operators.hpp>
+#include <boost/spirit/include/primitives.hpp>
+#include <boost/spirit/include/composite.hpp>
+#include <boost/spirit/include/special_ops.hpp>

using namespace std;
using namespace phoenix;

Modified: trunk/libs/spirit/phoenix/example/fundamental/sample7.cpp
==============================================================================
--- trunk/libs/spirit/phoenix/example/fundamental/sample7.cpp (original)
+++ trunk/libs/spirit/phoenix/example/fundamental/sample7.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -11,11 +11,11 @@
#include <iostream>

#define PHOENIX_LIMIT 5
-#include <boost/spirit/phoenix/operators.hpp>
-#include <boost/spirit/phoenix/primitives.hpp>
-#include <boost/spirit/phoenix/composite.hpp>
-#include <boost/spirit/phoenix/special_ops.hpp>
-#include <boost/spirit/phoenix/statements.hpp>
+#include <boost/spirit/include/operators.hpp>
+#include <boost/spirit/include/primitives.hpp>
+#include <boost/spirit/include/composite.hpp>
+#include <boost/spirit/include/special_ops.hpp>
+#include <boost/spirit/include/statements.hpp>

namespace phoenix {

Modified: trunk/libs/spirit/phoenix/example/fundamental/sample8.cpp
==============================================================================
--- trunk/libs/spirit/phoenix/example/fundamental/sample8.cpp (original)
+++ trunk/libs/spirit/phoenix/example/fundamental/sample8.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -11,11 +11,11 @@
#include <iostream>

#define PHOENIX_LIMIT 5
-#include <boost/spirit/phoenix/operators.hpp>
-#include <boost/spirit/phoenix/primitives.hpp>
-#include <boost/spirit/phoenix/composite.hpp>
-#include <boost/spirit/phoenix/special_ops.hpp>
-#include <boost/spirit/phoenix/statements.hpp>
+#include <boost/spirit/include/operators.hpp>
+#include <boost/spirit/include/primitives.hpp>
+#include <boost/spirit/include/composite.hpp>
+#include <boost/spirit/include/special_ops.hpp>
+#include <boost/spirit/include/statements.hpp>

namespace phoenix {

Modified: trunk/libs/spirit/phoenix/example/fundamental/sample9.cpp
==============================================================================
--- trunk/libs/spirit/phoenix/example/fundamental/sample9.cpp (original)
+++ trunk/libs/spirit/phoenix/example/fundamental/sample9.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -11,11 +11,11 @@
#include <iostream>

#define PHOENIX_LIMIT 5
-#include <boost/spirit/phoenix/operators.hpp>
-#include <boost/spirit/phoenix/primitives.hpp>
-#include <boost/spirit/phoenix/composite.hpp>
-#include <boost/spirit/phoenix/special_ops.hpp>
-#include <boost/spirit/phoenix/statements.hpp>
+#include <boost/spirit/include/operators.hpp>
+#include <boost/spirit/include/primitives.hpp>
+#include <boost/spirit/include/composite.hpp>
+#include <boost/spirit/include/special_ops.hpp>
+#include <boost/spirit/include/statements.hpp>

namespace phoenix {

Modified: trunk/libs/spirit/phoenix/test/binary_tests.cpp
==============================================================================
--- trunk/libs/spirit/phoenix/test/binary_tests.cpp (original)
+++ trunk/libs/spirit/phoenix/test/binary_tests.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -16,8 +16,8 @@
#include <boost/detail/lightweight_test.hpp>

#define PHOENIX_LIMIT 15
-#include <boost/spirit/phoenix/primitives.hpp>
-#include <boost/spirit/phoenix/operators.hpp>
+#include <boost/spirit/include/phx1_primitives.hpp>
+#include <boost/spirit/include/phx1_operators.hpp>

using namespace phoenix;
using namespace std;

Modified: trunk/libs/spirit/phoenix/test/binders_tests.cpp
==============================================================================
--- trunk/libs/spirit/phoenix/test/binders_tests.cpp (original)
+++ trunk/libs/spirit/phoenix/test/binders_tests.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -11,9 +11,9 @@
#include <boost/detail/lightweight_test.hpp>

#define PHOENIX_LIMIT 15
-#include <boost/spirit/phoenix/primitives.hpp>
-#include <boost/spirit/phoenix/composite.hpp>
-#include <boost/spirit/phoenix/binders.hpp>
+#include <boost/spirit/include/phx1_primitives.hpp>
+#include <boost/spirit/include/phx1_composite.hpp>
+#include <boost/spirit/include/phx1_binders.hpp>

using namespace phoenix;
using namespace std;

Modified: trunk/libs/spirit/phoenix/test/functors_tests.cpp
==============================================================================
--- trunk/libs/spirit/phoenix/test/functors_tests.cpp (original)
+++ trunk/libs/spirit/phoenix/test/functors_tests.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -11,10 +11,10 @@
#include <boost/detail/lightweight_test.hpp>

#define PHOENIX_LIMIT 15
-#include <boost/spirit/phoenix/primitives.hpp>
-#include <boost/spirit/phoenix/composite.hpp>
-#include <boost/spirit/phoenix/functions.hpp>
-#include <boost/spirit/phoenix/operators.hpp>
+#include <boost/spirit/include/phx1_primitives.hpp>
+#include <boost/spirit/include/phx1_composite.hpp>
+#include <boost/spirit/include/phx1_functions.hpp>
+#include <boost/spirit/include/phx1_operators.hpp>

using namespace phoenix;
using namespace std;

Modified: trunk/libs/spirit/phoenix/test/iostream_tests.cpp
==============================================================================
--- trunk/libs/spirit/phoenix/test/iostream_tests.cpp (original)
+++ trunk/libs/spirit/phoenix/test/iostream_tests.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -30,10 +30,10 @@
#endif

//#define PHOENIX_LIMIT 15
-#include <boost/spirit/phoenix/primitives.hpp>
-#include <boost/spirit/phoenix/composite.hpp>
-#include <boost/spirit/phoenix/operators.hpp>
-#include <boost/spirit/phoenix/special_ops.hpp>
+#include <boost/spirit/include/phx1_primitives.hpp>
+#include <boost/spirit/include/phx1_composite.hpp>
+#include <boost/spirit/include/phx1_operators.hpp>
+#include <boost/spirit/include/phx1_special_ops.hpp>

using namespace phoenix;
using namespace std;

Modified: trunk/libs/spirit/phoenix/test/mixed_binary_tests.cpp
==============================================================================
--- trunk/libs/spirit/phoenix/test/mixed_binary_tests.cpp (original)
+++ trunk/libs/spirit/phoenix/test/mixed_binary_tests.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -11,8 +11,8 @@
#include <boost/detail/lightweight_test.hpp>

#define PHOENIX_LIMIT 15
-#include <boost/spirit/phoenix/primitives.hpp>
-#include <boost/spirit/phoenix/operators.hpp>
+#include <boost/spirit/include/phx1_primitives.hpp>
+#include <boost/spirit/include/phx1_operators.hpp>

using namespace phoenix;
using namespace std;

Modified: trunk/libs/spirit/phoenix/test/more_expressions_tests.cpp
==============================================================================
--- trunk/libs/spirit/phoenix/test/more_expressions_tests.cpp (original)
+++ trunk/libs/spirit/phoenix/test/more_expressions_tests.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -10,10 +10,10 @@
#include <boost/detail/lightweight_test.hpp>

#define PHOENIX_LIMIT 15
-#include <boost/spirit/phoenix/primitives.hpp>
-#include <boost/spirit/phoenix/composite.hpp>
-#include <boost/spirit/phoenix/functions.hpp>
-#include <boost/spirit/phoenix/operators.hpp>
+#include <boost/spirit/include/phx1_primitives.hpp>
+#include <boost/spirit/include/phx1_composite.hpp>
+#include <boost/spirit/include/phx1_functions.hpp>
+#include <boost/spirit/include/phx1_operators.hpp>

using namespace phoenix;
using namespace std;

Modified: trunk/libs/spirit/phoenix/test/new_test.cpp
==============================================================================
--- trunk/libs/spirit/phoenix/test/new_test.cpp (original)
+++ trunk/libs/spirit/phoenix/test/new_test.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -11,8 +11,8 @@
#include <boost/detail/lightweight_test.hpp>

#define PHOENIX_LIMIT 15
-#include <boost/spirit/phoenix/primitives.hpp>
-#include <boost/spirit/phoenix/new.hpp>
+#include <boost/spirit/include/phx1_primitives.hpp>
+#include <boost/spirit/include/phx1_new.hpp>

using namespace phoenix;
using namespace std;

Modified: trunk/libs/spirit/phoenix/test/primitives_tests.cpp
==============================================================================
--- trunk/libs/spirit/phoenix/test/primitives_tests.cpp (original)
+++ trunk/libs/spirit/phoenix/test/primitives_tests.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -10,7 +10,7 @@
#include <boost/detail/lightweight_test.hpp>

#define PHOENIX_LIMIT 15
-#include <boost/spirit/phoenix/primitives.hpp>
+#include <boost/spirit/include/phx1_primitives.hpp>

using namespace phoenix;
using namespace std;

Modified: trunk/libs/spirit/phoenix/test/statements_tests.cpp
==============================================================================
--- trunk/libs/spirit/phoenix/test/statements_tests.cpp (original)
+++ trunk/libs/spirit/phoenix/test/statements_tests.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -12,11 +12,11 @@
#include <boost/detail/lightweight_test.hpp>

#define PHOENIX_LIMIT 15
-#include <boost/spirit/phoenix/primitives.hpp>
-#include <boost/spirit/phoenix/functions.hpp>
-#include <boost/spirit/phoenix/operators.hpp>
-#include <boost/spirit/phoenix/special_ops.hpp>
-#include <boost/spirit/phoenix/statements.hpp>
+#include <boost/spirit/include/phx1_primitives.hpp>
+#include <boost/spirit/include/phx1_functions.hpp>
+#include <boost/spirit/include/phx1_operators.hpp>
+#include <boost/spirit/include/phx1_special_ops.hpp>
+#include <boost/spirit/include/phx1_statements.hpp>

using namespace phoenix;
using namespace std;

Modified: trunk/libs/spirit/phoenix/test/stl_tests.cpp
==============================================================================
--- trunk/libs/spirit/phoenix/test/stl_tests.cpp (original)
+++ trunk/libs/spirit/phoenix/test/stl_tests.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -13,12 +13,12 @@
#include <boost/detail/lightweight_test.hpp>

#define PHOENIX_LIMIT 15
-#include <boost/spirit/phoenix/primitives.hpp>
-#include <boost/spirit/phoenix/composite.hpp>
-#include <boost/spirit/phoenix/functions.hpp>
-#include <boost/spirit/phoenix/operators.hpp>
-#include <boost/spirit/phoenix/binders.hpp>
-#include <boost/spirit/phoenix/special_ops.hpp>
+#include <boost/spirit/include/phx1_primitives.hpp>
+#include <boost/spirit/include/phx1_composite.hpp>
+#include <boost/spirit/include/phx1_functions.hpp>
+#include <boost/spirit/include/phx1_operators.hpp>
+#include <boost/spirit/include/phx1_binders.hpp>
+#include <boost/spirit/include/phx1_special_ops.hpp>

using namespace phoenix;
using namespace std;

Modified: trunk/libs/spirit/phoenix/test/tuples_tests.cpp
==============================================================================
--- trunk/libs/spirit/phoenix/test/tuples_tests.cpp (original)
+++ trunk/libs/spirit/phoenix/test/tuples_tests.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -9,7 +9,7 @@
#include <iostream>
#include <string>
#include <boost/detail/lightweight_test.hpp>
-#include <boost/spirit/phoenix/tuples.hpp>
+#include <boost/spirit/include/phx1_tuples.hpp>

using namespace std;
using namespace phoenix;

Modified: trunk/libs/spirit/phoenix/test/unary_tests.cpp
==============================================================================
--- trunk/libs/spirit/phoenix/test/unary_tests.cpp (original)
+++ trunk/libs/spirit/phoenix/test/unary_tests.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -10,8 +10,8 @@
#include <boost/detail/lightweight_test.hpp>

#define PHOENIX_LIMIT 15
-#include <boost/spirit/phoenix/primitives.hpp>
-#include <boost/spirit/phoenix/operators.hpp>
+#include <boost/spirit/include/phx1_primitives.hpp>
+#include <boost/spirit/include/phx1_operators.hpp>

using namespace phoenix;
using namespace std;

Modified: trunk/libs/spirit/test/actor/assign_key_test.cpp
==============================================================================
--- trunk/libs/spirit/test/actor/assign_key_test.cpp (original)
+++ trunk/libs/spirit/test/actor/assign_key_test.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -12,14 +12,14 @@
///////////////////////////////////////////////////////////////////////////////

#include "action_tests.hpp"
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/utility/confix.hpp>
-#include <boost/spirit/utility/lists.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/confix.hpp>
+#include <boost/spirit/include/lists.hpp>
#include <map>
#include <cstring>
#include <iostream>
-#include <boost/spirit/actor/assign_key_actor.hpp>
-#include <boost/spirit/actor/assign_actor.hpp>
+#include <boost/spirit/include/assign_key_actor.hpp>
+#include <boost/spirit/include/assign_actor.hpp>

void assign_key_single_argument_test()
{

Modified: trunk/libs/spirit/test/actor/assign_test.cpp
==============================================================================
--- trunk/libs/spirit/test/actor/assign_test.cpp (original)
+++ trunk/libs/spirit/test/actor/assign_test.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -12,8 +12,8 @@
///////////////////////////////////////////////////////////////////////////////

#include "action_tests.hpp"
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/actor/assign_actor.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/assign_actor.hpp>

void assign_test()
{

Modified: trunk/libs/spirit/test/actor/clear_test.cpp
==============================================================================
--- trunk/libs/spirit/test/actor/clear_test.cpp (original)
+++ trunk/libs/spirit/test/actor/clear_test.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -12,9 +12,9 @@
///////////////////////////////////////////////////////////////////////////////

#include "action_tests.hpp"
-#include <boost/spirit/core.hpp>
+#include <boost/spirit/include/core.hpp>
#include <vector>
-#include <boost/spirit/actor/clear_actor.hpp>
+#include <boost/spirit/include/clear_actor.hpp>

void clear_action_test()
{

Modified: trunk/libs/spirit/test/actor/decrement_test.cpp
==============================================================================
--- trunk/libs/spirit/test/actor/decrement_test.cpp (original)
+++ trunk/libs/spirit/test/actor/decrement_test.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -12,8 +12,8 @@
///////////////////////////////////////////////////////////////////////////////

#include "action_tests.hpp"
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/actor/decrement_actor.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/decrement_actor.hpp>

void decrement_action_test()
{

Modified: trunk/libs/spirit/test/actor/erase_at_test.cpp
==============================================================================
--- trunk/libs/spirit/test/actor/erase_at_test.cpp (original)
+++ trunk/libs/spirit/test/actor/erase_at_test.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -12,8 +12,8 @@
///////////////////////////////////////////////////////////////////////////////

#include "action_tests.hpp"
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/actor/erase_actor.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/erase_actor.hpp>
#include <map>

void erase_action_test()

Modified: trunk/libs/spirit/test/actor/increment_test.cpp
==============================================================================
--- trunk/libs/spirit/test/actor/increment_test.cpp (original)
+++ trunk/libs/spirit/test/actor/increment_test.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -12,8 +12,8 @@
///////////////////////////////////////////////////////////////////////////////

#include "action_tests.hpp"
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/actor/increment_actor.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/increment_actor.hpp>

void increment_action_test()
{

Modified: trunk/libs/spirit/test/actor/insert_at_test.cpp
==============================================================================
--- trunk/libs/spirit/test/actor/insert_at_test.cpp (original)
+++ trunk/libs/spirit/test/actor/insert_at_test.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -15,7 +15,7 @@
#include <map>
#include <cstring>
#include <iostream>
-#include <boost/spirit/actor/insert_at_actor.hpp>
+#include <boost/spirit/include/insert_at_actor.hpp>

void insert_at_single_argument_test()
{

Modified: trunk/libs/spirit/test/actor/insert_key_test.cpp
==============================================================================
--- trunk/libs/spirit/test/actor/insert_key_test.cpp (original)
+++ trunk/libs/spirit/test/actor/insert_key_test.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -12,14 +12,14 @@
///////////////////////////////////////////////////////////////////////////////

#include "action_tests.hpp"
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/utility/confix.hpp>
-#include <boost/spirit/utility/lists.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/confix.hpp>
+#include <boost/spirit/include/lists.hpp>
#include <map>
#include <cstring>
#include <iostream>
-#include <boost/spirit/actor/insert_key_actor.hpp>
-#include <boost/spirit/actor/assign_actor.hpp>
+#include <boost/spirit/include/insert_key_actor.hpp>
+#include <boost/spirit/include/assign_actor.hpp>

void insert_key_single_argument_test()
{

Modified: trunk/libs/spirit/test/actor/push_back_test.cpp
==============================================================================
--- trunk/libs/spirit/test/actor/push_back_test.cpp (original)
+++ trunk/libs/spirit/test/actor/push_back_test.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -17,11 +17,11 @@
#include <deque>
#include <cstring>
#include <iostream>
-#include <boost/spirit/core.hpp>
+#include <boost/spirit/include/core.hpp>
#include <algorithm>
#include <boost/bind.hpp>
-#include <boost/spirit/actor/push_back_actor.hpp>
-#include <boost/spirit/utility/lists.hpp>
+#include <boost/spirit/include/push_back_actor.hpp>
+#include <boost/spirit/include/lists.hpp>

template<typename ContainerT>
void push_back_test()

Modified: trunk/libs/spirit/test/actor/push_front_test.cpp
==============================================================================
--- trunk/libs/spirit/test/actor/push_front_test.cpp (original)
+++ trunk/libs/spirit/test/actor/push_front_test.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -17,9 +17,9 @@
#include <deque>
#include <cstring>
#include <iostream>
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/actor/push_front_actor.hpp>
-#include <boost/spirit/utility/lists.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/push_front_actor.hpp>
+#include <boost/spirit/include/lists.hpp>

template<typename ContainerT>
void push_front_test()

Modified: trunk/libs/spirit/test/actor/swap_test.cpp
==============================================================================
--- trunk/libs/spirit/test/actor/swap_test.cpp (original)
+++ trunk/libs/spirit/test/actor/swap_test.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -12,8 +12,8 @@
///////////////////////////////////////////////////////////////////////////////

#include "action_tests.hpp"
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/actor/swap_actor.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/swap_actor.hpp>

void swap_action_test()
{

Modified: trunk/libs/spirit/test/ast_calc_tests.cpp
==============================================================================
--- trunk/libs/spirit/test/ast_calc_tests.cpp (original)
+++ trunk/libs/spirit/test/ast_calc_tests.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -8,9 +8,9 @@
=============================================================================*/
// JDG 4-16-03 Modified from ast_calc.cpp as a test

-#include <boost/spirit/core.hpp>
-#include <boost/spirit/tree/ast.hpp>
-#include <boost/spirit/tree/tree_to_xml.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/ast.hpp>
+#include <boost/spirit/include/tree_to_xml.hpp>
#include <boost/detail/workaround.hpp>

#include <iostream>

Modified: trunk/libs/spirit/test/bug_000008.cpp
==============================================================================
--- trunk/libs/spirit/test/bug_000008.cpp (original)
+++ trunk/libs/spirit/test/bug_000008.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -46,8 +46,8 @@
#undef PHOENIX_THREADSAFE
#define PHOENIX_THREADSAFE

-#include <boost/spirit/core.hpp>
-#include <boost/spirit/attribute/closure.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/closure.hpp>
#include <boost/thread.hpp>

static const int number_of_calls_to_parse_per_thread=20000;

Modified: trunk/libs/spirit/test/bug_fixes.cpp
==============================================================================
--- trunk/libs/spirit/test/bug_fixes.cpp (original)
+++ trunk/libs/spirit/test/bug_fixes.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -9,8 +9,8 @@
http://www.boost.org/LICENSE_1_0.txt)
=============================================================================*/
#include <boost/detail/lightweight_test.hpp>
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/actor/assign_actor.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/assign_actor.hpp>

using namespace boost;
using namespace boost::spirit;
@@ -25,7 +25,7 @@
// http://sf.net/mailarchive/forum.php?thread_id=1966224&forum_id=1595
//
///////////////////////////////////////////////////////////////////////////////
-#include <boost/spirit/tree/ast.hpp>
+#include <boost/spirit/include/ast.hpp>

struct my_action
{
@@ -53,7 +53,7 @@
// http://article.gmane.org/gmane.comp.parsers.spirit.general/3678
//
///////////////////////////////////////////////////////////////////////////////
-#include <boost/spirit/attribute.hpp>
+#include <boost/spirit/include/attribute.hpp>
#include <string>

typedef std::string member_type;
@@ -77,7 +77,7 @@
// http://sourceforge.net/mailarchive/forum.php?thread_id=2008510&forum_id=25901
//
///////////////////////////////////////////////////////////////////////////////
-#include <boost/spirit/utility/chset.hpp>
+#include <boost/spirit/include/chset.hpp>

void bug_003()
{
@@ -95,7 +95,7 @@
//
///////////////////////////////////////////////////////////////////////////////
#include <boost/limits.hpp>
-#include <boost/spirit/utility/chset.hpp>
+#include <boost/spirit/include/chset.hpp>

void bug_004()
{
@@ -138,7 +138,7 @@
// will trigger the post-skip.
//
///////////////////////////////////////////////////////////////////////////////
-#include <boost/spirit/core.hpp>
+#include <boost/spirit/include/core.hpp>

using namespace std;
using namespace boost;
@@ -179,7 +179,7 @@
//
///////////////////////////////////////////////////////////////////////////////
#include <boost/limits.hpp>
-#include <boost/spirit/utility/confix.hpp>
+#include <boost/spirit/include/confix.hpp>

void bug_006()
{
@@ -202,8 +202,8 @@
// will trigger the post-skip.
//
///////////////////////////////////////////////////////////////////////////////
-#include <boost/spirit/tree/ast.hpp>
-#include <boost/spirit/tree/parse_tree.hpp>
+#include <boost/spirit/include/ast.hpp>
+#include <boost/spirit/include/parse_tree.hpp>

void bug_007()
{
@@ -221,7 +221,7 @@
//
///////////////////////////////////////////////////////////////////////////////
#include <boost/cstdlib.hpp>
-#include <boost/spirit/utility/chset.hpp>
+#include <boost/spirit/include/chset.hpp>

void sf_bug_718903()
{
@@ -238,7 +238,7 @@
// ?func=detail&aid=719322&group_id=28447&atid=393386
//
///////////////////////////////////////////////////////////////////////////////
-#include <boost/spirit/utility/impl/chset/basic_chset.hpp>
+#include <boost/spirit/include/basic_chset.hpp>

void sf_bug_719322()
{
@@ -256,8 +256,8 @@
// ?func=detail&atid=393386&aid=742038&group_id=28447
//
///////////////////////////////////////////////////////////////////////////////
-#include <boost/spirit/iterator/position_iterator.hpp>
-#include <boost/spirit/iterator/file_iterator.hpp>
+#include <boost/spirit/include/position_iterator.hpp>
+#include <boost/spirit/include/file_iterator.hpp>
#include <string>
#include <fstream>
#include <iostream>

Modified: trunk/libs/spirit/test/char_strings_test.cpp
==============================================================================
--- trunk/libs/spirit/test/char_strings_test.cpp (original)
+++ trunk/libs/spirit/test/char_strings_test.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -7,8 +7,8 @@
http://www.boost.org/LICENSE_1_0.txt)
=============================================================================*/

-#include <boost/spirit/core/primitives/primitives.hpp>
-#include <boost/spirit/core/non_terminal/rule.hpp>
+#include <boost/spirit/include/primitives.hpp>
+#include <boost/spirit/include/rule.hpp>

#include <string>

Modified: trunk/libs/spirit/test/char_strings_test_fail.cpp
==============================================================================
--- trunk/libs/spirit/test/char_strings_test_fail.cpp (original)
+++ trunk/libs/spirit/test/char_strings_test_fail.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -7,8 +7,8 @@
http://www.boost.org/LICENSE_1_0.txt)
=============================================================================*/

-#include <boost/spirit/core/primitives/primitives.hpp>
-#include <boost/spirit/core/non_terminal/rule.hpp>
+#include <boost/spirit/include/primitives.hpp>
+#include <boost/spirit/include/rule.hpp>

int main()
{

Modified: trunk/libs/spirit/test/chset_tests.cpp
==============================================================================
--- trunk/libs/spirit/test/chset_tests.cpp (original)
+++ trunk/libs/spirit/test/chset_tests.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -13,7 +13,7 @@
#include <boost/detail/lightweight_test.hpp>
#include "impl/sstream.hpp"

-#include <boost/spirit/utility/chset.hpp>
+#include <boost/spirit/include/chset.hpp>

using namespace std;
using namespace boost::spirit;

Modified: trunk/libs/spirit/test/closure_tests.cpp
==============================================================================
--- trunk/libs/spirit/test/closure_tests.cpp (original)
+++ trunk/libs/spirit/test/closure_tests.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -11,10 +11,10 @@

using namespace std;

-#include <boost/spirit/core.hpp>
-#include <boost/spirit/attribute/closure.hpp>
-#include <boost/spirit/attribute/parametric.hpp>
-#include <boost/spirit/phoenix/binders.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/closure.hpp>
+#include <boost/spirit/include/parametric.hpp>
+#include <boost/spirit/include/phx1_binders.hpp>
using namespace boost::spirit;
using namespace phoenix;

Modified: trunk/libs/spirit/test/confix_tests.cpp
==============================================================================
--- trunk/libs/spirit/test/confix_tests.cpp (original)
+++ trunk/libs/spirit/test/confix_tests.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -6,8 +6,8 @@
License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
=============================================================================*/
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/utility/confix.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/confix.hpp>
#include <boost/detail/lightweight_test.hpp>

using namespace boost;

Modified: trunk/libs/spirit/test/custom_real_parser.cpp
==============================================================================
--- trunk/libs/spirit/test/custom_real_parser.cpp (original)
+++ trunk/libs/spirit/test/custom_real_parser.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -8,8 +8,8 @@
=============================================================================*/

#include <boost/detail/lightweight_test.hpp>
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/actor.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/actor.hpp>
#include <boost/math/concepts/real_concept.hpp>

using namespace boost::spirit;

Modified: trunk/libs/spirit/test/directives_tests.cpp
==============================================================================
--- trunk/libs/spirit/test/directives_tests.cpp (original)
+++ trunk/libs/spirit/test/directives_tests.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -13,8 +13,8 @@
using namespace std;

#include "impl/string_length.hpp"
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/actor/assign_actor.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/assign_actor.hpp>
using namespace boost::spirit;

///////////////////////////////////////////////////////////////////////////////

Modified: trunk/libs/spirit/test/distinct_tests.cpp
==============================================================================
--- trunk/libs/spirit/test/distinct_tests.cpp (original)
+++ trunk/libs/spirit/test/distinct_tests.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -6,8 +6,8 @@
License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
=============================================================================*/
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/utility/distinct.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/distinct.hpp>
#include <boost/detail/lightweight_test.hpp>

using namespace boost;

Modified: trunk/libs/spirit/test/epsilon_tests.cpp
==============================================================================
--- trunk/libs/spirit/test/epsilon_tests.cpp (original)
+++ trunk/libs/spirit/test/epsilon_tests.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -11,7 +11,7 @@
#include <boost/detail/lightweight_test.hpp>

// This test program only includes the epsilon.hpp header from Spirit
-#include <boost/spirit/core/composite/epsilon.hpp>
+#include <boost/spirit/include/epsilon.hpp>
#include <boost/detail/lightweight_test.hpp>
#include "impl/var.hpp"
#include "impl/string_length.hpp"

Modified: trunk/libs/spirit/test/escape_char_parser_tests.cpp
==============================================================================
--- trunk/libs/spirit/test/escape_char_parser_tests.cpp (original)
+++ trunk/libs/spirit/test/escape_char_parser_tests.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -7,9 +7,9 @@
License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
=============================================================================*/
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/actor/assign_actor.hpp>
-#include <boost/spirit/utility/escape_char.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/assign_actor.hpp>
+#include <boost/spirit/include/escape_char.hpp>

#include <iostream>
#include <boost/detail/lightweight_test.hpp>

Modified: trunk/libs/spirit/test/exception_tests.cpp
==============================================================================
--- trunk/libs/spirit/test/exception_tests.cpp (original)
+++ trunk/libs/spirit/test/exception_tests.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -6,8 +6,8 @@
License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
=============================================================================*/
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/error_handling/exceptions.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/exceptions.hpp>
#include <iostream>
#include <boost/detail/lightweight_test.hpp>

Modified: trunk/libs/spirit/test/file_iterator_tests.cpp
==============================================================================
--- trunk/libs/spirit/test/file_iterator_tests.cpp (original)
+++ trunk/libs/spirit/test/file_iterator_tests.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -10,7 +10,7 @@
#include <cstdio>
#include <iostream>
#include <boost/concept_check.hpp>
-#include <boost/spirit/iterator/file_iterator.hpp>
+#include <boost/spirit/include/file_iterator.hpp>

// This checks for a namespace related problem in VC8
// The problem can be avoided by not using "using namespace std;" in the

Modified: trunk/libs/spirit/test/fixed_size_queue_fail_tests.cpp
==============================================================================
--- trunk/libs/spirit/test/fixed_size_queue_fail_tests.cpp (original)
+++ trunk/libs/spirit/test/fixed_size_queue_fail_tests.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -7,7 +7,7 @@
License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
=============================================================================*/
-#include <boost/spirit/iterator/fixed_size_queue.hpp>
+#include <boost/spirit/include/fixed_size_queue.hpp>
#include <boost/mpl/assert.hpp>
#include <boost/type_traits/is_same.hpp>
#include <boost/concept_check.hpp>

Modified: trunk/libs/spirit/test/fixed_size_queue_tests.cpp
==============================================================================
--- trunk/libs/spirit/test/fixed_size_queue_tests.cpp (original)
+++ trunk/libs/spirit/test/fixed_size_queue_tests.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -7,7 +7,7 @@
License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
=============================================================================*/
-#include <boost/spirit/iterator/fixed_size_queue.hpp>
+#include <boost/spirit/include/fixed_size_queue.hpp>
#include <boost/mpl/assert.hpp>
#include <boost/type_traits/is_same.hpp>
#include <boost/concept_check.hpp>

Modified: trunk/libs/spirit/test/for_p_as_parser_tests.cpp
==============================================================================
--- trunk/libs/spirit/test/for_p_as_parser_tests.cpp (original)
+++ trunk/libs/spirit/test/for_p_as_parser_tests.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -6,8 +6,8 @@
License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
=============================================================================*/
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/dynamic/for.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/for.hpp>

extern bool fun();

Modified: trunk/libs/spirit/test/for_tests.cpp
==============================================================================
--- trunk/libs/spirit/test/for_tests.cpp (original)
+++ trunk/libs/spirit/test/for_tests.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -17,9 +17,9 @@
#define SPIRIT_DEBUG
#endif
#include <string>
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/actor/assign_actor.hpp>
-#include <boost/spirit/dynamic/for.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/assign_actor.hpp>
+#include <boost/spirit/include/for.hpp>
#include <boost/ref.hpp>
#include "impl/string_length.hpp"

Modified: trunk/libs/spirit/test/fundamental_tests.cpp
==============================================================================
--- trunk/libs/spirit/test/fundamental_tests.cpp (original)
+++ trunk/libs/spirit/test/fundamental_tests.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -15,9 +15,9 @@
#include <boost/detail/lightweight_test.hpp>
#include <iostream>
#include <boost/static_assert.hpp>
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/meta.hpp>
-#include <boost/spirit/actor/assign_actor.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/meta.hpp>
+#include <boost/spirit/include/assign_actor.hpp>

using namespace std;
using namespace boost::spirit;

Modified: trunk/libs/spirit/test/grammar_def_test.cpp
==============================================================================
--- trunk/libs/spirit/test/grammar_def_test.cpp (original)
+++ trunk/libs/spirit/test/grammar_def_test.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -6,9 +6,9 @@
// http://www.boost.org/LICENSE_1_0.txt)
//

-#include <boost/spirit/core.hpp>
-#include <boost/spirit/attribute.hpp>
-#include <boost/spirit/utility/grammar_def.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/attribute.hpp>
+#include <boost/spirit/include/grammar_def.hpp>

struct my_grammar1
: boost::spirit::grammar<my_grammar1>

Modified: trunk/libs/spirit/test/grammar_mt_tests.cpp
==============================================================================
--- trunk/libs/spirit/test/grammar_mt_tests.cpp (original)
+++ trunk/libs/spirit/test/grammar_mt_tests.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -31,9 +31,9 @@
#define BOOST_SPIRIT_THREADSAFE

#include <boost/thread/thread.hpp>
-#include <boost/spirit/core/non_terminal/grammar.hpp>
-#include <boost/spirit/core/non_terminal/rule.hpp>
-#include <boost/spirit/core/composite/epsilon.hpp>
+#include <boost/spirit/include/grammar.hpp>
+#include <boost/spirit/include/rule.hpp>
+#include <boost/spirit/include/epsilon.hpp>
#include <boost/thread/xtime.hpp>
#include <boost/ref.hpp>

Modified: trunk/libs/spirit/test/grammar_multi_instance_tst.cpp
==============================================================================
--- trunk/libs/spirit/test/grammar_multi_instance_tst.cpp (original)
+++ trunk/libs/spirit/test/grammar_multi_instance_tst.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -8,7 +8,7 @@
=============================================================================*/
#include <iostream>
#include <boost/detail/lightweight_test.hpp>
-#include <boost/spirit/core.hpp>
+#include <boost/spirit/include/core.hpp>

using namespace boost::spirit;
using namespace std;

Modified: trunk/libs/spirit/test/grammar_tests.cpp
==============================================================================
--- trunk/libs/spirit/test/grammar_tests.cpp (original)
+++ trunk/libs/spirit/test/grammar_tests.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -14,8 +14,8 @@

//#define BOOST_SPIRIT_DEBUG
#define BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/utility/grammar_def.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/grammar_def.hpp>
using namespace boost::spirit;

///////////////////////////////////////////////////////////////////////////////

Modified: trunk/libs/spirit/test/group_match_bug.cpp
==============================================================================
--- trunk/libs/spirit/test/group_match_bug.cpp (original)
+++ trunk/libs/spirit/test/group_match_bug.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -7,12 +7,12 @@
http://www.boost.org/LICENSE_1_0.txt)
=============================================================================*/

-#include <boost/spirit/core.hpp>
+#include <boost/spirit/include/core.hpp>

-#include <boost/spirit/attribute/closure.hpp>
+#include <boost/spirit/include/closure.hpp>

-#include <boost/spirit/tree/ast.hpp>
-#include <boost/spirit/tree/parse_tree.hpp>
+#include <boost/spirit/include/ast.hpp>
+#include <boost/spirit/include/parse_tree.hpp>

using namespace boost::spirit;

Modified: trunk/libs/spirit/test/if_p_as_parser_tests.cpp
==============================================================================
--- trunk/libs/spirit/test/if_p_as_parser_tests.cpp (original)
+++ trunk/libs/spirit/test/if_p_as_parser_tests.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -6,8 +6,8 @@
License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
=============================================================================*/
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/dynamic/if.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/if.hpp>

extern bool fun();

Modified: trunk/libs/spirit/test/if_p_int_as_condition_test.cpp
==============================================================================
--- trunk/libs/spirit/test/if_p_int_as_condition_test.cpp (original)
+++ trunk/libs/spirit/test/if_p_int_as_condition_test.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -6,9 +6,9 @@
License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
=============================================================================*/
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/dynamic.hpp>
-#include <boost/spirit/tree/ast.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/dynamic.hpp>
+#include <boost/spirit/include/ast.hpp>
#include <iostream>
#include <boost/detail/lightweight_test.hpp>

Modified: trunk/libs/spirit/test/if_tests.cpp
==============================================================================
--- trunk/libs/spirit/test/if_tests.cpp (original)
+++ trunk/libs/spirit/test/if_tests.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -17,9 +17,9 @@
#if qDebug
#define BOOST_SPIRIT_DEBUG
#endif
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/dynamic/if.hpp>
-#include <boost/spirit/actor/assign_actor.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/if.hpp>
+#include <boost/spirit/include/assign_actor.hpp>
#include <boost/ref.hpp>
#include "impl/string_length.hpp"

Modified: trunk/libs/spirit/test/lazy_tests.cpp
==============================================================================
--- trunk/libs/spirit/test/lazy_tests.cpp (original)
+++ trunk/libs/spirit/test/lazy_tests.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -6,11 +6,11 @@
License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
=============================================================================*/
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/actor/assign_actor.hpp>
-#include <boost/spirit/dynamic/lazy.hpp>
-#include <boost/spirit/phoenix/primitives.hpp>
-#include <boost/spirit/phoenix/operators.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/assign_actor.hpp>
+#include <boost/spirit/include/lazy.hpp>
+#include <boost/spirit/include/phx1_primitives.hpp>
+#include <boost/spirit/include/phx1_operators.hpp>
#include <boost/detail/lightweight_test.hpp>

using namespace boost;

Modified: trunk/libs/spirit/test/loops_tests.cpp
==============================================================================
--- trunk/libs/spirit/test/loops_tests.cpp (original)
+++ trunk/libs/spirit/test/loops_tests.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -12,8 +12,8 @@
using namespace std;

//#define BOOST_SPIRIT_DEBUG
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/utility/loops.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/loops.hpp>
using namespace boost::spirit;

///////////////////////////////////////////////////////////////////////////////

Modified: trunk/libs/spirit/test/match_tests.cpp
==============================================================================
--- trunk/libs/spirit/test/match_tests.cpp (original)
+++ trunk/libs/spirit/test/match_tests.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -12,7 +12,7 @@

using namespace std;

-#include <boost/spirit/core.hpp>
+#include <boost/spirit/include/core.hpp>
using namespace boost::spirit;

///////////////////////////////////////////////////////////////////////////////

Modified: trunk/libs/spirit/test/mix_and_match_trees.cpp
==============================================================================
--- trunk/libs/spirit/test/mix_and_match_trees.cpp (original)
+++ trunk/libs/spirit/test/mix_and_match_trees.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -15,9 +15,9 @@
//
////////////////////////////////////////////////////////////////////////////////

-#include <boost/spirit/core.hpp>
-#include <boost/spirit/tree/ast.hpp>
-#include <boost/spirit/tree/parse_tree.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/ast.hpp>
+#include <boost/spirit/include/parse_tree.hpp>

using namespace boost::spirit;

Modified: trunk/libs/spirit/test/multi_pass_compile_tests.cpp
==============================================================================
--- trunk/libs/spirit/test/multi_pass_compile_tests.cpp (original)
+++ trunk/libs/spirit/test/multi_pass_compile_tests.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -15,8 +15,8 @@
#include <fstream>
#include <iterator>

-#include <boost/spirit/core.hpp>
-#include <boost/spirit/iterator/multi_pass.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/multi_pass.hpp>

#if defined(BOOST_HAS_UNISTD_H)
#include <unistd.h> // unlink()

Modified: trunk/libs/spirit/test/multi_pass_tests.cpp
==============================================================================
--- trunk/libs/spirit/test/multi_pass_tests.cpp (original)
+++ trunk/libs/spirit/test/multi_pass_tests.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -6,7 +6,7 @@
License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
=============================================================================*/
-#include <boost/spirit/iterator/multi_pass.hpp>
+#include <boost/spirit/include/multi_pass.hpp>
#include <boost/scoped_ptr.hpp>
#include <iterator>
#include <string>

Modified: trunk/libs/spirit/test/negated_eps_p_test.cpp
==============================================================================
--- trunk/libs/spirit/test/negated_eps_p_test.cpp (original)
+++ trunk/libs/spirit/test/negated_eps_p_test.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -7,9 +7,9 @@
License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
=============================================================================*/
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/dynamic.hpp>
-#include <boost/spirit/phoenix.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/dynamic.hpp>
+#include <boost/spirit/include/phoenix.hpp>
#include <boost/detail/lightweight_test.hpp>
#include <iostream>
#include <string>

Modified: trunk/libs/spirit/test/numerics_tests.cpp
==============================================================================
--- trunk/libs/spirit/test/numerics_tests.cpp (original)
+++ trunk/libs/spirit/test/numerics_tests.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -7,8 +7,8 @@
License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
=============================================================================*/
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/actor/assign_actor.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/assign_actor.hpp>
#include <iostream>
#include <boost/detail/lightweight_test.hpp>

Modified: trunk/libs/spirit/test/operators_tests.cpp
==============================================================================
--- trunk/libs/spirit/test/operators_tests.cpp (original)
+++ trunk/libs/spirit/test/operators_tests.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -12,7 +12,7 @@
using namespace std;

//#define BOOST_SPIRIT_DEBUG
-#include <boost/spirit/core.hpp>
+#include <boost/spirit/include/core.hpp>
using namespace boost::spirit;

///////////////////////////////////////////////////////////////////////////////

Modified: trunk/libs/spirit/test/owi_mt_tests.cpp
==============================================================================
--- trunk/libs/spirit/test/owi_mt_tests.cpp (original)
+++ trunk/libs/spirit/test/owi_mt_tests.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -43,7 +43,7 @@
#define BOOST_SPIRIT_THREADSAFE

#include <boost/thread/thread.hpp>
-#include <boost/spirit/core/non_terminal/impl/object_with_id.ipp>
+#include <boost/spirit/home/classic/core/non_terminal/impl/object_with_id.ipp>
#include <boost/ref.hpp>
#include <boost/thread/xtime.hpp>
#include <vector>

Modified: trunk/libs/spirit/test/owi_st_tests.cpp
==============================================================================
--- trunk/libs/spirit/test/owi_st_tests.cpp (original)
+++ trunk/libs/spirit/test/owi_st_tests.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -9,7 +9,7 @@
// vim:ts=4:sw=4:et

#undef BOOST_SPIRIT_THREADSAFE
-#include <boost/spirit/core/non_terminal/impl/object_with_id.ipp>
+#include <boost/spirit/home/classic/core/non_terminal/impl/object_with_id.ipp>
#include <boost/detail/lightweight_test.hpp>
#include <iostream>

Modified: trunk/libs/spirit/test/parametric_tests.cpp
==============================================================================
--- trunk/libs/spirit/test/parametric_tests.cpp (original)
+++ trunk/libs/spirit/test/parametric_tests.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -13,10 +13,10 @@

using namespace std;

-#include <boost/spirit/core.hpp>
-#include <boost/spirit/attribute/parametric.hpp>
-#include <boost/spirit/phoenix/primitives.hpp>
-#include <boost/spirit/phoenix/operators.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/parametric.hpp>
+#include <boost/spirit/include/phx1_primitives.hpp>
+#include <boost/spirit/include/phx1_operators.hpp>
using namespace boost::spirit;
using namespace phoenix;

Modified: trunk/libs/spirit/test/parser_context_test.cpp
==============================================================================
--- trunk/libs/spirit/test/parser_context_test.cpp (original)
+++ trunk/libs/spirit/test/parser_context_test.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -7,8 +7,8 @@
http://www.boost.org/LICENSE_1_0.txt)
=============================================================================*/
#include <boost/detail/lightweight_test.hpp>
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/actor/assign_actor.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/assign_actor.hpp>

using namespace boost;
using namespace spirit;

Modified: trunk/libs/spirit/test/parser_traits_tests.cpp
==============================================================================
--- trunk/libs/spirit/test/parser_traits_tests.cpp (original)
+++ trunk/libs/spirit/test/parser_traits_tests.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -14,8 +14,8 @@

#include <boost/detail/lightweight_test.hpp>
#include <iostream>
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/actor/assign_actor.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/assign_actor.hpp>

using namespace std;
using namespace boost::spirit;

Modified: trunk/libs/spirit/test/position_iterator_tests.cpp
==============================================================================
--- trunk/libs/spirit/test/position_iterator_tests.cpp (original)
+++ trunk/libs/spirit/test/position_iterator_tests.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -18,7 +18,7 @@
#include <boost/mpl/for_each.hpp>

// Our baby
-#include <boost/spirit/iterator/position_iterator.hpp>
+#include <boost/spirit/include/position_iterator.hpp>

using namespace std;
using namespace boost::spirit;

Modified: trunk/libs/spirit/test/post_skips.cpp
==============================================================================
--- trunk/libs/spirit/test/post_skips.cpp (original)
+++ trunk/libs/spirit/test/post_skips.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -7,13 +7,13 @@
http://www.boost.org/LICENSE_1_0.txt)
=============================================================================*/

-#include <boost/spirit/core/parser.hpp>
-#include <boost/spirit/core/scanner/skipper.hpp>
-#include <boost/spirit/core/primitives/primitives.hpp>
-#include <boost/spirit/core/composite/optional.hpp>
-#include <boost/spirit/core/composite/sequence.hpp>
-#include <boost/spirit/tree/ast.hpp>
-#include <boost/spirit/tree/parse_tree.hpp>
+#include <boost/spirit/include/parser.hpp>
+#include <boost/spirit/include/skipper.hpp>
+#include <boost/spirit/include/primitives.hpp>
+#include <boost/spirit/include/optional.hpp>
+#include <boost/spirit/include/sequence.hpp>
+#include <boost/spirit/include/ast.hpp>
+#include <boost/spirit/include/parse_tree.hpp>

#include <boost/detail/lightweight_test.hpp>

Modified: trunk/libs/spirit/test/primitives_tests.cpp
==============================================================================
--- trunk/libs/spirit/test/primitives_tests.cpp (original)
+++ trunk/libs/spirit/test/primitives_tests.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -10,7 +10,7 @@
#include <iostream>

using namespace std;
-#include <boost/spirit/core.hpp>
+#include <boost/spirit/include/core.hpp>
#include <boost/detail/lightweight_test.hpp>
#include "impl/string_length.hpp"
using namespace boost::spirit;

Modified: trunk/libs/spirit/test/repeat_ast_tests.cpp
==============================================================================
--- trunk/libs/spirit/test/repeat_ast_tests.cpp (original)
+++ trunk/libs/spirit/test/repeat_ast_tests.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -14,10 +14,10 @@
# include <iostream>
# include <string>

-# include <boost/spirit/core.hpp>
-# include <boost/spirit/utility/loops.hpp>
-# include <boost/spirit/tree/ast.hpp>
-# include <boost/spirit/tree/tree_to_xml.hpp>
+# include <boost/spirit/include/core.hpp>
+# include <boost/spirit/include/loops.hpp>
+# include <boost/spirit/include/ast.hpp>
+# include <boost/spirit/include/tree_to_xml.hpp>

using namespace boost::spirit;

Modified: trunk/libs/spirit/test/rule_tests.cpp
==============================================================================
--- trunk/libs/spirit/test/rule_tests.cpp (original)
+++ trunk/libs/spirit/test/rule_tests.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -14,8 +14,8 @@
//#define BOOST_SPIRIT_DEBUG
#define BOOST_SPIRIT_RULE_SCANNERTYPE_LIMIT 3

-#include <boost/spirit/core.hpp>
-#include <boost/spirit/dynamic/stored_rule.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/stored_rule.hpp>
using namespace boost::spirit;

///////////////////////////////////////////////////////////////////////////////

Modified: trunk/libs/spirit/test/scanner_tests.cpp
==============================================================================
--- trunk/libs/spirit/test/scanner_tests.cpp (original)
+++ trunk/libs/spirit/test/scanner_tests.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -12,7 +12,7 @@

using namespace std;

-#include <boost/spirit/core.hpp>
+#include <boost/spirit/include/core.hpp>
#include "impl/string_length.hpp"
using namespace boost::spirit;

Modified: trunk/libs/spirit/test/scanner_value_type_tests.cpp
==============================================================================
--- trunk/libs/spirit/test/scanner_value_type_tests.cpp (original)
+++ trunk/libs/spirit/test/scanner_value_type_tests.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -13,7 +13,7 @@
// break when the scanner::value_t is some sort of non-char.
#define SPIRIT_DEBUG_NODE

-#include <boost/spirit/core.hpp>
+#include <boost/spirit/include/core.hpp>
#include <boost/static_assert.hpp>
#include <boost/type_traits/is_same.hpp>
#include <deque>

Modified: trunk/libs/spirit/test/scoped_lock_tests.cpp
==============================================================================
--- trunk/libs/spirit/test/scoped_lock_tests.cpp (original)
+++ trunk/libs/spirit/test/scoped_lock_tests.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -34,8 +34,8 @@
#else

#include <boost/thread/mutex.hpp>
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/utility/scoped_lock.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/scoped_lock.hpp>
#include <boost/detail/lightweight_test.hpp>

int

Modified: trunk/libs/spirit/test/select_p_with_rule.cpp
==============================================================================
--- trunk/libs/spirit/test/select_p_with_rule.cpp (original)
+++ trunk/libs/spirit/test/select_p_with_rule.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -12,9 +12,9 @@
#define BOOST_SPIRIT_SELECT_LIMIT 2
#define BOOST_SPIRIT_RULE_SCANNERTYPE_LIMIT 2

-#include <boost/spirit/core.hpp>
-#include <boost/spirit/utility/lists.hpp>
-#include <boost/spirit/dynamic/select.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/lists.hpp>
+#include <boost/spirit/include/select.hpp>

using namespace boost::spirit;
using namespace std;

Modified: trunk/libs/spirit/test/sf_bug_720917.cpp
==============================================================================
--- trunk/libs/spirit/test/sf_bug_720917.cpp (original)
+++ trunk/libs/spirit/test/sf_bug_720917.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -7,7 +7,7 @@
License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
=============================================================================*/
-#include <boost/spirit/iterator/multi_pass.hpp>
+#include <boost/spirit/include/multi_pass.hpp>
#include <iterator>
#include "impl/sstream.hpp"
#include <boost/detail/lightweight_test.hpp>

Modified: trunk/libs/spirit/test/shortest_alternative_tests.cpp
==============================================================================
--- trunk/libs/spirit/test/shortest_alternative_tests.cpp (original)
+++ trunk/libs/spirit/test/shortest_alternative_tests.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -6,7 +6,7 @@
// http://www.boost.org/LICENSE_1_0.txt)
//

-#include <boost/spirit/core.hpp>
+#include <boost/spirit/include/core.hpp>
#include <boost/detail/lightweight_test.hpp>

using namespace boost::spirit;

Modified: trunk/libs/spirit/test/subrule_tests.cpp
==============================================================================
--- trunk/libs/spirit/test/subrule_tests.cpp (original)
+++ trunk/libs/spirit/test/subrule_tests.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -11,7 +11,7 @@

using namespace std;

-#include <boost/spirit/core.hpp>
+#include <boost/spirit/include/core.hpp>
using namespace boost::spirit;

///////////////////////////////////////////////////////////////////////////////

Modified: trunk/libs/spirit/test/switch_problem.cpp
==============================================================================
--- trunk/libs/spirit/test/switch_problem.cpp (original)
+++ trunk/libs/spirit/test/switch_problem.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -15,13 +15,13 @@
//
///////////////////////////////////////////////////////////////////////////////

-#include <boost/spirit/core.hpp>
-#include <boost/spirit/dynamic/for.hpp>
-#include <boost/spirit/dynamic/switch.hpp>
-#include <boost/spirit/iterator/position_iterator.hpp>
-#include <boost/spirit/utility/confix.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/for.hpp>
+#include <boost/spirit/include/switch.hpp>
+#include <boost/spirit/include/position_iterator.hpp>
+#include <boost/spirit/include/confix.hpp>

-#include <boost/spirit/phoenix.hpp>
+#include <boost/spirit/include/phoenix.hpp>

#include <iostream>
#include <string>

Modified: trunk/libs/spirit/test/switch_tests_eps_default.cpp
==============================================================================
--- trunk/libs/spirit/test/switch_tests_eps_default.cpp (original)
+++ trunk/libs/spirit/test/switch_tests_eps_default.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -19,15 +19,15 @@
#include <boost/mpl/list.hpp>
#include <boost/mpl/for_each.hpp>

-#include <boost/spirit/core/primitives/primitives.hpp>
-#include <boost/spirit/core/primitives/numerics.hpp>
-#include <boost/spirit/core/composite/actions.hpp>
-#include <boost/spirit/core/composite/operators.hpp>
-#include <boost/spirit/core/non_terminal/rule.hpp>
-#include <boost/spirit/core/non_terminal/grammar.hpp>
-#include <boost/spirit/dynamic/switch.hpp>
-#include <boost/spirit/dynamic/select.hpp>
-#include <boost/spirit/attribute/closure.hpp>
+#include <boost/spirit/include/primitives.hpp>
+#include <boost/spirit/include/numerics.hpp>
+#include <boost/spirit/include/actions.hpp>
+#include <boost/spirit/include/operators.hpp>
+#include <boost/spirit/include/rule.hpp>
+#include <boost/spirit/include/grammar.hpp>
+#include <boost/spirit/include/switch.hpp>
+#include <boost/spirit/include/select.hpp>
+#include <boost/spirit/include/closure.hpp>

using namespace boost::spirit;

Modified: trunk/libs/spirit/test/switch_tests_general_def.cpp
==============================================================================
--- trunk/libs/spirit/test/switch_tests_general_def.cpp (original)
+++ trunk/libs/spirit/test/switch_tests_general_def.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -19,15 +19,15 @@
#include <boost/mpl/list.hpp>
#include <boost/mpl/for_each.hpp>

-#include <boost/spirit/core/primitives/primitives.hpp>
-#include <boost/spirit/core/primitives/numerics.hpp>
-#include <boost/spirit/core/composite/actions.hpp>
-#include <boost/spirit/core/composite/operators.hpp>
-#include <boost/spirit/core/non_terminal/rule.hpp>
-#include <boost/spirit/core/non_terminal/grammar.hpp>
-#include <boost/spirit/dynamic/switch.hpp>
-#include <boost/spirit/dynamic/select.hpp>
-#include <boost/spirit/attribute/closure.hpp>
+#include <boost/spirit/include/primitives.hpp>
+#include <boost/spirit/include/numerics.hpp>
+#include <boost/spirit/include/actions.hpp>
+#include <boost/spirit/include/operators.hpp>
+#include <boost/spirit/include/rule.hpp>
+#include <boost/spirit/include/grammar.hpp>
+#include <boost/spirit/include/switch.hpp>
+#include <boost/spirit/include/select.hpp>
+#include <boost/spirit/include/closure.hpp>

using namespace boost::spirit;

Modified: trunk/libs/spirit/test/switch_tests_single.cpp
==============================================================================
--- trunk/libs/spirit/test/switch_tests_single.cpp (original)
+++ trunk/libs/spirit/test/switch_tests_single.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -19,15 +19,15 @@
#include <boost/mpl/list.hpp>
#include <boost/mpl/for_each.hpp>

-#include <boost/spirit/core/primitives/primitives.hpp>
-#include <boost/spirit/core/primitives/numerics.hpp>
-#include <boost/spirit/core/composite/actions.hpp>
-#include <boost/spirit/core/composite/operators.hpp>
-#include <boost/spirit/core/non_terminal/rule.hpp>
-#include <boost/spirit/core/non_terminal/grammar.hpp>
-#include <boost/spirit/dynamic/switch.hpp>
-#include <boost/spirit/dynamic/select.hpp>
-#include <boost/spirit/attribute/closure.hpp>
+#include <boost/spirit/include/primitives.hpp>
+#include <boost/spirit/include/numerics.hpp>
+#include <boost/spirit/include/actions.hpp>
+#include <boost/spirit/include/operators.hpp>
+#include <boost/spirit/include/rule.hpp>
+#include <boost/spirit/include/grammar.hpp>
+#include <boost/spirit/include/switch.hpp>
+#include <boost/spirit/include/select.hpp>
+#include <boost/spirit/include/closure.hpp>

using namespace boost::spirit;

Modified: trunk/libs/spirit/test/switch_tests_wo_default.cpp
==============================================================================
--- trunk/libs/spirit/test/switch_tests_wo_default.cpp (original)
+++ trunk/libs/spirit/test/switch_tests_wo_default.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -19,15 +19,15 @@
#include <boost/mpl/list.hpp>
#include <boost/mpl/for_each.hpp>

-#include <boost/spirit/core/primitives/primitives.hpp>
-#include <boost/spirit/core/primitives/numerics.hpp>
-#include <boost/spirit/core/composite/actions.hpp>
-#include <boost/spirit/core/composite/operators.hpp>
-#include <boost/spirit/core/non_terminal/rule.hpp>
-#include <boost/spirit/core/non_terminal/grammar.hpp>
-#include <boost/spirit/dynamic/switch.hpp>
-#include <boost/spirit/dynamic/select.hpp>
-#include <boost/spirit/attribute/closure.hpp>
+#include <boost/spirit/include/primitives.hpp>
+#include <boost/spirit/include/numerics.hpp>
+#include <boost/spirit/include/actions.hpp>
+#include <boost/spirit/include/operators.hpp>
+#include <boost/spirit/include/rule.hpp>
+#include <boost/spirit/include/grammar.hpp>
+#include <boost/spirit/include/switch.hpp>
+#include <boost/spirit/include/select.hpp>
+#include <boost/spirit/include/closure.hpp>

using namespace boost::spirit;

Modified: trunk/libs/spirit/test/symbols_add_null.cpp
==============================================================================
--- trunk/libs/spirit/test/symbols_add_null.cpp (original)
+++ trunk/libs/spirit/test/symbols_add_null.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -19,8 +19,8 @@
char const * message;
};

-#include <boost/spirit/core/scanner/scanner.hpp>
-#include <boost/spirit/symbols/impl/tst.ipp>
+#include <boost/spirit/include/scanner.hpp>
+#include <boost/spirit/home/classic/symbols/impl/tst.ipp>
#include <boost/utility/addressof.hpp>

#include <boost/detail/lightweight_test.hpp>

Modified: trunk/libs/spirit/test/symbols_find_null.cpp
==============================================================================
--- trunk/libs/spirit/test/symbols_find_null.cpp (original)
+++ trunk/libs/spirit/test/symbols_find_null.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -7,8 +7,8 @@
http://www.boost.org/LICENSE_1_0.txt)
=============================================================================*/

-#include <boost/spirit/core/scanner/scanner.hpp>
-#include <boost/spirit/symbols/impl/tst.ipp>
+#include <boost/spirit/include/scanner.hpp>
+#include <boost/spirit/home/classic/symbols/impl/tst.ipp>
#include <boost/utility/addressof.hpp>

typedef char char_type;

Modified: trunk/libs/spirit/test/symbols_tests.cpp
==============================================================================
--- trunk/libs/spirit/test/symbols_tests.cpp (original)
+++ trunk/libs/spirit/test/symbols_tests.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -10,8 +10,8 @@
#include <iostream>
#include <string>
#include <boost/detail/lightweight_test.hpp>
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/symbols/symbols.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/symbols.hpp>
#include <boost/detail/lightweight_test.hpp>

///////////////////////////////////////////////////////////////////////////////

Modified: trunk/libs/spirit/test/traverse_tests.cpp
==============================================================================
--- trunk/libs/spirit/test/traverse_tests.cpp (original)
+++ trunk/libs/spirit/test/traverse_tests.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -40,9 +40,9 @@
#define BOOST_SPIRIT_DEBUG // needed for parser_name functions
#endif

-#include <boost/spirit/core.hpp>
-#include <boost/spirit/actor/assign_actor.hpp>
-#include <boost/spirit/meta.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/assign_actor.hpp>
+#include <boost/spirit/include/meta.hpp>

using namespace std;
using namespace boost::spirit;

Modified: trunk/libs/spirit/test/tree_tests.cpp
==============================================================================
--- trunk/libs/spirit/test/tree_tests.cpp (original)
+++ trunk/libs/spirit/test/tree_tests.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -6,9 +6,9 @@
License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
=============================================================================*/
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/tree/ast.hpp>
-#include <boost/spirit/tree/tree_to_xml.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/ast.hpp>
+#include <boost/spirit/include/tree_to_xml.hpp>
#include <boost/preprocessor/arithmetic/inc.hpp>
#include <boost/preprocessor/punctuation/comma_if.hpp>
#include <boost/preprocessor/repetition.hpp>

Modified: trunk/libs/spirit/test/tree_to_xml.cpp
==============================================================================
--- trunk/libs/spirit/test/tree_to_xml.cpp (original)
+++ trunk/libs/spirit/test/tree_to_xml.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -10,9 +10,9 @@
#include <boost/detail/lightweight_test.hpp>
#include <boost/iostreams/stream.hpp>
#include <boost/preprocessor/cat.hpp>
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/tree/ast.hpp>
-#include <boost/spirit/tree/tree_to_xml.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/ast.hpp>
+#include <boost/spirit/include/tree_to_xml.hpp>

#include <iostream>
#include <fstream>

Modified: trunk/libs/spirit/test/typeof_support/typeof_actor.cpp
==============================================================================
--- trunk/libs/spirit/test/typeof_support/typeof_actor.cpp (original)
+++ trunk/libs/spirit/test/typeof_support/typeof_actor.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -8,6 +8,6 @@
=============================================================================*/

#define BOOST_TYPEOF_EMULATION
-#include <boost/spirit/actor/typeof.hpp>
-#include <boost/spirit/actor.hpp>
+#include <boost/spirit/include/typeof.hpp>
+#include <boost/spirit/include/actor.hpp>

Modified: trunk/libs/spirit/test/typeof_support/typeof_attribute.cpp
==============================================================================
--- trunk/libs/spirit/test/typeof_support/typeof_attribute.cpp (original)
+++ trunk/libs/spirit/test/typeof_support/typeof_attribute.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -8,6 +8,6 @@
=============================================================================*/

#define BOOST_TYPEOF_EMULATION
-#include <boost/spirit/attribute/typeof.hpp>
-#include <boost/spirit/attribute.hpp>
+#include <boost/spirit/include/typeof.hpp>
+#include <boost/spirit/include/attribute.hpp>

Modified: trunk/libs/spirit/test/typeof_support/typeof_core.cpp
==============================================================================
--- trunk/libs/spirit/test/typeof_support/typeof_core.cpp (original)
+++ trunk/libs/spirit/test/typeof_support/typeof_core.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -8,6 +8,6 @@
=============================================================================*/

#define BOOST_TYPEOF_EMULATION
-#include <boost/spirit/core/typeof.hpp>
-#include <boost/spirit/core.hpp>
+#include <boost/spirit/include/typeof.hpp>
+#include <boost/spirit/include/core.hpp>

Modified: trunk/libs/spirit/test/typeof_support/typeof_debug.cpp
==============================================================================
--- trunk/libs/spirit/test/typeof_support/typeof_debug.cpp (original)
+++ trunk/libs/spirit/test/typeof_support/typeof_debug.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -10,6 +10,6 @@
#define BOOST_TYPEOF_EMULATION
#define BOOST_SPIRIT_DEBUG

-#include <boost/spirit/debug/typeof.hpp>
-#include <boost/spirit/debug.hpp>
+#include <boost/spirit/include/typeof.hpp>
+#include <boost/spirit/include/debug.hpp>

Modified: trunk/libs/spirit/test/typeof_support/typeof_dynamic.cpp
==============================================================================
--- trunk/libs/spirit/test/typeof_support/typeof_dynamic.cpp (original)
+++ trunk/libs/spirit/test/typeof_support/typeof_dynamic.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -8,10 +8,10 @@
=============================================================================*/

#define BOOST_TYPEOF_EMULATION
-#include <boost/spirit/dynamic/typeof.hpp>
-#include <boost/spirit/dynamic.hpp>
+#include <boost/spirit/include/typeof.hpp>
+#include <boost/spirit/include/dynamic.hpp>

// currently not in the masted header
-#include <boost/spirit/dynamic/switch.hpp>
-#include <boost/spirit/dynamic/select.hpp>
+#include <boost/spirit/include/switch.hpp>
+#include <boost/spirit/include/select.hpp>

Modified: trunk/libs/spirit/test/typeof_support/typeof_error_handling.cpp
==============================================================================
--- trunk/libs/spirit/test/typeof_support/typeof_error_handling.cpp (original)
+++ trunk/libs/spirit/test/typeof_support/typeof_error_handling.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -8,6 +8,6 @@
=============================================================================*/

#define BOOST_TYPEOF_EMULATION
-#include <boost/spirit/error_handling/typeof.hpp>
-#include <boost/spirit/error_handling.hpp>
+#include <boost/spirit/include/typeof.hpp>
+#include <boost/spirit/include/error_handling.hpp>

Modified: trunk/libs/spirit/test/typeof_support/typeof_iterator.cpp
==============================================================================
--- trunk/libs/spirit/test/typeof_support/typeof_iterator.cpp (original)
+++ trunk/libs/spirit/test/typeof_support/typeof_iterator.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -8,6 +8,6 @@
=============================================================================*/

#define BOOST_TYPEOF_EMULATION
-#include <boost/spirit/iterator/typeof.hpp>
-#include <boost/spirit/iterator.hpp>
+#include <boost/spirit/include/typeof.hpp>
+#include <boost/spirit/include/iterator.hpp>

Modified: trunk/libs/spirit/test/typeof_support/typeof_symbols.cpp
==============================================================================
--- trunk/libs/spirit/test/typeof_support/typeof_symbols.cpp (original)
+++ trunk/libs/spirit/test/typeof_support/typeof_symbols.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -8,6 +8,6 @@
=============================================================================*/

#define BOOST_TYPEOF_EMULATION
-#include <boost/spirit/symbols/typeof.hpp>
-#include <boost/spirit/symbols.hpp>
+#include <boost/spirit/include/typeof.hpp>
+#include <boost/spirit/include/symbols.hpp>

Modified: trunk/libs/spirit/test/typeof_support/typeof_tree.cpp
==============================================================================
--- trunk/libs/spirit/test/typeof_support/typeof_tree.cpp (original)
+++ trunk/libs/spirit/test/typeof_support/typeof_tree.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -8,8 +8,8 @@
=============================================================================*/

#define BOOST_TYPEOF_EMULATION
-#include <boost/spirit/tree/typeof.hpp>
+#include <boost/spirit/include/typeof.hpp>

-#include <boost/spirit/tree/ast.hpp>
-#include <boost/spirit/tree/parse_tree.hpp>
+#include <boost/spirit/include/ast.hpp>
+#include <boost/spirit/include/parse_tree.hpp>

Modified: trunk/libs/spirit/test/typeof_support/typeof_utility.cpp
==============================================================================
--- trunk/libs/spirit/test/typeof_support/typeof_utility.cpp (original)
+++ trunk/libs/spirit/test/typeof_support/typeof_utility.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -8,11 +8,11 @@
=============================================================================*/

#define BOOST_TYPEOF_EMULATION
-#include <boost/spirit/utility/typeof.hpp>
+#include <boost/spirit/include/typeof.hpp>

-#include <boost/spirit/utility.hpp>
+#include <boost/spirit/include/utility.hpp>

// currently not in the masted header
-#include <boost/spirit/utility/regex.hpp>
-#include <boost/spirit/utility/grammar_def.hpp>
+#include <boost/spirit/include/regex.hpp>
+#include <boost/spirit/include/grammar_def.hpp>

Modified: trunk/libs/spirit/test/while_p_as_parser_tests.cpp
==============================================================================
--- trunk/libs/spirit/test/while_p_as_parser_tests.cpp (original)
+++ trunk/libs/spirit/test/while_p_as_parser_tests.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -6,8 +6,8 @@
License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
=============================================================================*/
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/dynamic/while.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/while.hpp>

extern bool fun();

Modified: trunk/libs/spirit/test/while_tests.cpp
==============================================================================
--- trunk/libs/spirit/test/while_tests.cpp (original)
+++ trunk/libs/spirit/test/while_tests.cpp 2008-04-08 21:29:12 EDT (Tue, 08 Apr 2008)
@@ -18,9 +18,9 @@
#endif

#include "impl/string_length.hpp"
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/actor/assign_actor.hpp>
-#include <boost/spirit/dynamic/while.hpp>
+#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/include/assign_actor.hpp>
+#include <boost/spirit/include/while.hpp>
#include <boost/ref.hpp>

namespace local

Date view	Thread view	Subject view	Author view

Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk