Boost logo

Boost-Commit :

From: joel_at_[hidden]
Date: 2008-04-12 20:39:18


Author: djowel
Date: 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
New Revision: 44357
URL: http://svn.boost.org/trac/boost/changeset/44357

Log:
added flat forwarding headers
Added:
   trunk/boost/spirit/include/classic.hpp (contents, props changed)
   trunk/boost/spirit/include/karma.hpp (contents, props changed)
   trunk/boost/spirit/include/lex.hpp (contents, props changed)
   trunk/boost/spirit/include/phoenix.hpp (contents, props changed)
   trunk/boost/spirit/include/qi.hpp (contents, props changed)
   trunk/boost/spirit/include/support.hpp (contents, props changed)
Text files modified:
   trunk/boost/spirit/include/classic_actions.hpp | 4 ++--
   trunk/boost/spirit/include/classic_actor.hpp | 4 ++--
   trunk/boost/spirit/include/classic_alternative.hpp | 4 ++--
   trunk/boost/spirit/include/classic_as_parser.hpp | 4 ++--
   trunk/boost/spirit/include/classic_assert.hpp | 4 ++--
   trunk/boost/spirit/include/classic_assign_actor.hpp | 4 ++--
   trunk/boost/spirit/include/classic_assign_key_actor.hpp | 4 ++--
   trunk/boost/spirit/include/classic_ast.hpp | 4 ++--
   trunk/boost/spirit/include/classic_ast_fwd.hpp | 4 ++--
   trunk/boost/spirit/include/classic_attribute.hpp | 4 ++--
   trunk/boost/spirit/include/classic_basic_chset.hpp | 4 ++--
   trunk/boost/spirit/include/classic_chset.hpp | 4 ++--
   trunk/boost/spirit/include/classic_chset_operators.hpp | 4 ++--
   trunk/boost/spirit/include/classic_clear_actor.hpp | 4 ++--
   trunk/boost/spirit/include/classic_closure.hpp | 4 ++--
   trunk/boost/spirit/include/classic_closure_context.hpp | 4 ++--
   trunk/boost/spirit/include/classic_closure_fwd.hpp | 4 ++--
   trunk/boost/spirit/include/classic_common.hpp | 4 ++--
   trunk/boost/spirit/include/classic_common_fwd.hpp | 4 ++--
   trunk/boost/spirit/include/classic_composite.hpp | 4 ++--
   trunk/boost/spirit/include/classic_config.hpp | 4 ++--
   trunk/boost/spirit/include/classic_confix.hpp | 4 ++--
   trunk/boost/spirit/include/classic_confix_fwd.hpp | 4 ++--
   trunk/boost/spirit/include/classic_core.hpp | 4 ++--
   trunk/boost/spirit/include/classic_debug.hpp | 4 ++--
   trunk/boost/spirit/include/classic_debug_node.hpp | 4 ++--
   trunk/boost/spirit/include/classic_decrement_actor.hpp | 4 ++--
   trunk/boost/spirit/include/classic_difference.hpp | 4 ++--
   trunk/boost/spirit/include/classic_directives.hpp | 4 ++--
   trunk/boost/spirit/include/classic_distinct.hpp | 4 ++--
   trunk/boost/spirit/include/classic_distinct_fwd.hpp | 4 ++--
   trunk/boost/spirit/include/classic_dynamic.hpp | 4 ++--
   trunk/boost/spirit/include/classic_epsilon.hpp | 4 ++--
   trunk/boost/spirit/include/classic_erase_actor.hpp | 4 ++--
   trunk/boost/spirit/include/classic_error_handling.hpp | 4 ++--
   trunk/boost/spirit/include/classic_escape_char.hpp | 4 ++--
   trunk/boost/spirit/include/classic_escape_char_fwd.hpp | 4 ++--
   trunk/boost/spirit/include/classic_exceptions.hpp | 4 ++--
   trunk/boost/spirit/include/classic_exceptions_fwd.hpp | 4 ++--
   trunk/boost/spirit/include/classic_exclusive_or.hpp | 4 ++--
   trunk/boost/spirit/include/classic_file_iterator.hpp | 4 ++--
   trunk/boost/spirit/include/classic_file_iterator_fwd.hpp | 4 ++--
   trunk/boost/spirit/include/classic_fixed_size_queue.hpp | 4 ++--
   trunk/boost/spirit/include/classic_flush_multi_pass.hpp | 4 ++--
   trunk/boost/spirit/include/classic_for.hpp | 4 ++--
   trunk/boost/spirit/include/classic_functor_parser.hpp | 4 ++--
   trunk/boost/spirit/include/classic_fundamental.hpp | 4 ++--
   trunk/boost/spirit/include/classic_grammar.hpp | 4 ++--
   trunk/boost/spirit/include/classic_grammar_def.hpp | 4 ++--
   trunk/boost/spirit/include/classic_grammar_def_fwd.hpp | 4 ++--
   trunk/boost/spirit/include/classic_if.hpp | 4 ++--
   trunk/boost/spirit/include/classic_increment_actor.hpp | 4 ++--
   trunk/boost/spirit/include/classic_insert_at_actor.hpp | 4 ++--
   trunk/boost/spirit/include/classic_insert_key_actor.hpp | 4 ++--
   trunk/boost/spirit/include/classic_intersection.hpp | 4 ++--
   trunk/boost/spirit/include/classic_iterator.hpp | 4 ++--
   trunk/boost/spirit/include/classic_kleene_star.hpp | 4 ++--
   trunk/boost/spirit/include/classic_lazy.hpp | 4 ++--
   trunk/boost/spirit/include/classic_list.hpp | 4 ++--
   trunk/boost/spirit/include/classic_lists.hpp | 4 ++--
   trunk/boost/spirit/include/classic_lists_fwd.hpp | 4 ++--
   trunk/boost/spirit/include/classic_loops.hpp | 4 ++--
   trunk/boost/spirit/include/classic_match.hpp | 4 ++--
   trunk/boost/spirit/include/classic_meta.hpp | 4 ++--
   trunk/boost/spirit/include/classic_minimal.hpp | 4 ++--
   trunk/boost/spirit/include/classic_multi_pass.hpp | 4 ++--
   trunk/boost/spirit/include/classic_multi_pass_fwd.hpp | 4 ++--
   trunk/boost/spirit/include/classic_nil.hpp | 4 ++--
   trunk/boost/spirit/include/classic_no_actions.hpp | 4 ++--
   trunk/boost/spirit/include/classic_numerics.hpp | 4 ++--
   trunk/boost/spirit/include/classic_numerics_fwd.hpp | 4 ++--
   trunk/boost/spirit/include/classic_operators.hpp | 4 ++--
   trunk/boost/spirit/include/classic_optional.hpp | 4 ++--
   trunk/boost/spirit/include/classic_parametric.hpp | 4 ++--
   trunk/boost/spirit/include/classic_parse_tree.hpp | 4 ++--
   trunk/boost/spirit/include/classic_parse_tree_fwd.hpp | 4 ++--
   trunk/boost/spirit/include/classic_parse_tree_utils.hpp | 4 ++--
   trunk/boost/spirit/include/classic_parser.hpp | 4 ++--
   trunk/boost/spirit/include/classic_parser_context.hpp | 4 ++--
   trunk/boost/spirit/include/classic_parser_id.hpp | 4 ++--
   trunk/boost/spirit/include/classic_parser_names.hpp | 4 ++--
   trunk/boost/spirit/include/classic_parser_traits.hpp | 4 ++--
   trunk/boost/spirit/include/classic_position_iterator.hpp | 4 ++--
   trunk/boost/spirit/include/classic_position_iterator_fwd.hpp | 4 ++--
   trunk/boost/spirit/include/classic_positive.hpp | 4 ++--
   trunk/boost/spirit/include/classic_primitives.hpp | 4 ++--
   trunk/boost/spirit/include/classic_push_back_actor.hpp | 4 ++--
   trunk/boost/spirit/include/classic_push_front_actor.hpp | 4 ++--
   trunk/boost/spirit/include/classic_range_run.hpp | 4 ++--
   trunk/boost/spirit/include/classic_ref_actor.hpp | 4 ++--
   trunk/boost/spirit/include/classic_ref_const_ref_actor.hpp | 4 ++--
   trunk/boost/spirit/include/classic_ref_const_ref_const_ref_a.hpp | 4 ++--
   trunk/boost/spirit/include/classic_ref_const_ref_value_actor.hpp | 4 ++--
   trunk/boost/spirit/include/classic_ref_value_actor.hpp | 4 ++--
   trunk/boost/spirit/include/classic_refactoring.hpp | 4 ++--
   trunk/boost/spirit/include/classic_regex.hpp | 4 ++--
   trunk/boost/spirit/include/classic_rule.hpp | 4 ++--
   trunk/boost/spirit/include/classic_rule_alias.hpp | 4 ++--
   trunk/boost/spirit/include/classic_rule_parser.hpp | 4 ++--
   trunk/boost/spirit/include/classic_safe_bool.hpp | 4 ++--
   trunk/boost/spirit/include/classic_scanner.hpp | 4 ++--
   trunk/boost/spirit/include/classic_scanner_fwd.hpp | 4 ++--
   trunk/boost/spirit/include/classic_scoped_lock.hpp | 4 ++--
   trunk/boost/spirit/include/classic_select.hpp | 4 ++--
   trunk/boost/spirit/include/classic_sequence.hpp | 4 ++--
   trunk/boost/spirit/include/classic_sequential_and.hpp | 4 ++--
   trunk/boost/spirit/include/classic_sequential_or.hpp | 4 ++--
   trunk/boost/spirit/include/classic_skipper.hpp | 4 ++--
   trunk/boost/spirit/include/classic_skipper_fwd.hpp | 4 ++--
   trunk/boost/spirit/include/classic_static.hpp | 4 ++--
   trunk/boost/spirit/include/classic_stored_rule.hpp | 4 ++--
   trunk/boost/spirit/include/classic_stored_rule_fwd.hpp | 4 ++--
   trunk/boost/spirit/include/classic_subrule.hpp | 4 ++--
   trunk/boost/spirit/include/classic_subrule_fwd.hpp | 4 ++--
   trunk/boost/spirit/include/classic_swap_actor.hpp | 4 ++--
   trunk/boost/spirit/include/classic_switch.hpp | 4 ++--
   trunk/boost/spirit/include/classic_symbols.hpp | 4 ++--
   trunk/boost/spirit/include/classic_symbols_fwd.hpp | 4 ++--
   trunk/boost/spirit/include/classic_traverse.hpp | 4 ++--
   trunk/boost/spirit/include/classic_tree_to_xml.hpp | 4 ++--
   trunk/boost/spirit/include/classic_typeof.hpp | 4 ++--
   trunk/boost/spirit/include/classic_utility.hpp | 4 ++--
   trunk/boost/spirit/include/classic_version.hpp | 4 ++--
   trunk/boost/spirit/include/classic_while.hpp | 4 ++--
   trunk/boost/spirit/include/karma_action.hpp | 2 +-
   trunk/boost/spirit/include/karma_auxiliary.hpp | 2 +-
   trunk/boost/spirit/include/karma_binary.hpp | 2 +-
   trunk/boost/spirit/include/karma_char.hpp | 2 +-
   trunk/boost/spirit/include/karma_delimit.hpp | 2 +-
   trunk/boost/spirit/include/karma_directive.hpp | 2 +-
   trunk/boost/spirit/include/karma_domain.hpp | 2 +-
   trunk/boost/spirit/include/karma_generate.hpp | 2 +-
   trunk/boost/spirit/include/karma_meta_grammar.hpp | 2 +-
   trunk/boost/spirit/include/karma_nonterminal.hpp | 2 +-
   trunk/boost/spirit/include/karma_numeric.hpp | 2 +-
   trunk/boost/spirit/include/karma_operator.hpp | 2 +-
   trunk/boost/spirit/include/karma_stream.hpp | 2 +-
   trunk/boost/spirit/include/karma_string.hpp | 2 +-
   trunk/boost/spirit/include/karma_what.hpp | 2 +-
   trunk/boost/spirit/include/lex_domain.hpp | 2 +-
   trunk/boost/spirit/include/lex_lexer.hpp | 2 +-
   trunk/boost/spirit/include/lex_lexer_lexertl.hpp | 2 +-
   trunk/boost/spirit/include/lex_lexer_static_lexertl.hpp | 2 +-
   trunk/boost/spirit/include/lex_meta_grammar.hpp | 2 +-
   trunk/boost/spirit/include/lex_set_state.hpp | 2 +-
   trunk/boost/spirit/include/lex_tokenize_and_parse.hpp | 2 +-
   trunk/boost/spirit/include/phoenix1_actor.hpp | 4 ++--
   trunk/boost/spirit/include/phoenix1_binders.hpp | 4 ++--
   trunk/boost/spirit/include/phoenix1_casts.hpp | 4 ++--
   trunk/boost/spirit/include/phoenix1_closures.hpp | 4 ++--
   trunk/boost/spirit/include/phoenix1_composite.hpp | 4 ++--
   trunk/boost/spirit/include/phoenix1_functions.hpp | 4 ++--
   trunk/boost/spirit/include/phoenix1_new.hpp | 4 ++--
   trunk/boost/spirit/include/phoenix1_operators.hpp | 4 ++--
   trunk/boost/spirit/include/phoenix1_primitives.hpp | 4 ++--
   trunk/boost/spirit/include/phoenix1_special_ops.hpp | 4 ++--
   trunk/boost/spirit/include/phoenix1_statements.hpp | 4 ++--
   trunk/boost/spirit/include/phoenix1_tuple_helpers.hpp | 4 ++--
   trunk/boost/spirit/include/phoenix1_tuples.hpp | 4 ++--
   trunk/boost/spirit/include/phoenix_algorithm.hpp | 2 +-
   trunk/boost/spirit/include/phoenix_bind.hpp | 2 +-
   trunk/boost/spirit/include/phoenix_container.hpp | 2 +-
   trunk/boost/spirit/include/phoenix_core.hpp | 2 +-
   trunk/boost/spirit/include/phoenix_function.hpp | 2 +-
   trunk/boost/spirit/include/phoenix_fusion.hpp | 2 +-
   trunk/boost/spirit/include/phoenix_object.hpp | 2 +-
   trunk/boost/spirit/include/phoenix_operator.hpp | 2 +-
   trunk/boost/spirit/include/phoenix_scope.hpp | 2 +-
   trunk/boost/spirit/include/phoenix_statement.hpp | 2 +-
   trunk/boost/spirit/include/phoenix_stl.hpp | 2 +-
   trunk/boost/spirit/include/phoenix_version.hpp | 2 +-
   trunk/boost/spirit/include/qi_action.hpp | 2 +-
   trunk/boost/spirit/include/qi_auxiliary.hpp | 2 +-
   trunk/boost/spirit/include/qi_binary.hpp | 2 +-
   trunk/boost/spirit/include/qi_char.hpp | 2 +-
   trunk/boost/spirit/include/qi_debug.hpp | 2 +-
   trunk/boost/spirit/include/qi_directive.hpp | 2 +-
   trunk/boost/spirit/include/qi_domain.hpp | 2 +-
   trunk/boost/spirit/include/qi_meta_grammar.hpp | 2 +-
   trunk/boost/spirit/include/qi_nonterminal.hpp | 2 +-
   trunk/boost/spirit/include/qi_numeric.hpp | 2 +-
   trunk/boost/spirit/include/qi_operator.hpp | 2 +-
   trunk/boost/spirit/include/qi_parse.hpp | 2 +-
   trunk/boost/spirit/include/qi_skip.hpp | 2 +-
   trunk/boost/spirit/include/qi_stream.hpp | 2 +-
   trunk/boost/spirit/include/qi_string.hpp | 2 +-
   trunk/boost/spirit/include/qi_what.hpp | 2 +-
   trunk/boost/spirit/include/support_any.hpp | 2 +-
   trunk/boost/spirit/include/support_any_if.hpp | 2 +-
   trunk/boost/spirit/include/support_any_ns.hpp | 2 +-
   trunk/boost/spirit/include/support_argument.hpp | 2 +-
   trunk/boost/spirit/include/support_as_variant.hpp | 2 +-
   trunk/boost/spirit/include/support_ascii.hpp | 2 +-
   trunk/boost/spirit/include/support_attribute_of.hpp | 2 +-
   trunk/boost/spirit/include/support_attribute_transform.hpp | 2 +-
   trunk/boost/spirit/include/support_basic_rules.hpp | 2 +-
   trunk/boost/spirit/include/support_basic_transforms.hpp | 2 +-
   trunk/boost/spirit/include/support_char_class.hpp | 2 +-
   trunk/boost/spirit/include/support_component.hpp | 2 +-
   trunk/boost/spirit/include/support_functor_holder.hpp | 2 +-
   trunk/boost/spirit/include/support_grammar.hpp | 2 +-
   trunk/boost/spirit/include/support_iso8859_1.hpp | 2 +-
   trunk/boost/spirit/include/support_locals.hpp | 2 +-
   trunk/boost/spirit/include/support_look_ahead.hpp | 2 +-
   trunk/boost/spirit/include/support_meta_function_holder.hpp | 2 +-
   trunk/boost/spirit/include/support_meta_grammar.hpp | 2 +-
   trunk/boost/spirit/include/support_modifier.hpp | 2 +-
   trunk/boost/spirit/include/support_multi_pass.hpp | 2 +-
   trunk/boost/spirit/include/support_multi_pass_fwd.hpp | 2 +-
   trunk/boost/spirit/include/support_nonterminal.hpp | 2 +-
   trunk/boost/spirit/include/support_placeholders.hpp | 2 +-
   trunk/boost/spirit/include/support_safe_bool.hpp | 2 +-
   trunk/boost/spirit/include/support_standard.hpp | 2 +-
   trunk/boost/spirit/include/support_standard_wide.hpp | 2 +-
   trunk/boost/spirit/include/support_unused.hpp | 2 +-
   215 files changed, 352 insertions(+), 352 deletions(-)

Added: trunk/boost/spirit/include/classic.hpp
==============================================================================
--- (empty file)
+++ trunk/boost/spirit/include/classic.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -0,0 +1,12 @@
+/*=============================================================================
+ Copyright (c) 2001-2008 Joel de Guzman
+ Copyright (c) 2001-2008 Hartmut Kaiser
+ http://spirit.sourceforge.net/
+
+ Distributed under the Boost Software License, Version 1.0. (See accompanying
+ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+=============================================================================*/
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC
+#define BOOST_SPIRIT_INCLUDE_CLASSIC
+#include <boost/spirit/home/classic.hpp>
+#endif

Modified: trunk/boost/spirit/include/classic_actions.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_actions.hpp (original)
+++ trunk/boost/spirit/include/classic_actions.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_ACTIONS
-#define BOOST_SPIRIT_INCLUDE_ACTIONS
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_CLASSIC_ACTIONS
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_CLASSIC_ACTIONS
 #include <boost/spirit/home/classic/core/composite/actions.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_actor.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_actor.hpp (original)
+++ trunk/boost/spirit/include/classic_actor.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_ACTOR
-#define BOOST_SPIRIT_INCLUDE_ACTOR
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_ACTOR
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_ACTOR
 #include <boost/spirit/home/classic/actor.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_alternative.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_alternative.hpp (original)
+++ trunk/boost/spirit/include/classic_alternative.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_ALTERNATIVE
-#define BOOST_SPIRIT_INCLUDE_ALTERNATIVE
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_ALTERNATIVE
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_ALTERNATIVE
 #include <boost/spirit/home/classic/core/composite/alternative.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_as_parser.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_as_parser.hpp (original)
+++ trunk/boost/spirit/include/classic_as_parser.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_AS_PARSER
-#define BOOST_SPIRIT_INCLUDE_AS_PARSER
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_AS_PARSER
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_AS_PARSER
 #include <boost/spirit/home/classic/meta/as_parser.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_assert.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_assert.hpp (original)
+++ trunk/boost/spirit/include/classic_assert.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_ASSERT
-#define BOOST_SPIRIT_INCLUDE_ASSERT
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_ASSERT
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_ASSERT
 #include <boost/spirit/home/classic/core/assert.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_assign_actor.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_assign_actor.hpp (original)
+++ trunk/boost/spirit/include/classic_assign_actor.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_ASSIGN_ACTOR
-#define BOOST_SPIRIT_INCLUDE_ASSIGN_ACTOR
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_ASSIGN_ACTOR
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_ASSIGN_ACTOR
 #include <boost/spirit/home/classic/actor/assign_actor.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_assign_key_actor.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_assign_key_actor.hpp (original)
+++ trunk/boost/spirit/include/classic_assign_key_actor.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_ASSIGN_KEY_ACTOR
-#define BOOST_SPIRIT_INCLUDE_ASSIGN_KEY_ACTOR
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_ASSIGN_KEY_ACTOR
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_ASSIGN_KEY_ACTOR
 #include <boost/spirit/home/classic/actor/assign_key_actor.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_ast.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_ast.hpp (original)
+++ trunk/boost/spirit/include/classic_ast.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_AST
-#define BOOST_SPIRIT_INCLUDE_AST
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_AST
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_AST
 #include <boost/spirit/home/classic/tree/ast.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_ast_fwd.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_ast_fwd.hpp (original)
+++ trunk/boost/spirit/include/classic_ast_fwd.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_AST_FWD
-#define BOOST_SPIRIT_INCLUDE_AST_FWD
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_AST_FWD
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_AST_FWD
 #include <boost/spirit/home/classic/tree/ast_fwd.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_attribute.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_attribute.hpp (original)
+++ trunk/boost/spirit/include/classic_attribute.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_ATTRIBUTE
-#define BOOST_SPIRIT_INCLUDE_ATTRIBUTE
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_ATTRIBUTE
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_ATTRIBUTE
 #include <boost/spirit/home/classic/attribute.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_basic_chset.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_basic_chset.hpp (original)
+++ trunk/boost/spirit/include/classic_basic_chset.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_BASIC_CHSET
-#define BOOST_SPIRIT_INCLUDE_BASIC_CHSET
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_BASIC_CHSET
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_BASIC_CHSET
 #include <boost/spirit/home/classic/utility/impl/chset/basic_chset.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_chset.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_chset.hpp (original)
+++ trunk/boost/spirit/include/classic_chset.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_CHSET
-#define BOOST_SPIRIT_INCLUDE_CHSET
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_CHSET
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_CHSET
 #include <boost/spirit/home/classic/utility/chset.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_chset_operators.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_chset_operators.hpp (original)
+++ trunk/boost/spirit/include/classic_chset_operators.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_CHSET_OPERATORS
-#define BOOST_SPIRIT_INCLUDE_CHSET_OPERATORS
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_CHSET_OPERATORS
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_CHSET_OPERATORS
 #include <boost/spirit/home/classic/utility/chset_operators.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_clear_actor.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_clear_actor.hpp (original)
+++ trunk/boost/spirit/include/classic_clear_actor.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_CLEAR_ACTOR
-#define BOOST_SPIRIT_INCLUDE_CLEAR_ACTOR
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_CLEAR_ACTOR
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_CLEAR_ACTOR
 #include <boost/spirit/home/classic/actor/clear_actor.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_closure.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_closure.hpp (original)
+++ trunk/boost/spirit/include/classic_closure.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_CLOSURE
-#define BOOST_SPIRIT_INCLUDE_CLOSURE
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_CLOSURE
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_CLOSURE
 #include <boost/spirit/home/classic/attribute/closure.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_closure_context.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_closure_context.hpp (original)
+++ trunk/boost/spirit/include/classic_closure_context.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_CLOSURE_CONTEXT
-#define BOOST_SPIRIT_INCLUDE_CLOSURE_CONTEXT
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_CLOSURE_CONTEXT
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_CLOSURE_CONTEXT
 #include <boost/spirit/home/classic/attribute/closure_context.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_closure_fwd.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_closure_fwd.hpp (original)
+++ trunk/boost/spirit/include/classic_closure_fwd.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_CLOSURE_FWD
-#define BOOST_SPIRIT_INCLUDE_CLOSURE_FWD
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_CLOSURE_FWD
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_CLOSURE_FWD
 #include <boost/spirit/home/classic/attribute/closure_fwd.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_common.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_common.hpp (original)
+++ trunk/boost/spirit/include/classic_common.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_COMMON
-#define BOOST_SPIRIT_INCLUDE_COMMON
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_COMMON
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_COMMON
 #include <boost/spirit/home/classic/tree/common.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_common_fwd.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_common_fwd.hpp (original)
+++ trunk/boost/spirit/include/classic_common_fwd.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_COMMON_FWD
-#define BOOST_SPIRIT_INCLUDE_COMMON_FWD
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_COMMON_FWD
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_COMMON_FWD
 #include <boost/spirit/home/classic/tree/common_fwd.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_composite.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_composite.hpp (original)
+++ trunk/boost/spirit/include/classic_composite.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_COMPOSITE
-#define BOOST_SPIRIT_INCLUDE_COMPOSITE
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_COMPOSITE
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_COMPOSITE
 #include <boost/spirit/home/classic/core/composite/composite.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_config.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_config.hpp (original)
+++ trunk/boost/spirit/include/classic_config.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_CONFIG
-#define BOOST_SPIRIT_INCLUDE_CONFIG
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_CONFIG
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_CONFIG
 #include <boost/spirit/home/classic/core/config.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_confix.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_confix.hpp (original)
+++ trunk/boost/spirit/include/classic_confix.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_CONFIX
-#define BOOST_SPIRIT_INCLUDE_CONFIX
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_CONFIX
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_CONFIX
 #include <boost/spirit/home/classic/utility/confix.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_confix_fwd.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_confix_fwd.hpp (original)
+++ trunk/boost/spirit/include/classic_confix_fwd.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_CONFIX_FWD
-#define BOOST_SPIRIT_INCLUDE_CONFIX_FWD
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_CONFIX_FWD
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_CONFIX_FWD
 #include <boost/spirit/home/classic/utility/confix_fwd.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_core.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_core.hpp (original)
+++ trunk/boost/spirit/include/classic_core.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_CORE
-#define BOOST_SPIRIT_INCLUDE_CORE
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_CORE
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_CORE
 #include <boost/spirit/home/classic/core.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_debug.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_debug.hpp (original)
+++ trunk/boost/spirit/include/classic_debug.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_DEBUG
-#define BOOST_SPIRIT_INCLUDE_DEBUG
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_DEBUG
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_DEBUG
 #include <boost/spirit/home/classic/debug.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_debug_node.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_debug_node.hpp (original)
+++ trunk/boost/spirit/include/classic_debug_node.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_DEBUG_NODE
-#define BOOST_SPIRIT_INCLUDE_DEBUG_NODE
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_DEBUG_NODE
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_DEBUG_NODE
 #include <boost/spirit/home/classic/debug/debug_node.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_decrement_actor.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_decrement_actor.hpp (original)
+++ trunk/boost/spirit/include/classic_decrement_actor.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_DECREMENT_ACTOR
-#define BOOST_SPIRIT_INCLUDE_DECREMENT_ACTOR
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_DECREMENT_ACTOR
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_DECREMENT_ACTOR
 #include <boost/spirit/home/classic/actor/decrement_actor.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_difference.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_difference.hpp (original)
+++ trunk/boost/spirit/include/classic_difference.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_DIFFERENCE
-#define BOOST_SPIRIT_INCLUDE_DIFFERENCE
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_DIFFERENCE
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_DIFFERENCE
 #include <boost/spirit/home/classic/core/composite/difference.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_directives.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_directives.hpp (original)
+++ trunk/boost/spirit/include/classic_directives.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_DIRECTIVES
-#define BOOST_SPIRIT_INCLUDE_DIRECTIVES
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_DIRECTIVES
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_DIRECTIVES
 #include <boost/spirit/home/classic/core/composite/directives.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_distinct.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_distinct.hpp (original)
+++ trunk/boost/spirit/include/classic_distinct.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_DISTINCT
-#define BOOST_SPIRIT_INCLUDE_DISTINCT
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_DISTINCT
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_DISTINCT
 #include <boost/spirit/home/classic/utility/distinct.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_distinct_fwd.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_distinct_fwd.hpp (original)
+++ trunk/boost/spirit/include/classic_distinct_fwd.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_DISTINCT_FWD
-#define BOOST_SPIRIT_INCLUDE_DISTINCT_FWD
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_DISTINCT_FWD
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_DISTINCT_FWD
 #include <boost/spirit/home/classic/utility/distinct_fwd.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_dynamic.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_dynamic.hpp (original)
+++ trunk/boost/spirit/include/classic_dynamic.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_DYNAMIC
-#define BOOST_SPIRIT_INCLUDE_DYNAMIC
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_DYNAMIC
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_DYNAMIC
 #include <boost/spirit/home/classic/dynamic.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_epsilon.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_epsilon.hpp (original)
+++ trunk/boost/spirit/include/classic_epsilon.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_EPSILON
-#define BOOST_SPIRIT_INCLUDE_EPSILON
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_EPSILON
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_EPSILON
 #include <boost/spirit/home/classic/core/composite/epsilon.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_erase_actor.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_erase_actor.hpp (original)
+++ trunk/boost/spirit/include/classic_erase_actor.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_ERASE_ACTOR
-#define BOOST_SPIRIT_INCLUDE_ERASE_ACTOR
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_ERASE_ACTOR
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_ERASE_ACTOR
 #include <boost/spirit/home/classic/actor/erase_actor.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_error_handling.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_error_handling.hpp (original)
+++ trunk/boost/spirit/include/classic_error_handling.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_ERROR_HANDLING
-#define BOOST_SPIRIT_INCLUDE_ERROR_HANDLING
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_ERROR_HANDLING
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_ERROR_HANDLING
 #include <boost/spirit/home/classic/error_handling.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_escape_char.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_escape_char.hpp (original)
+++ trunk/boost/spirit/include/classic_escape_char.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_ESCAPE_CHAR
-#define BOOST_SPIRIT_INCLUDE_ESCAPE_CHAR
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_ESCAPE_CHAR
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_ESCAPE_CHAR
 #include <boost/spirit/home/classic/utility/escape_char.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_escape_char_fwd.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_escape_char_fwd.hpp (original)
+++ trunk/boost/spirit/include/classic_escape_char_fwd.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_ESCAPE_CHAR_FWD
-#define BOOST_SPIRIT_INCLUDE_ESCAPE_CHAR_FWD
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_ESCAPE_CHAR_FWD
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_ESCAPE_CHAR_FWD
 #include <boost/spirit/home/classic/utility/escape_char_fwd.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_exceptions.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_exceptions.hpp (original)
+++ trunk/boost/spirit/include/classic_exceptions.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_EXCEPTIONS
-#define BOOST_SPIRIT_INCLUDE_EXCEPTIONS
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_EXCEPTIONS
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_EXCEPTIONS
 #include <boost/spirit/home/classic/error_handling/exceptions.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_exceptions_fwd.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_exceptions_fwd.hpp (original)
+++ trunk/boost/spirit/include/classic_exceptions_fwd.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_EXCEPTIONS_FWD
-#define BOOST_SPIRIT_INCLUDE_EXCEPTIONS_FWD
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_EXCEPTIONS_FWD
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_EXCEPTIONS_FWD
 #include <boost/spirit/home/classic/error_handling/exceptions_fwd.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_exclusive_or.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_exclusive_or.hpp (original)
+++ trunk/boost/spirit/include/classic_exclusive_or.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_EXCLUSIVE_OR
-#define BOOST_SPIRIT_INCLUDE_EXCLUSIVE_OR
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_EXCLUSIVE_OR
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_EXCLUSIVE_OR
 #include <boost/spirit/home/classic/core/composite/exclusive_or.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_file_iterator.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_file_iterator.hpp (original)
+++ trunk/boost/spirit/include/classic_file_iterator.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_FILE_ITERATOR
-#define BOOST_SPIRIT_INCLUDE_FILE_ITERATOR
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_FILE_ITERATOR
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_FILE_ITERATOR
 #include <boost/spirit/home/classic/iterator/file_iterator.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_file_iterator_fwd.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_file_iterator_fwd.hpp (original)
+++ trunk/boost/spirit/include/classic_file_iterator_fwd.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_FILE_ITERATOR_FWD
-#define BOOST_SPIRIT_INCLUDE_FILE_ITERATOR_FWD
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_FILE_ITERATOR_FWD
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_FILE_ITERATOR_FWD
 #include <boost/spirit/home/classic/iterator/file_iterator_fwd.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_fixed_size_queue.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_fixed_size_queue.hpp (original)
+++ trunk/boost/spirit/include/classic_fixed_size_queue.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_FIXED_SIZE_QUEUE
-#define BOOST_SPIRIT_INCLUDE_FIXED_SIZE_QUEUE
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_FIXED_SIZE_QUEUE
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_FIXED_SIZE_QUEUE
 #include <boost/spirit/home/classic/iterator/fixed_size_queue.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_flush_multi_pass.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_flush_multi_pass.hpp (original)
+++ trunk/boost/spirit/include/classic_flush_multi_pass.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_FLUSH_MULTI_PASS
-#define BOOST_SPIRIT_INCLUDE_FLUSH_MULTI_PASS
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_FLUSH_MULTI_PASS
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_FLUSH_MULTI_PASS
 #include <boost/spirit/home/classic/utility/flush_multi_pass.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_for.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_for.hpp (original)
+++ trunk/boost/spirit/include/classic_for.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_FOR
-#define BOOST_SPIRIT_INCLUDE_FOR
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_FOR
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_FOR
 #include <boost/spirit/home/classic/dynamic/for.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_functor_parser.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_functor_parser.hpp (original)
+++ trunk/boost/spirit/include/classic_functor_parser.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_FUNCTOR_PARSER
-#define BOOST_SPIRIT_INCLUDE_FUNCTOR_PARSER
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_FUNCTOR_PARSER
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_FUNCTOR_PARSER
 #include <boost/spirit/home/classic/utility/functor_parser.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_fundamental.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_fundamental.hpp (original)
+++ trunk/boost/spirit/include/classic_fundamental.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_FUNDAMENTAL
-#define BOOST_SPIRIT_INCLUDE_FUNDAMENTAL
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_FUNDAMENTAL
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_FUNDAMENTAL
 #include <boost/spirit/home/classic/meta/fundamental.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_grammar.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_grammar.hpp (original)
+++ trunk/boost/spirit/include/classic_grammar.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_GRAMMAR
-#define BOOST_SPIRIT_INCLUDE_GRAMMAR
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_GRAMMAR
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_GRAMMAR
 #include <boost/spirit/home/classic/core/non_terminal/grammar.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_grammar_def.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_grammar_def.hpp (original)
+++ trunk/boost/spirit/include/classic_grammar_def.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_GRAMMAR_DEF
-#define BOOST_SPIRIT_INCLUDE_GRAMMAR_DEF
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_GRAMMAR_DEF
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_GRAMMAR_DEF
 #include <boost/spirit/home/classic/utility/grammar_def.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_grammar_def_fwd.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_grammar_def_fwd.hpp (original)
+++ trunk/boost/spirit/include/classic_grammar_def_fwd.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_GRAMMAR_DEF_FWD
-#define BOOST_SPIRIT_INCLUDE_GRAMMAR_DEF_FWD
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_GRAMMAR_DEF_FWD
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_GRAMMAR_DEF_FWD
 #include <boost/spirit/home/classic/utility/grammar_def_fwd.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_if.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_if.hpp (original)
+++ trunk/boost/spirit/include/classic_if.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_IF
-#define BOOST_SPIRIT_INCLUDE_IF
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_IF
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_IF
 #include <boost/spirit/home/classic/dynamic/if.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_increment_actor.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_increment_actor.hpp (original)
+++ trunk/boost/spirit/include/classic_increment_actor.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_INCREMENT_ACTOR
-#define BOOST_SPIRIT_INCLUDE_INCREMENT_ACTOR
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_INCREMENT_ACTOR
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_INCREMENT_ACTOR
 #include <boost/spirit/home/classic/actor/increment_actor.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_insert_at_actor.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_insert_at_actor.hpp (original)
+++ trunk/boost/spirit/include/classic_insert_at_actor.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_INSERT_AT_ACTOR
-#define BOOST_SPIRIT_INCLUDE_INSERT_AT_ACTOR
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_INSERT_AT_ACTOR
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_INSERT_AT_ACTOR
 #include <boost/spirit/home/classic/actor/insert_at_actor.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_insert_key_actor.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_insert_key_actor.hpp (original)
+++ trunk/boost/spirit/include/classic_insert_key_actor.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_INSERT_KEY_ACTOR
-#define BOOST_SPIRIT_INCLUDE_INSERT_KEY_ACTOR
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_INSERT_KEY_ACTOR
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_INSERT_KEY_ACTOR
 #include <boost/spirit/home/classic/actor/insert_key_actor.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_intersection.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_intersection.hpp (original)
+++ trunk/boost/spirit/include/classic_intersection.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_INTERSECTION
-#define BOOST_SPIRIT_INCLUDE_INTERSECTION
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_INTERSECTION
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_INTERSECTION
 #include <boost/spirit/home/classic/core/composite/intersection.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_iterator.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_iterator.hpp (original)
+++ trunk/boost/spirit/include/classic_iterator.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_ITERATOR
-#define BOOST_SPIRIT_INCLUDE_ITERATOR
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_ITERATOR
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_ITERATOR
 #include <boost/spirit/home/classic/iterator.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_kleene_star.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_kleene_star.hpp (original)
+++ trunk/boost/spirit/include/classic_kleene_star.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_KLEENE_STAR
-#define BOOST_SPIRIT_INCLUDE_KLEENE_STAR
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_KLEENE_STAR
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_KLEENE_STAR
 #include <boost/spirit/home/classic/core/composite/kleene_star.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_lazy.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_lazy.hpp (original)
+++ trunk/boost/spirit/include/classic_lazy.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_LAZY
-#define BOOST_SPIRIT_INCLUDE_LAZY
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_LAZY
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_LAZY
 #include <boost/spirit/home/classic/dynamic/lazy.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_list.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_list.hpp (original)
+++ trunk/boost/spirit/include/classic_list.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_LIST
-#define BOOST_SPIRIT_INCLUDE_LIST
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_LIST
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_LIST
 #include <boost/spirit/home/classic/core/composite/list.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_lists.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_lists.hpp (original)
+++ trunk/boost/spirit/include/classic_lists.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_LISTS
-#define BOOST_SPIRIT_INCLUDE_LISTS
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_LISTS
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_LISTS
 #include <boost/spirit/home/classic/utility/lists.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_lists_fwd.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_lists_fwd.hpp (original)
+++ trunk/boost/spirit/include/classic_lists_fwd.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_LISTS_FWD
-#define BOOST_SPIRIT_INCLUDE_LISTS_FWD
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_LISTS_FWD
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_LISTS_FWD
 #include <boost/spirit/home/classic/utility/lists_fwd.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_loops.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_loops.hpp (original)
+++ trunk/boost/spirit/include/classic_loops.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_LOOPS
-#define BOOST_SPIRIT_INCLUDE_LOOPS
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_LOOPS
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_LOOPS
 #include <boost/spirit/home/classic/utility/loops.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_match.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_match.hpp (original)
+++ trunk/boost/spirit/include/classic_match.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_MATCH
-#define BOOST_SPIRIT_INCLUDE_MATCH
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_MATCH
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_MATCH
 #include <boost/spirit/home/classic/core/match.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_meta.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_meta.hpp (original)
+++ trunk/boost/spirit/include/classic_meta.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_META
-#define BOOST_SPIRIT_INCLUDE_META
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_META
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_META
 #include <boost/spirit/home/classic/meta.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_minimal.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_minimal.hpp (original)
+++ trunk/boost/spirit/include/classic_minimal.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_MINIMAL
-#define BOOST_SPIRIT_INCLUDE_MINIMAL
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_MINIMAL
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_MINIMAL
 #include <boost/spirit/home/classic/debug/minimal.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_multi_pass.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_multi_pass.hpp (original)
+++ trunk/boost/spirit/include/classic_multi_pass.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_MULTI_PASS
-#define BOOST_SPIRIT_INCLUDE_MULTI_PASS
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_MULTI_PASS
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_MULTI_PASS
 #include <boost/spirit/home/classic/iterator/multi_pass.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_multi_pass_fwd.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_multi_pass_fwd.hpp (original)
+++ trunk/boost/spirit/include/classic_multi_pass_fwd.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_MULTI_PASS_FWD
-#define BOOST_SPIRIT_INCLUDE_MULTI_PASS_FWD
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_MULTI_PASS_FWD
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_MULTI_PASS_FWD
 #include <boost/spirit/home/classic/iterator/multi_pass_fwd.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_nil.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_nil.hpp (original)
+++ trunk/boost/spirit/include/classic_nil.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_NIL
-#define BOOST_SPIRIT_INCLUDE_NIL
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_NIL
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_NIL
 #include <boost/spirit/home/classic/core/nil.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_no_actions.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_no_actions.hpp (original)
+++ trunk/boost/spirit/include/classic_no_actions.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_NO_ACTIONS
-#define BOOST_SPIRIT_INCLUDE_NO_ACTIONS
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_NO_ACTIONS
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_NO_ACTIONS
 #include <boost/spirit/home/classic/core/composite/no_actions.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_numerics.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_numerics.hpp (original)
+++ trunk/boost/spirit/include/classic_numerics.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_NUMERICS
-#define BOOST_SPIRIT_INCLUDE_NUMERICS
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_NUMERICS
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_NUMERICS
 #include <boost/spirit/home/classic/core/primitives/numerics.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_numerics_fwd.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_numerics_fwd.hpp (original)
+++ trunk/boost/spirit/include/classic_numerics_fwd.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_NUMERICS_FWD
-#define BOOST_SPIRIT_INCLUDE_NUMERICS_FWD
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_NUMERICS_FWD
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_NUMERICS_FWD
 #include <boost/spirit/home/classic/core/primitives/numerics_fwd.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_operators.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_operators.hpp (original)
+++ trunk/boost/spirit/include/classic_operators.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_OPERATORS
-#define BOOST_SPIRIT_INCLUDE_OPERATORS
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_OPERATORS
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_OPERATORS
 #include <boost/spirit/home/classic/core/composite/operators.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_optional.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_optional.hpp (original)
+++ trunk/boost/spirit/include/classic_optional.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_OPTIONAL
-#define BOOST_SPIRIT_INCLUDE_OPTIONAL
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_OPTIONAL
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_OPTIONAL
 #include <boost/spirit/home/classic/core/composite/optional.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_parametric.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_parametric.hpp (original)
+++ trunk/boost/spirit/include/classic_parametric.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_PARAMETRIC
-#define BOOST_SPIRIT_INCLUDE_PARAMETRIC
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_PARAMETRIC
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_PARAMETRIC
 #include <boost/spirit/home/classic/attribute/parametric.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_parse_tree.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_parse_tree.hpp (original)
+++ trunk/boost/spirit/include/classic_parse_tree.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_PARSE_TREE
-#define BOOST_SPIRIT_INCLUDE_PARSE_TREE
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_PARSE_TREE
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_PARSE_TREE
 #include <boost/spirit/home/classic/tree/parse_tree.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_parse_tree_fwd.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_parse_tree_fwd.hpp (original)
+++ trunk/boost/spirit/include/classic_parse_tree_fwd.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_PARSE_TREE_FWD
-#define BOOST_SPIRIT_INCLUDE_PARSE_TREE_FWD
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_PARSE_TREE_FWD
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_PARSE_TREE_FWD
 #include <boost/spirit/home/classic/tree/parse_tree_fwd.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_parse_tree_utils.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_parse_tree_utils.hpp (original)
+++ trunk/boost/spirit/include/classic_parse_tree_utils.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_PARSE_TREE_UTILS
-#define BOOST_SPIRIT_INCLUDE_PARSE_TREE_UTILS
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_PARSE_TREE_UTILS
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_PARSE_TREE_UTILS
 #include <boost/spirit/home/classic/tree/parse_tree_utils.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_parser.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_parser.hpp (original)
+++ trunk/boost/spirit/include/classic_parser.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_PARSER
-#define BOOST_SPIRIT_INCLUDE_PARSER
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_PARSER
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_PARSER
 #include <boost/spirit/home/classic/core/parser.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_parser_context.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_parser_context.hpp (original)
+++ trunk/boost/spirit/include/classic_parser_context.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_PARSER_CONTEXT
-#define BOOST_SPIRIT_INCLUDE_PARSER_CONTEXT
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_PARSER_CONTEXT
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_PARSER_CONTEXT
 #include <boost/spirit/home/classic/core/non_terminal/parser_context.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_parser_id.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_parser_id.hpp (original)
+++ trunk/boost/spirit/include/classic_parser_id.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_PARSER_ID
-#define BOOST_SPIRIT_INCLUDE_PARSER_ID
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_PARSER_ID
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_PARSER_ID
 #include <boost/spirit/home/classic/core/non_terminal/parser_id.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_parser_names.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_parser_names.hpp (original)
+++ trunk/boost/spirit/include/classic_parser_names.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_PARSER_NAMES
-#define BOOST_SPIRIT_INCLUDE_PARSER_NAMES
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_PARSER_NAMES
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_PARSER_NAMES
 #include <boost/spirit/home/classic/debug/parser_names.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_parser_traits.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_parser_traits.hpp (original)
+++ trunk/boost/spirit/include/classic_parser_traits.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_PARSER_TRAITS
-#define BOOST_SPIRIT_INCLUDE_PARSER_TRAITS
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_PARSER_TRAITS
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_PARSER_TRAITS
 #include <boost/spirit/home/classic/meta/parser_traits.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_position_iterator.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_position_iterator.hpp (original)
+++ trunk/boost/spirit/include/classic_position_iterator.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_POSITION_ITERATOR
-#define BOOST_SPIRIT_INCLUDE_POSITION_ITERATOR
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_POSITION_ITERATOR
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_POSITION_ITERATOR
 #include <boost/spirit/home/classic/iterator/position_iterator.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_position_iterator_fwd.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_position_iterator_fwd.hpp (original)
+++ trunk/boost/spirit/include/classic_position_iterator_fwd.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_POSITION_ITERATOR_FWD
-#define BOOST_SPIRIT_INCLUDE_POSITION_ITERATOR_FWD
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_POSITION_ITERATOR_FWD
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_POSITION_ITERATOR_FWD
 #include <boost/spirit/home/classic/iterator/position_iterator_fwd.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_positive.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_positive.hpp (original)
+++ trunk/boost/spirit/include/classic_positive.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_POSITIVE
-#define BOOST_SPIRIT_INCLUDE_POSITIVE
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_POSITIVE
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_POSITIVE
 #include <boost/spirit/home/classic/core/composite/positive.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_primitives.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_primitives.hpp (original)
+++ trunk/boost/spirit/include/classic_primitives.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_PRIMITIVES
-#define BOOST_SPIRIT_INCLUDE_PRIMITIVES
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_PRIMITIVES
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_PRIMITIVES
 #include <boost/spirit/home/classic/core/primitives/primitives.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_push_back_actor.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_push_back_actor.hpp (original)
+++ trunk/boost/spirit/include/classic_push_back_actor.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_PUSH_BACK_ACTOR
-#define BOOST_SPIRIT_INCLUDE_PUSH_BACK_ACTOR
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_PUSH_BACK_ACTOR
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_PUSH_BACK_ACTOR
 #include <boost/spirit/home/classic/actor/push_back_actor.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_push_front_actor.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_push_front_actor.hpp (original)
+++ trunk/boost/spirit/include/classic_push_front_actor.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_PUSH_FRONT_ACTOR
-#define BOOST_SPIRIT_INCLUDE_PUSH_FRONT_ACTOR
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_PUSH_FRONT_ACTOR
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_PUSH_FRONT_ACTOR
 #include <boost/spirit/home/classic/actor/push_front_actor.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_range_run.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_range_run.hpp (original)
+++ trunk/boost/spirit/include/classic_range_run.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_RANGE_RUN
-#define BOOST_SPIRIT_INCLUDE_RANGE_RUN
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_RANGE_RUN
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_RANGE_RUN
 #include <boost/spirit/home/classic/utility/impl/chset/range_run.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_ref_actor.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_ref_actor.hpp (original)
+++ trunk/boost/spirit/include/classic_ref_actor.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_REF_ACTOR
-#define BOOST_SPIRIT_INCLUDE_REF_ACTOR
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_REF_ACTOR
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_REF_ACTOR
 #include <boost/spirit/home/classic/actor/ref_actor.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_ref_const_ref_actor.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_ref_const_ref_actor.hpp (original)
+++ trunk/boost/spirit/include/classic_ref_const_ref_actor.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_REF_CONST_REF_ACTOR
-#define BOOST_SPIRIT_INCLUDE_REF_CONST_REF_ACTOR
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_REF_CONST_REF_ACTOR
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_REF_CONST_REF_ACTOR
 #include <boost/spirit/home/classic/actor/ref_const_ref_actor.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_ref_const_ref_const_ref_a.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_ref_const_ref_const_ref_a.hpp (original)
+++ trunk/boost/spirit/include/classic_ref_const_ref_const_ref_a.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_REF_CONST_REF_CONST_REF_A
-#define BOOST_SPIRIT_INCLUDE_REF_CONST_REF_CONST_REF_A
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_REF_CONST_REF_CONST_REF_A
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_REF_CONST_REF_CONST_REF_A
 #include <boost/spirit/home/classic/actor/ref_const_ref_const_ref_a.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_ref_const_ref_value_actor.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_ref_const_ref_value_actor.hpp (original)
+++ trunk/boost/spirit/include/classic_ref_const_ref_value_actor.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_REF_CONST_REF_VALUE_ACTOR
-#define BOOST_SPIRIT_INCLUDE_REF_CONST_REF_VALUE_ACTOR
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_REF_CONST_REF_VALUE_ACTOR
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_REF_CONST_REF_VALUE_ACTOR
 #include <boost/spirit/home/classic/actor/ref_const_ref_value_actor.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_ref_value_actor.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_ref_value_actor.hpp (original)
+++ trunk/boost/spirit/include/classic_ref_value_actor.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_REF_VALUE_ACTOR
-#define BOOST_SPIRIT_INCLUDE_REF_VALUE_ACTOR
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_REF_VALUE_ACTOR
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_REF_VALUE_ACTOR
 #include <boost/spirit/home/classic/actor/ref_value_actor.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_refactoring.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_refactoring.hpp (original)
+++ trunk/boost/spirit/include/classic_refactoring.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_REFACTORING
-#define BOOST_SPIRIT_INCLUDE_REFACTORING
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_REFACTORING
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_REFACTORING
 #include <boost/spirit/home/classic/meta/refactoring.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_regex.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_regex.hpp (original)
+++ trunk/boost/spirit/include/classic_regex.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_REGEX
-#define BOOST_SPIRIT_INCLUDE_REGEX
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_REGEX
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_REGEX
 #include <boost/spirit/home/classic/utility/regex.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_rule.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_rule.hpp (original)
+++ trunk/boost/spirit/include/classic_rule.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_RULE
-#define BOOST_SPIRIT_INCLUDE_RULE
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_RULE
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_RULE
 #include <boost/spirit/home/classic/core/non_terminal/rule.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_rule_alias.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_rule_alias.hpp (original)
+++ trunk/boost/spirit/include/classic_rule_alias.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_RULE_ALIAS
-#define BOOST_SPIRIT_INCLUDE_RULE_ALIAS
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_RULE_ALIAS
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_RULE_ALIAS
 #include <boost/spirit/home/classic/dynamic/rule_alias.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_rule_parser.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_rule_parser.hpp (original)
+++ trunk/boost/spirit/include/classic_rule_parser.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_RULE_PARSER
-#define BOOST_SPIRIT_INCLUDE_RULE_PARSER
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_RULE_PARSER
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_RULE_PARSER
 #include <boost/spirit/home/classic/utility/rule_parser.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_safe_bool.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_safe_bool.hpp (original)
+++ trunk/boost/spirit/include/classic_safe_bool.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_SAFE_BOOL
-#define BOOST_SPIRIT_INCLUDE_SAFE_BOOL
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_SAFE_BOOL
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_SAFE_BOOL
 #include <boost/spirit/home/classic/core/safe_bool.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_scanner.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_scanner.hpp (original)
+++ trunk/boost/spirit/include/classic_scanner.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_SCANNER
-#define BOOST_SPIRIT_INCLUDE_SCANNER
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_SCANNER
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_SCANNER
 #include <boost/spirit/home/classic/core/scanner/scanner.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_scanner_fwd.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_scanner_fwd.hpp (original)
+++ trunk/boost/spirit/include/classic_scanner_fwd.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_SCANNER_FWD
-#define BOOST_SPIRIT_INCLUDE_SCANNER_FWD
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_SCANNER_FWD
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_SCANNER_FWD
 #include <boost/spirit/home/classic/core/scanner/scanner_fwd.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_scoped_lock.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_scoped_lock.hpp (original)
+++ trunk/boost/spirit/include/classic_scoped_lock.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_SCOPED_LOCK
-#define BOOST_SPIRIT_INCLUDE_SCOPED_LOCK
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_SCOPED_LOCK
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_SCOPED_LOCK
 #include <boost/spirit/home/classic/utility/scoped_lock.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_select.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_select.hpp (original)
+++ trunk/boost/spirit/include/classic_select.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_SELECT
-#define BOOST_SPIRIT_INCLUDE_SELECT
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_SELECT
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_SELECT
 #include <boost/spirit/home/classic/dynamic/select.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_sequence.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_sequence.hpp (original)
+++ trunk/boost/spirit/include/classic_sequence.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_SEQUENCE
-#define BOOST_SPIRIT_INCLUDE_SEQUENCE
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_SEQUENCE
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_SEQUENCE
 #include <boost/spirit/home/classic/core/composite/sequence.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_sequential_and.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_sequential_and.hpp (original)
+++ trunk/boost/spirit/include/classic_sequential_and.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_SEQUENTIAL_AND
-#define BOOST_SPIRIT_INCLUDE_SEQUENTIAL_AND
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_SEQUENTIAL_AND
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_SEQUENTIAL_AND
 #include <boost/spirit/home/classic/core/composite/sequential_and.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_sequential_or.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_sequential_or.hpp (original)
+++ trunk/boost/spirit/include/classic_sequential_or.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_SEQUENTIAL_OR
-#define BOOST_SPIRIT_INCLUDE_SEQUENTIAL_OR
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_SEQUENTIAL_OR
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_SEQUENTIAL_OR
 #include <boost/spirit/home/classic/core/composite/sequential_or.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_skipper.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_skipper.hpp (original)
+++ trunk/boost/spirit/include/classic_skipper.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_SKIPPER
-#define BOOST_SPIRIT_INCLUDE_SKIPPER
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_SKIPPER
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_SKIPPER
 #include <boost/spirit/home/classic/core/scanner/skipper.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_skipper_fwd.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_skipper_fwd.hpp (original)
+++ trunk/boost/spirit/include/classic_skipper_fwd.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_SKIPPER_FWD
-#define BOOST_SPIRIT_INCLUDE_SKIPPER_FWD
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_SKIPPER_FWD
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_SKIPPER_FWD
 #include <boost/spirit/home/classic/core/scanner/skipper_fwd.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_static.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_static.hpp (original)
+++ trunk/boost/spirit/include/classic_static.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_STATIC
-#define BOOST_SPIRIT_INCLUDE_STATIC
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_STATIC
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_STATIC
 #include <boost/spirit/home/classic/core/non_terminal/impl/static.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_stored_rule.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_stored_rule.hpp (original)
+++ trunk/boost/spirit/include/classic_stored_rule.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_STORED_RULE
-#define BOOST_SPIRIT_INCLUDE_STORED_RULE
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_STORED_RULE
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_STORED_RULE
 #include <boost/spirit/home/classic/dynamic/stored_rule.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_stored_rule_fwd.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_stored_rule_fwd.hpp (original)
+++ trunk/boost/spirit/include/classic_stored_rule_fwd.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_STORED_RULE_FWD
-#define BOOST_SPIRIT_INCLUDE_STORED_RULE_FWD
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_STORED_RULE_FWD
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_STORED_RULE_FWD
 #include <boost/spirit/home/classic/dynamic/stored_rule_fwd.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_subrule.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_subrule.hpp (original)
+++ trunk/boost/spirit/include/classic_subrule.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_SUBRULE
-#define BOOST_SPIRIT_INCLUDE_SUBRULE
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_SUBRULE
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_SUBRULE
 #include <boost/spirit/home/classic/core/non_terminal/subrule.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_subrule_fwd.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_subrule_fwd.hpp (original)
+++ trunk/boost/spirit/include/classic_subrule_fwd.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_SUBRULE_FWD
-#define BOOST_SPIRIT_INCLUDE_SUBRULE_FWD
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_SUBRULE_FWD
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_SUBRULE_FWD
 #include <boost/spirit/home/classic/core/non_terminal/subrule_fwd.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_swap_actor.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_swap_actor.hpp (original)
+++ trunk/boost/spirit/include/classic_swap_actor.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_SWAP_ACTOR
-#define BOOST_SPIRIT_INCLUDE_SWAP_ACTOR
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_SWAP_ACTOR
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_SWAP_ACTOR
 #include <boost/spirit/home/classic/actor/swap_actor.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_switch.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_switch.hpp (original)
+++ trunk/boost/spirit/include/classic_switch.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_SWITCH
-#define BOOST_SPIRIT_INCLUDE_SWITCH
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_SWITCH
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_SWITCH
 #include <boost/spirit/home/classic/dynamic/switch.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_symbols.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_symbols.hpp (original)
+++ trunk/boost/spirit/include/classic_symbols.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_SYMBOLS
-#define BOOST_SPIRIT_INCLUDE_SYMBOLS
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_SYMBOLS
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_SYMBOLS
 #include <boost/spirit/home/classic/symbols.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_symbols_fwd.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_symbols_fwd.hpp (original)
+++ trunk/boost/spirit/include/classic_symbols_fwd.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_SYMBOLS_FWD
-#define BOOST_SPIRIT_INCLUDE_SYMBOLS_FWD
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_SYMBOLS_FWD
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_SYMBOLS_FWD
 #include <boost/spirit/home/classic/symbols/symbols_fwd.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_traverse.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_traverse.hpp (original)
+++ trunk/boost/spirit/include/classic_traverse.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_TRAVERSE
-#define BOOST_SPIRIT_INCLUDE_TRAVERSE
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_TRAVERSE
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_TRAVERSE
 #include <boost/spirit/home/classic/meta/traverse.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_tree_to_xml.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_tree_to_xml.hpp (original)
+++ trunk/boost/spirit/include/classic_tree_to_xml.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_TREE_TO_XML
-#define BOOST_SPIRIT_INCLUDE_TREE_TO_XML
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_TREE_TO_XML
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_TREE_TO_XML
 #include <boost/spirit/home/classic/tree/tree_to_xml.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_typeof.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_typeof.hpp (original)
+++ trunk/boost/spirit/include/classic_typeof.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_TYPEOF
-#define BOOST_SPIRIT_INCLUDE_TYPEOF
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_TYPEOF
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_TYPEOF
 #include <boost/spirit/home/classic/actor/typeof.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_utility.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_utility.hpp (original)
+++ trunk/boost/spirit/include/classic_utility.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_UTILITY
-#define BOOST_SPIRIT_INCLUDE_UTILITY
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_UTILITY
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_UTILITY
 #include <boost/spirit/home/classic/utility.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_version.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_version.hpp (original)
+++ trunk/boost/spirit/include/classic_version.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_VERSION
-#define BOOST_SPIRIT_INCLUDE_VERSION
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_VERSION
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_VERSION
 #include <boost/spirit/home/classic/version.hpp>
 #endif

Modified: trunk/boost/spirit/include/classic_while.hpp
==============================================================================
--- trunk/boost/spirit/include/classic_while.hpp (original)
+++ trunk/boost/spirit/include/classic_while.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_WHILE
-#define BOOST_SPIRIT_INCLUDE_WHILE
+#ifndef BOOST_SPIRIT_INCLUDE_CLASSIC_WHILE
+#define BOOST_SPIRIT_INCLUDE_CLASSIC_WHILE
 #include <boost/spirit/home/classic/dynamic/while.hpp>
 #endif

Added: trunk/boost/spirit/include/karma.hpp
==============================================================================
--- (empty file)
+++ trunk/boost/spirit/include/karma.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -0,0 +1,12 @@
+/*=============================================================================
+ Copyright (c) 2001-2008 Joel de Guzman
+ Copyright (c) 2001-2008 Hartmut Kaiser
+ http://spirit.sourceforge.net/
+
+ Distributed under the Boost Software License, Version 1.0. (See accompanying
+ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+=============================================================================*/
+#ifndef BOOST_SPIRIT_INCLUDE_KARMA
+#define BOOST_SPIRIT_INCLUDE_KARMA
+#include <boost/spirit/home/karma.hpp>
+#endif

Modified: trunk/boost/spirit/include/karma_action.hpp
==============================================================================
--- trunk/boost/spirit/include/karma_action.hpp (original)
+++ trunk/boost/spirit/include/karma_action.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_KARMA_ACTION
 #define BOOST_SPIRIT_INCLUDE_KARMA_ACTION
-#include <boost/spirit/include/action.hpp>
+#include <boost/spirit/home/karma/action.hpp>
 #endif

Modified: trunk/boost/spirit/include/karma_auxiliary.hpp
==============================================================================
--- trunk/boost/spirit/include/karma_auxiliary.hpp (original)
+++ trunk/boost/spirit/include/karma_auxiliary.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_KARMA_AUXILIARY
 #define BOOST_SPIRIT_INCLUDE_KARMA_AUXILIARY
-#include <boost/spirit/include/auxiliary.hpp>
+#include <boost/spirit/home/karma/auxiliary.hpp>
 #endif

Modified: trunk/boost/spirit/include/karma_binary.hpp
==============================================================================
--- trunk/boost/spirit/include/karma_binary.hpp (original)
+++ trunk/boost/spirit/include/karma_binary.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_KARMA_BINARY
 #define BOOST_SPIRIT_INCLUDE_KARMA_BINARY
-#include <boost/spirit/include/binary.hpp>
+#include <boost/spirit/home/karma/binary.hpp>
 #endif

Modified: trunk/boost/spirit/include/karma_char.hpp
==============================================================================
--- trunk/boost/spirit/include/karma_char.hpp (original)
+++ trunk/boost/spirit/include/karma_char.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_KARMA_CHAR
 #define BOOST_SPIRIT_INCLUDE_KARMA_CHAR
-#include <boost/spirit/include/char.hpp>
+#include <boost/spirit/home/karma/char.hpp>
 #endif

Modified: trunk/boost/spirit/include/karma_delimit.hpp
==============================================================================
--- trunk/boost/spirit/include/karma_delimit.hpp (original)
+++ trunk/boost/spirit/include/karma_delimit.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_KARMA_DELIMIT
 #define BOOST_SPIRIT_INCLUDE_KARMA_DELIMIT
-#include <boost/spirit/include/delimit.hpp>
+#include <boost/spirit/home/karma/delimit.hpp>
 #endif

Modified: trunk/boost/spirit/include/karma_directive.hpp
==============================================================================
--- trunk/boost/spirit/include/karma_directive.hpp (original)
+++ trunk/boost/spirit/include/karma_directive.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_KARMA_DIRECTIVE
 #define BOOST_SPIRIT_INCLUDE_KARMA_DIRECTIVE
-#include <boost/spirit/include/directive.hpp>
+#include <boost/spirit/home/karma/directive.hpp>
 #endif

Modified: trunk/boost/spirit/include/karma_domain.hpp
==============================================================================
--- trunk/boost/spirit/include/karma_domain.hpp (original)
+++ trunk/boost/spirit/include/karma_domain.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_KARMA_DOMAIN
 #define BOOST_SPIRIT_INCLUDE_KARMA_DOMAIN
-#include <boost/spirit/include/domain.hpp>
+#include <boost/spirit/home/karma/domain.hpp>
 #endif

Modified: trunk/boost/spirit/include/karma_generate.hpp
==============================================================================
--- trunk/boost/spirit/include/karma_generate.hpp (original)
+++ trunk/boost/spirit/include/karma_generate.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_KARMA_GENERATE
 #define BOOST_SPIRIT_INCLUDE_KARMA_GENERATE
-#include <boost/spirit/include/generate.hpp>
+#include <boost/spirit/home/karma/generate.hpp>
 #endif

Modified: trunk/boost/spirit/include/karma_meta_grammar.hpp
==============================================================================
--- trunk/boost/spirit/include/karma_meta_grammar.hpp (original)
+++ trunk/boost/spirit/include/karma_meta_grammar.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_KARMA_META_GRAMMAR
 #define BOOST_SPIRIT_INCLUDE_KARMA_META_GRAMMAR
-#include <boost/spirit/include/meta_grammar.hpp>
+#include <boost/spirit/home/karma/meta_grammar.hpp>
 #endif

Modified: trunk/boost/spirit/include/karma_nonterminal.hpp
==============================================================================
--- trunk/boost/spirit/include/karma_nonterminal.hpp (original)
+++ trunk/boost/spirit/include/karma_nonterminal.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_KARMA_NONTERMINAL
 #define BOOST_SPIRIT_INCLUDE_KARMA_NONTERMINAL
-#include <boost/spirit/include/nonterminal.hpp>
+#include <boost/spirit/home/karma/nonterminal.hpp>
 #endif

Modified: trunk/boost/spirit/include/karma_numeric.hpp
==============================================================================
--- trunk/boost/spirit/include/karma_numeric.hpp (original)
+++ trunk/boost/spirit/include/karma_numeric.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_KARMA_NUMERIC
 #define BOOST_SPIRIT_INCLUDE_KARMA_NUMERIC
-#include <boost/spirit/include/numeric.hpp>
+#include <boost/spirit/home/karma/numeric.hpp>
 #endif

Modified: trunk/boost/spirit/include/karma_operator.hpp
==============================================================================
--- trunk/boost/spirit/include/karma_operator.hpp (original)
+++ trunk/boost/spirit/include/karma_operator.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_KARMA_OPERATOR
 #define BOOST_SPIRIT_INCLUDE_KARMA_OPERATOR
-#include <boost/spirit/include/operator.hpp>
+#include <boost/spirit/home/karma/operator.hpp>
 #endif

Modified: trunk/boost/spirit/include/karma_stream.hpp
==============================================================================
--- trunk/boost/spirit/include/karma_stream.hpp (original)
+++ trunk/boost/spirit/include/karma_stream.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_KARMA_STREAM
 #define BOOST_SPIRIT_INCLUDE_KARMA_STREAM
-#include <boost/spirit/include/stream.hpp>
+#include <boost/spirit/home/karma/stream.hpp>
 #endif

Modified: trunk/boost/spirit/include/karma_string.hpp
==============================================================================
--- trunk/boost/spirit/include/karma_string.hpp (original)
+++ trunk/boost/spirit/include/karma_string.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_KARMA_STRING
 #define BOOST_SPIRIT_INCLUDE_KARMA_STRING
-#include <boost/spirit/include/string.hpp>
+#include <boost/spirit/home/karma/string.hpp>
 #endif

Modified: trunk/boost/spirit/include/karma_what.hpp
==============================================================================
--- trunk/boost/spirit/include/karma_what.hpp (original)
+++ trunk/boost/spirit/include/karma_what.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_KARMA_WHAT
 #define BOOST_SPIRIT_INCLUDE_KARMA_WHAT
-#include <boost/spirit/include/what.hpp>
+#include <boost/spirit/home/karma/what.hpp>
 #endif

Added: trunk/boost/spirit/include/lex.hpp
==============================================================================
--- (empty file)
+++ trunk/boost/spirit/include/lex.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -0,0 +1,12 @@
+/*=============================================================================
+ Copyright (c) 2001-2008 Joel de Guzman
+ Copyright (c) 2001-2008 Hartmut Kaiser
+ http://spirit.sourceforge.net/
+
+ Distributed under the Boost Software License, Version 1.0. (See accompanying
+ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+=============================================================================*/
+#ifndef BOOST_SPIRIT_INCLUDE_LEX
+#define BOOST_SPIRIT_INCLUDE_LEX
+#include <boost/spirit/home/lex.hpp>
+#endif

Modified: trunk/boost/spirit/include/lex_domain.hpp
==============================================================================
--- trunk/boost/spirit/include/lex_domain.hpp (original)
+++ trunk/boost/spirit/include/lex_domain.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_LEX_DOMAIN
 #define BOOST_SPIRIT_INCLUDE_LEX_DOMAIN
-#include <boost/spirit/include/domain.hpp>
+#include <boost/spirit/home/lex/domain.hpp>
 #endif

Modified: trunk/boost/spirit/include/lex_lexer.hpp
==============================================================================
--- trunk/boost/spirit/include/lex_lexer.hpp (original)
+++ trunk/boost/spirit/include/lex_lexer.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_LEX_LEXER
 #define BOOST_SPIRIT_INCLUDE_LEX_LEXER
-#include <boost/spirit/include/lexer.hpp>
+#include <boost/spirit/home/lex/lexer.hpp>
 #endif

Modified: trunk/boost/spirit/include/lex_lexer_lexertl.hpp
==============================================================================
--- trunk/boost/spirit/include/lex_lexer_lexertl.hpp (original)
+++ trunk/boost/spirit/include/lex_lexer_lexertl.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_LEX_LEXER_LEXERTL
 #define BOOST_SPIRIT_INCLUDE_LEX_LEXER_LEXERTL
-#include <boost/spirit/include/lexer_lexertl.hpp>
+#include <boost/spirit/home/lex/lexer_lexertl.hpp>
 #endif

Modified: trunk/boost/spirit/include/lex_lexer_static_lexertl.hpp
==============================================================================
--- trunk/boost/spirit/include/lex_lexer_static_lexertl.hpp (original)
+++ trunk/boost/spirit/include/lex_lexer_static_lexertl.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_LEX_LEXER_STATIC_LEXERTL
 #define BOOST_SPIRIT_INCLUDE_LEX_LEXER_STATIC_LEXERTL
-#include <boost/spirit/include/lexer_static_lexertl.hpp>
+#include <boost/spirit/home/lex/lexer_static_lexertl.hpp>
 #endif

Modified: trunk/boost/spirit/include/lex_meta_grammar.hpp
==============================================================================
--- trunk/boost/spirit/include/lex_meta_grammar.hpp (original)
+++ trunk/boost/spirit/include/lex_meta_grammar.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_LEX_META_GRAMMAR
 #define BOOST_SPIRIT_INCLUDE_LEX_META_GRAMMAR
-#include <boost/spirit/include/meta_grammar.hpp>
+#include <boost/spirit/home/lex/meta_grammar.hpp>
 #endif

Modified: trunk/boost/spirit/include/lex_set_state.hpp
==============================================================================
--- trunk/boost/spirit/include/lex_set_state.hpp (original)
+++ trunk/boost/spirit/include/lex_set_state.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_LEX_SET_STATE
 #define BOOST_SPIRIT_INCLUDE_LEX_SET_STATE
-#include <boost/spirit/include/set_state.hpp>
+#include <boost/spirit/home/lex/set_state.hpp>
 #endif

Modified: trunk/boost/spirit/include/lex_tokenize_and_parse.hpp
==============================================================================
--- trunk/boost/spirit/include/lex_tokenize_and_parse.hpp (original)
+++ trunk/boost/spirit/include/lex_tokenize_and_parse.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_LEX_TOKENIZE_AND_PARSE
 #define BOOST_SPIRIT_INCLUDE_LEX_TOKENIZE_AND_PARSE
-#include <boost/spirit/include/tokenize_and_parse.hpp>
+#include <boost/spirit/home/lex/tokenize_and_parse.hpp>
 #endif

Added: trunk/boost/spirit/include/phoenix.hpp
==============================================================================
--- (empty file)
+++ trunk/boost/spirit/include/phoenix.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -0,0 +1,12 @@
+/*=============================================================================
+ Copyright (c) 2001-2008 Joel de Guzman
+ Copyright (c) 2001-2008 Hartmut Kaiser
+ http://spirit.sourceforge.net/
+
+ Distributed under the Boost Software License, Version 1.0. (See accompanying
+ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+=============================================================================*/
+#ifndef BOOST_SPIRIT_INCLUDE_PHOENIX
+#define BOOST_SPIRIT_INCLUDE_PHOENIX
+#include <boost/spirit/home/phoenix.hpp>
+#endif

Modified: trunk/boost/spirit/include/phoenix1_actor.hpp
==============================================================================
--- trunk/boost/spirit/include/phoenix1_actor.hpp (original)
+++ trunk/boost/spirit/include/phoenix1_actor.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_PHX1_ACTOR
-#define BOOST_SPIRIT_INCLUDE_PHX1_ACTOR
+#ifndef BOOST_SPIRIT_INCLUDE_PHOENIX1_ACTOR
+#define BOOST_SPIRIT_INCLUDE_PHOENIX1_ACTOR
 #include <boost/spirit/home/classic/phoenix/actor.hpp>
 #endif

Modified: trunk/boost/spirit/include/phoenix1_binders.hpp
==============================================================================
--- trunk/boost/spirit/include/phoenix1_binders.hpp (original)
+++ trunk/boost/spirit/include/phoenix1_binders.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_PHX1_BINDERS
-#define BOOST_SPIRIT_INCLUDE_PHX1_BINDERS
+#ifndef BOOST_SPIRIT_INCLUDE_PHOENIX1_BINDERS
+#define BOOST_SPIRIT_INCLUDE_PHOENIX1_BINDERS
 #include <boost/spirit/home/classic/phoenix/binders.hpp>
 #endif

Modified: trunk/boost/spirit/include/phoenix1_casts.hpp
==============================================================================
--- trunk/boost/spirit/include/phoenix1_casts.hpp (original)
+++ trunk/boost/spirit/include/phoenix1_casts.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_PHX1_CASTS
-#define BOOST_SPIRIT_INCLUDE_PHX1_CASTS
+#ifndef BOOST_SPIRIT_INCLUDE_PHOENIX1_CASTS
+#define BOOST_SPIRIT_INCLUDE_PHOENIX1_CASTS
 #include <boost/spirit/home/classic/phoenix/casts.hpp>
 #endif

Modified: trunk/boost/spirit/include/phoenix1_closures.hpp
==============================================================================
--- trunk/boost/spirit/include/phoenix1_closures.hpp (original)
+++ trunk/boost/spirit/include/phoenix1_closures.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_PHX1_CLOSURES
-#define BOOST_SPIRIT_INCLUDE_PHX1_CLOSURES
+#ifndef BOOST_SPIRIT_INCLUDE_PHOENIX1_CLOSURES
+#define BOOST_SPIRIT_INCLUDE_PHOENIX1_CLOSURES
 #include <boost/spirit/home/classic/phoenix/closures.hpp>
 #endif

Modified: trunk/boost/spirit/include/phoenix1_composite.hpp
==============================================================================
--- trunk/boost/spirit/include/phoenix1_composite.hpp (original)
+++ trunk/boost/spirit/include/phoenix1_composite.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_PHX1_COMPOSITE
-#define BOOST_SPIRIT_INCLUDE_PHX1_COMPOSITE
+#ifndef BOOST_SPIRIT_INCLUDE_PHOENIX1_COMPOSITE
+#define BOOST_SPIRIT_INCLUDE_PHOENIX1_COMPOSITE
 #include <boost/spirit/home/classic/phoenix/composite.hpp>
 #endif

Modified: trunk/boost/spirit/include/phoenix1_functions.hpp
==============================================================================
--- trunk/boost/spirit/include/phoenix1_functions.hpp (original)
+++ trunk/boost/spirit/include/phoenix1_functions.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_PHX1_FUNCTIONS
-#define BOOST_SPIRIT_INCLUDE_PHX1_FUNCTIONS
+#ifndef BOOST_SPIRIT_INCLUDE_PHOENIX1_FUNCTIONS
+#define BOOST_SPIRIT_INCLUDE_PHOENIX1_FUNCTIONS
 #include <boost/spirit/home/classic/phoenix/functions.hpp>
 #endif

Modified: trunk/boost/spirit/include/phoenix1_new.hpp
==============================================================================
--- trunk/boost/spirit/include/phoenix1_new.hpp (original)
+++ trunk/boost/spirit/include/phoenix1_new.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_PHX1_NEW
-#define BOOST_SPIRIT_INCLUDE_PHX1_NEW
+#ifndef BOOST_SPIRIT_INCLUDE_PHOENIX1_NEW
+#define BOOST_SPIRIT_INCLUDE_PHOENIX1_NEW
 #include <boost/spirit/home/classic/phoenix/new.hpp>
 #endif

Modified: trunk/boost/spirit/include/phoenix1_operators.hpp
==============================================================================
--- trunk/boost/spirit/include/phoenix1_operators.hpp (original)
+++ trunk/boost/spirit/include/phoenix1_operators.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_PHX1_OPERATORS
-#define BOOST_SPIRIT_INCLUDE_PHX1_OPERATORS
+#ifndef BOOST_SPIRIT_INCLUDE_PHOENIX1_OPERATORS
+#define BOOST_SPIRIT_INCLUDE_PHOENIX1_OPERATORS
 #include <boost/spirit/home/classic/phoenix/operators.hpp>
 #endif

Modified: trunk/boost/spirit/include/phoenix1_primitives.hpp
==============================================================================
--- trunk/boost/spirit/include/phoenix1_primitives.hpp (original)
+++ trunk/boost/spirit/include/phoenix1_primitives.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_PHX1_PRIMITIVES
-#define BOOST_SPIRIT_INCLUDE_PHX1_PRIMITIVES
+#ifndef BOOST_SPIRIT_INCLUDE_PHOENIX1_PRIMITIVES
+#define BOOST_SPIRIT_INCLUDE_PHOENIX1_PRIMITIVES
 #include <boost/spirit/home/classic/phoenix/primitives.hpp>
 #endif

Modified: trunk/boost/spirit/include/phoenix1_special_ops.hpp
==============================================================================
--- trunk/boost/spirit/include/phoenix1_special_ops.hpp (original)
+++ trunk/boost/spirit/include/phoenix1_special_ops.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_PHX1_SPECIAL_OPS
-#define BOOST_SPIRIT_INCLUDE_PHX1_SPECIAL_OPS
+#ifndef BOOST_SPIRIT_INCLUDE_PHOENIX1_SPECIAL_OPS
+#define BOOST_SPIRIT_INCLUDE_PHOENIX1_SPECIAL_OPS
 #include <boost/spirit/home/classic/phoenix/special_ops.hpp>
 #endif

Modified: trunk/boost/spirit/include/phoenix1_statements.hpp
==============================================================================
--- trunk/boost/spirit/include/phoenix1_statements.hpp (original)
+++ trunk/boost/spirit/include/phoenix1_statements.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_PHX1_STATEMENTS
-#define BOOST_SPIRIT_INCLUDE_PHX1_STATEMENTS
+#ifndef BOOST_SPIRIT_INCLUDE_PHOENIX1_STATEMENTS
+#define BOOST_SPIRIT_INCLUDE_PHOENIX1_STATEMENTS
 #include <boost/spirit/home/classic/phoenix/statements.hpp>
 #endif

Modified: trunk/boost/spirit/include/phoenix1_tuple_helpers.hpp
==============================================================================
--- trunk/boost/spirit/include/phoenix1_tuple_helpers.hpp (original)
+++ trunk/boost/spirit/include/phoenix1_tuple_helpers.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_PHX1_TUPLE_HELPERS
-#define BOOST_SPIRIT_INCLUDE_PHX1_TUPLE_HELPERS
+#ifndef BOOST_SPIRIT_INCLUDE_PHOENIX1_TUPLE_HELPERS
+#define BOOST_SPIRIT_INCLUDE_PHOENIX1_TUPLE_HELPERS
 #include <boost/spirit/home/classic/phoenix/tuple_helpers.hpp>
 #endif

Modified: trunk/boost/spirit/include/phoenix1_tuples.hpp
==============================================================================
--- trunk/boost/spirit/include/phoenix1_tuples.hpp (original)
+++ trunk/boost/spirit/include/phoenix1_tuples.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -6,7 +6,7 @@
   Distributed under the Boost Software License, Version 1.0. (See accompanying
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_PHX1_TUPLES
-#define BOOST_SPIRIT_INCLUDE_PHX1_TUPLES
+#ifndef BOOST_SPIRIT_INCLUDE_PHOENIX1_TUPLES
+#define BOOST_SPIRIT_INCLUDE_PHOENIX1_TUPLES
 #include <boost/spirit/home/classic/phoenix/tuples.hpp>
 #endif

Modified: trunk/boost/spirit/include/phoenix_algorithm.hpp
==============================================================================
--- trunk/boost/spirit/include/phoenix_algorithm.hpp (original)
+++ trunk/boost/spirit/include/phoenix_algorithm.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_PHOENIX_ALGORITHM
 #define BOOST_SPIRIT_INCLUDE_PHOENIX_ALGORITHM
-#include <boost/spirit/include/algorithm.hpp>
+#include <boost/spirit/home/phoenix/algorithm.hpp>
 #endif

Modified: trunk/boost/spirit/include/phoenix_bind.hpp
==============================================================================
--- trunk/boost/spirit/include/phoenix_bind.hpp (original)
+++ trunk/boost/spirit/include/phoenix_bind.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_PHOENIX_BIND
 #define BOOST_SPIRIT_INCLUDE_PHOENIX_BIND
-#include <boost/spirit/include/bind.hpp>
+#include <boost/spirit/home/phoenix/bind.hpp>
 #endif

Modified: trunk/boost/spirit/include/phoenix_container.hpp
==============================================================================
--- trunk/boost/spirit/include/phoenix_container.hpp (original)
+++ trunk/boost/spirit/include/phoenix_container.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_PHOENIX_CONTAINER
 #define BOOST_SPIRIT_INCLUDE_PHOENIX_CONTAINER
-#include <boost/spirit/include/container.hpp>
+#include <boost/spirit/home/phoenix/container.hpp>
 #endif

Modified: trunk/boost/spirit/include/phoenix_core.hpp
==============================================================================
--- trunk/boost/spirit/include/phoenix_core.hpp (original)
+++ trunk/boost/spirit/include/phoenix_core.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_PHOENIX_CORE
 #define BOOST_SPIRIT_INCLUDE_PHOENIX_CORE
-#include <boost/spirit/include/core.hpp>
+#include <boost/spirit/home/phoenix/core.hpp>
 #endif

Modified: trunk/boost/spirit/include/phoenix_function.hpp
==============================================================================
--- trunk/boost/spirit/include/phoenix_function.hpp (original)
+++ trunk/boost/spirit/include/phoenix_function.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_PHOENIX_FUNCTION
 #define BOOST_SPIRIT_INCLUDE_PHOENIX_FUNCTION
-#include <boost/spirit/include/function.hpp>
+#include <boost/spirit/home/phoenix/function.hpp>
 #endif

Modified: trunk/boost/spirit/include/phoenix_fusion.hpp
==============================================================================
--- trunk/boost/spirit/include/phoenix_fusion.hpp (original)
+++ trunk/boost/spirit/include/phoenix_fusion.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_PHOENIX_FUSION
 #define BOOST_SPIRIT_INCLUDE_PHOENIX_FUSION
-#include <boost/spirit/include/fusion.hpp>
+#include <boost/spirit/home/phoenix/fusion.hpp>
 #endif

Modified: trunk/boost/spirit/include/phoenix_object.hpp
==============================================================================
--- trunk/boost/spirit/include/phoenix_object.hpp (original)
+++ trunk/boost/spirit/include/phoenix_object.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_PHOENIX_OBJECT
 #define BOOST_SPIRIT_INCLUDE_PHOENIX_OBJECT
-#include <boost/spirit/include/object.hpp>
+#include <boost/spirit/home/phoenix/object.hpp>
 #endif

Modified: trunk/boost/spirit/include/phoenix_operator.hpp
==============================================================================
--- trunk/boost/spirit/include/phoenix_operator.hpp (original)
+++ trunk/boost/spirit/include/phoenix_operator.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_PHOENIX_OPERATOR
 #define BOOST_SPIRIT_INCLUDE_PHOENIX_OPERATOR
-#include <boost/spirit/include/operator.hpp>
+#include <boost/spirit/home/phoenix/operator.hpp>
 #endif

Modified: trunk/boost/spirit/include/phoenix_scope.hpp
==============================================================================
--- trunk/boost/spirit/include/phoenix_scope.hpp (original)
+++ trunk/boost/spirit/include/phoenix_scope.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_PHOENIX_SCOPE
 #define BOOST_SPIRIT_INCLUDE_PHOENIX_SCOPE
-#include <boost/spirit/include/scope.hpp>
+#include <boost/spirit/home/phoenix/scope.hpp>
 #endif

Modified: trunk/boost/spirit/include/phoenix_statement.hpp
==============================================================================
--- trunk/boost/spirit/include/phoenix_statement.hpp (original)
+++ trunk/boost/spirit/include/phoenix_statement.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_PHOENIX_STATEMENT
 #define BOOST_SPIRIT_INCLUDE_PHOENIX_STATEMENT
-#include <boost/spirit/include/statement.hpp>
+#include <boost/spirit/home/phoenix/statement.hpp>
 #endif

Modified: trunk/boost/spirit/include/phoenix_stl.hpp
==============================================================================
--- trunk/boost/spirit/include/phoenix_stl.hpp (original)
+++ trunk/boost/spirit/include/phoenix_stl.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_PHOENIX_STL
 #define BOOST_SPIRIT_INCLUDE_PHOENIX_STL
-#include <boost/spirit/include/stl.hpp>
+#include <boost/spirit/home/phoenix/stl.hpp>
 #endif

Modified: trunk/boost/spirit/include/phoenix_version.hpp
==============================================================================
--- trunk/boost/spirit/include/phoenix_version.hpp (original)
+++ trunk/boost/spirit/include/phoenix_version.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_PHOENIX_VERSION
 #define BOOST_SPIRIT_INCLUDE_PHOENIX_VERSION
-#include <boost/spirit/include/version.hpp>
+#include <boost/spirit/home/phoenix/version.hpp>
 #endif

Added: trunk/boost/spirit/include/qi.hpp
==============================================================================
--- (empty file)
+++ trunk/boost/spirit/include/qi.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -0,0 +1,12 @@
+/*=============================================================================
+ Copyright (c) 2001-2008 Joel de Guzman
+ Copyright (c) 2001-2008 Hartmut Kaiser
+ http://spirit.sourceforge.net/
+
+ Distributed under the Boost Software License, Version 1.0. (See accompanying
+ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+=============================================================================*/
+#ifndef BOOST_SPIRIT_INCLUDE_QI
+#define BOOST_SPIRIT_INCLUDE_QI
+#include <boost/spirit/home/qi.hpp>
+#endif

Modified: trunk/boost/spirit/include/qi_action.hpp
==============================================================================
--- trunk/boost/spirit/include/qi_action.hpp (original)
+++ trunk/boost/spirit/include/qi_action.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_QI_ACTION
 #define BOOST_SPIRIT_INCLUDE_QI_ACTION
-#include <boost/spirit/include/action.hpp>
+#include <boost/spirit/home/qi/action.hpp>
 #endif

Modified: trunk/boost/spirit/include/qi_auxiliary.hpp
==============================================================================
--- trunk/boost/spirit/include/qi_auxiliary.hpp (original)
+++ trunk/boost/spirit/include/qi_auxiliary.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_QI_AUXILIARY
 #define BOOST_SPIRIT_INCLUDE_QI_AUXILIARY
-#include <boost/spirit/include/auxiliary.hpp>
+#include <boost/spirit/home/qi/auxiliary.hpp>
 #endif

Modified: trunk/boost/spirit/include/qi_binary.hpp
==============================================================================
--- trunk/boost/spirit/include/qi_binary.hpp (original)
+++ trunk/boost/spirit/include/qi_binary.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_QI_BINARY
 #define BOOST_SPIRIT_INCLUDE_QI_BINARY
-#include <boost/spirit/include/binary.hpp>
+#include <boost/spirit/home/qi/binary.hpp>
 #endif

Modified: trunk/boost/spirit/include/qi_char.hpp
==============================================================================
--- trunk/boost/spirit/include/qi_char.hpp (original)
+++ trunk/boost/spirit/include/qi_char.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_QI_CHAR
 #define BOOST_SPIRIT_INCLUDE_QI_CHAR
-#include <boost/spirit/include/char.hpp>
+#include <boost/spirit/home/qi/char.hpp>
 #endif

Modified: trunk/boost/spirit/include/qi_debug.hpp
==============================================================================
--- trunk/boost/spirit/include/qi_debug.hpp (original)
+++ trunk/boost/spirit/include/qi_debug.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_QI_DEBUG
 #define BOOST_SPIRIT_INCLUDE_QI_DEBUG
-#include <boost/spirit/include/debug.hpp>
+#include <boost/spirit/home/qi/debug.hpp>
 #endif

Modified: trunk/boost/spirit/include/qi_directive.hpp
==============================================================================
--- trunk/boost/spirit/include/qi_directive.hpp (original)
+++ trunk/boost/spirit/include/qi_directive.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_QI_DIRECTIVE
 #define BOOST_SPIRIT_INCLUDE_QI_DIRECTIVE
-#include <boost/spirit/include/directive.hpp>
+#include <boost/spirit/home/qi/directive.hpp>
 #endif

Modified: trunk/boost/spirit/include/qi_domain.hpp
==============================================================================
--- trunk/boost/spirit/include/qi_domain.hpp (original)
+++ trunk/boost/spirit/include/qi_domain.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_QI_DOMAIN
 #define BOOST_SPIRIT_INCLUDE_QI_DOMAIN
-#include <boost/spirit/include/domain.hpp>
+#include <boost/spirit/home/qi/domain.hpp>
 #endif

Modified: trunk/boost/spirit/include/qi_meta_grammar.hpp
==============================================================================
--- trunk/boost/spirit/include/qi_meta_grammar.hpp (original)
+++ trunk/boost/spirit/include/qi_meta_grammar.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_QI_META_GRAMMAR
 #define BOOST_SPIRIT_INCLUDE_QI_META_GRAMMAR
-#include <boost/spirit/include/meta_grammar.hpp>
+#include <boost/spirit/home/qi/meta_grammar.hpp>
 #endif

Modified: trunk/boost/spirit/include/qi_nonterminal.hpp
==============================================================================
--- trunk/boost/spirit/include/qi_nonterminal.hpp (original)
+++ trunk/boost/spirit/include/qi_nonterminal.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_QI_NONTERMINAL
 #define BOOST_SPIRIT_INCLUDE_QI_NONTERMINAL
-#include <boost/spirit/include/nonterminal.hpp>
+#include <boost/spirit/home/qi/nonterminal.hpp>
 #endif

Modified: trunk/boost/spirit/include/qi_numeric.hpp
==============================================================================
--- trunk/boost/spirit/include/qi_numeric.hpp (original)
+++ trunk/boost/spirit/include/qi_numeric.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_QI_NUMERIC
 #define BOOST_SPIRIT_INCLUDE_QI_NUMERIC
-#include <boost/spirit/include/numeric.hpp>
+#include <boost/spirit/home/qi/numeric.hpp>
 #endif

Modified: trunk/boost/spirit/include/qi_operator.hpp
==============================================================================
--- trunk/boost/spirit/include/qi_operator.hpp (original)
+++ trunk/boost/spirit/include/qi_operator.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_QI_OPERATOR
 #define BOOST_SPIRIT_INCLUDE_QI_OPERATOR
-#include <boost/spirit/include/operator.hpp>
+#include <boost/spirit/home/qi/operator.hpp>
 #endif

Modified: trunk/boost/spirit/include/qi_parse.hpp
==============================================================================
--- trunk/boost/spirit/include/qi_parse.hpp (original)
+++ trunk/boost/spirit/include/qi_parse.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_QI_PARSE
 #define BOOST_SPIRIT_INCLUDE_QI_PARSE
-#include <boost/spirit/include/parse.hpp>
+#include <boost/spirit/home/qi/parse.hpp>
 #endif

Modified: trunk/boost/spirit/include/qi_skip.hpp
==============================================================================
--- trunk/boost/spirit/include/qi_skip.hpp (original)
+++ trunk/boost/spirit/include/qi_skip.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_QI_SKIP
 #define BOOST_SPIRIT_INCLUDE_QI_SKIP
-#include <boost/spirit/include/skip.hpp>
+#include <boost/spirit/home/qi/skip.hpp>
 #endif

Modified: trunk/boost/spirit/include/qi_stream.hpp
==============================================================================
--- trunk/boost/spirit/include/qi_stream.hpp (original)
+++ trunk/boost/spirit/include/qi_stream.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_QI_STREAM
 #define BOOST_SPIRIT_INCLUDE_QI_STREAM
-#include <boost/spirit/include/stream.hpp>
+#include <boost/spirit/home/qi/stream.hpp>
 #endif

Modified: trunk/boost/spirit/include/qi_string.hpp
==============================================================================
--- trunk/boost/spirit/include/qi_string.hpp (original)
+++ trunk/boost/spirit/include/qi_string.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_QI_STRING
 #define BOOST_SPIRIT_INCLUDE_QI_STRING
-#include <boost/spirit/include/string.hpp>
+#include <boost/spirit/home/qi/string.hpp>
 #endif

Modified: trunk/boost/spirit/include/qi_what.hpp
==============================================================================
--- trunk/boost/spirit/include/qi_what.hpp (original)
+++ trunk/boost/spirit/include/qi_what.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_QI_WHAT
 #define BOOST_SPIRIT_INCLUDE_QI_WHAT
-#include <boost/spirit/include/what.hpp>
+#include <boost/spirit/home/qi/what.hpp>
 #endif

Added: trunk/boost/spirit/include/support.hpp
==============================================================================
--- (empty file)
+++ trunk/boost/spirit/include/support.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -0,0 +1,12 @@
+/*=============================================================================
+ Copyright (c) 2001-2008 Joel de Guzman
+ Copyright (c) 2001-2008 Hartmut Kaiser
+ http://spirit.sourceforge.net/
+
+ Distributed under the Boost Software License, Version 1.0. (See accompanying
+ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+=============================================================================*/
+#ifndef BOOST_SPIRIT_INCLUDE_SUPPORT
+#define BOOST_SPIRIT_INCLUDE_SUPPORT
+#include <boost/spirit/home/support.hpp>
+#endif

Modified: trunk/boost/spirit/include/support_any.hpp
==============================================================================
--- trunk/boost/spirit/include/support_any.hpp (original)
+++ trunk/boost/spirit/include/support_any.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_SUPPORT_ANY
 #define BOOST_SPIRIT_INCLUDE_SUPPORT_ANY
-#include <boost/spirit/include/any.hpp>
+#include <boost/spirit/home/support/algorithm/any.hpp>
 #endif

Modified: trunk/boost/spirit/include/support_any_if.hpp
==============================================================================
--- trunk/boost/spirit/include/support_any_if.hpp (original)
+++ trunk/boost/spirit/include/support_any_if.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_SUPPORT_ANY_IF
 #define BOOST_SPIRIT_INCLUDE_SUPPORT_ANY_IF
-#include <boost/spirit/include/any_if.hpp>
+#include <boost/spirit/home/support/algorithm/any_if.hpp>
 #endif

Modified: trunk/boost/spirit/include/support_any_ns.hpp
==============================================================================
--- trunk/boost/spirit/include/support_any_ns.hpp (original)
+++ trunk/boost/spirit/include/support_any_ns.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_SUPPORT_ANY_NS
 #define BOOST_SPIRIT_INCLUDE_SUPPORT_ANY_NS
-#include <boost/spirit/include/any_ns.hpp>
+#include <boost/spirit/home/support/algorithm/any_ns.hpp>
 #endif

Modified: trunk/boost/spirit/include/support_argument.hpp
==============================================================================
--- trunk/boost/spirit/include/support_argument.hpp (original)
+++ trunk/boost/spirit/include/support_argument.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_SUPPORT_ARGUMENT
 #define BOOST_SPIRIT_INCLUDE_SUPPORT_ARGUMENT
-#include <boost/spirit/include/argument.hpp>
+#include <boost/spirit/home/support/argument.hpp>
 #endif

Modified: trunk/boost/spirit/include/support_as_variant.hpp
==============================================================================
--- trunk/boost/spirit/include/support_as_variant.hpp (original)
+++ trunk/boost/spirit/include/support_as_variant.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_SUPPORT_AS_VARIANT
 #define BOOST_SPIRIT_INCLUDE_SUPPORT_AS_VARIANT
-#include <boost/spirit/include/as_variant.hpp>
+#include <boost/spirit/home/support/as_variant.hpp>
 #endif

Modified: trunk/boost/spirit/include/support_ascii.hpp
==============================================================================
--- trunk/boost/spirit/include/support_ascii.hpp (original)
+++ trunk/boost/spirit/include/support_ascii.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_SUPPORT_ASCII
 #define BOOST_SPIRIT_INCLUDE_SUPPORT_ASCII
-#include <boost/spirit/include/ascii.hpp>
+#include <boost/spirit/home/support/ascii.hpp>
 #endif

Modified: trunk/boost/spirit/include/support_attribute_of.hpp
==============================================================================
--- trunk/boost/spirit/include/support_attribute_of.hpp (original)
+++ trunk/boost/spirit/include/support_attribute_of.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_SUPPORT_ATTRIBUTE_OF
 #define BOOST_SPIRIT_INCLUDE_SUPPORT_ATTRIBUTE_OF
-#include <boost/spirit/include/attribute_of.hpp>
+#include <boost/spirit/home/support/attribute_of.hpp>
 #endif

Modified: trunk/boost/spirit/include/support_attribute_transform.hpp
==============================================================================
--- trunk/boost/spirit/include/support_attribute_transform.hpp (original)
+++ trunk/boost/spirit/include/support_attribute_transform.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_SUPPORT_ATTRIBUTE_TRANSFORM
 #define BOOST_SPIRIT_INCLUDE_SUPPORT_ATTRIBUTE_TRANSFORM
-#include <boost/spirit/include/attribute_transform.hpp>
+#include <boost/spirit/home/support/attribute_transform.hpp>
 #endif

Modified: trunk/boost/spirit/include/support_basic_rules.hpp
==============================================================================
--- trunk/boost/spirit/include/support_basic_rules.hpp (original)
+++ trunk/boost/spirit/include/support_basic_rules.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_SUPPORT_BASIC_RULES
 #define BOOST_SPIRIT_INCLUDE_SUPPORT_BASIC_RULES
-#include <boost/spirit/include/basic_rules.hpp>
+#include <boost/spirit/home/support/meta_grammar/basic_rules.hpp>
 #endif

Modified: trunk/boost/spirit/include/support_basic_transforms.hpp
==============================================================================
--- trunk/boost/spirit/include/support_basic_transforms.hpp (original)
+++ trunk/boost/spirit/include/support_basic_transforms.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_SUPPORT_BASIC_TRANSFORMS
 #define BOOST_SPIRIT_INCLUDE_SUPPORT_BASIC_TRANSFORMS
-#include <boost/spirit/include/basic_transforms.hpp>
+#include <boost/spirit/home/support/meta_grammar/basic_transforms.hpp>
 #endif

Modified: trunk/boost/spirit/include/support_char_class.hpp
==============================================================================
--- trunk/boost/spirit/include/support_char_class.hpp (original)
+++ trunk/boost/spirit/include/support_char_class.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_SUPPORT_CHAR_CLASS
 #define BOOST_SPIRIT_INCLUDE_SUPPORT_CHAR_CLASS
-#include <boost/spirit/include/char_class.hpp>
+#include <boost/spirit/home/support/char_class.hpp>
 #endif

Modified: trunk/boost/spirit/include/support_component.hpp
==============================================================================
--- trunk/boost/spirit/include/support_component.hpp (original)
+++ trunk/boost/spirit/include/support_component.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_SUPPORT_COMPONENT
 #define BOOST_SPIRIT_INCLUDE_SUPPORT_COMPONENT
-#include <boost/spirit/include/component.hpp>
+#include <boost/spirit/home/support/component.hpp>
 #endif

Modified: trunk/boost/spirit/include/support_functor_holder.hpp
==============================================================================
--- trunk/boost/spirit/include/support_functor_holder.hpp (original)
+++ trunk/boost/spirit/include/support_functor_holder.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_SUPPORT_FUNCTOR_HOLDER
 #define BOOST_SPIRIT_INCLUDE_SUPPORT_FUNCTOR_HOLDER
-#include <boost/spirit/include/functor_holder.hpp>
+#include <boost/spirit/home/support/auxiliary/functor_holder.hpp>
 #endif

Modified: trunk/boost/spirit/include/support_grammar.hpp
==============================================================================
--- trunk/boost/spirit/include/support_grammar.hpp (original)
+++ trunk/boost/spirit/include/support_grammar.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_SUPPORT_GRAMMAR
 #define BOOST_SPIRIT_INCLUDE_SUPPORT_GRAMMAR
-#include <boost/spirit/include/grammar.hpp>
+#include <boost/spirit/home/support/meta_grammar/grammar.hpp>
 #endif

Modified: trunk/boost/spirit/include/support_iso8859_1.hpp
==============================================================================
--- trunk/boost/spirit/include/support_iso8859_1.hpp (original)
+++ trunk/boost/spirit/include/support_iso8859_1.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_SUPPORT_ISO8859_1
 #define BOOST_SPIRIT_INCLUDE_SUPPORT_ISO8859_1
-#include <boost/spirit/include/iso8859_1.hpp>
+#include <boost/spirit/home/support/iso8859_1.hpp>
 #endif

Modified: trunk/boost/spirit/include/support_locals.hpp
==============================================================================
--- trunk/boost/spirit/include/support_locals.hpp (original)
+++ trunk/boost/spirit/include/support_locals.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_SUPPORT_LOCALS
 #define BOOST_SPIRIT_INCLUDE_SUPPORT_LOCALS
-#include <boost/spirit/include/locals.hpp>
+#include <boost/spirit/home/support/nonterminal/locals.hpp>
 #endif

Modified: trunk/boost/spirit/include/support_look_ahead.hpp
==============================================================================
--- trunk/boost/spirit/include/support_look_ahead.hpp (original)
+++ trunk/boost/spirit/include/support_look_ahead.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_SUPPORT_LOOK_AHEAD
 #define BOOST_SPIRIT_INCLUDE_SUPPORT_LOOK_AHEAD
-#include <boost/spirit/include/look_ahead.hpp>
+#include <boost/spirit/home/support/iterators/look_ahead.hpp>
 #endif

Modified: trunk/boost/spirit/include/support_meta_function_holder.hpp
==============================================================================
--- trunk/boost/spirit/include/support_meta_function_holder.hpp (original)
+++ trunk/boost/spirit/include/support_meta_function_holder.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_SUPPORT_META_FUNCTION_HOLDER
 #define BOOST_SPIRIT_INCLUDE_SUPPORT_META_FUNCTION_HOLDER
-#include <boost/spirit/include/meta_function_holder.hpp>
+#include <boost/spirit/home/support/auxiliary/meta_function_holder.hpp>
 #endif

Modified: trunk/boost/spirit/include/support_meta_grammar.hpp
==============================================================================
--- trunk/boost/spirit/include/support_meta_grammar.hpp (original)
+++ trunk/boost/spirit/include/support_meta_grammar.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_SUPPORT_META_GRAMMAR
 #define BOOST_SPIRIT_INCLUDE_SUPPORT_META_GRAMMAR
-#include <boost/spirit/include/meta_grammar.hpp>
+#include <boost/spirit/home/support/meta_grammar.hpp>
 #endif

Modified: trunk/boost/spirit/include/support_modifier.hpp
==============================================================================
--- trunk/boost/spirit/include/support_modifier.hpp (original)
+++ trunk/boost/spirit/include/support_modifier.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_SUPPORT_MODIFIER
 #define BOOST_SPIRIT_INCLUDE_SUPPORT_MODIFIER
-#include <boost/spirit/include/modifier.hpp>
+#include <boost/spirit/home/support/modifier.hpp>
 #endif

Modified: trunk/boost/spirit/include/support_multi_pass.hpp
==============================================================================
--- trunk/boost/spirit/include/support_multi_pass.hpp (original)
+++ trunk/boost/spirit/include/support_multi_pass.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_SUPPORT_MULTI_PASS
 #define BOOST_SPIRIT_INCLUDE_SUPPORT_MULTI_PASS
-#include <boost/spirit/include/multi_pass.hpp>
+#include <boost/spirit/home/support/multi_pass.hpp>
 #endif

Modified: trunk/boost/spirit/include/support_multi_pass_fwd.hpp
==============================================================================
--- trunk/boost/spirit/include/support_multi_pass_fwd.hpp (original)
+++ trunk/boost/spirit/include/support_multi_pass_fwd.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_SUPPORT_MULTI_PASS_FWD
 #define BOOST_SPIRIT_INCLUDE_SUPPORT_MULTI_PASS_FWD
-#include <boost/spirit/include/multi_pass_fwd.hpp>
+#include <boost/spirit/home/support/iterators/multi_pass_fwd.hpp>
 #endif

Modified: trunk/boost/spirit/include/support_nonterminal.hpp
==============================================================================
--- trunk/boost/spirit/include/support_nonterminal.hpp (original)
+++ trunk/boost/spirit/include/support_nonterminal.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_SUPPORT_NONTERMINAL
 #define BOOST_SPIRIT_INCLUDE_SUPPORT_NONTERMINAL
-#include <boost/spirit/include/nonterminal.hpp>
+#include <boost/spirit/home/support/nonterminal/nonterminal.hpp>
 #endif

Modified: trunk/boost/spirit/include/support_placeholders.hpp
==============================================================================
--- trunk/boost/spirit/include/support_placeholders.hpp (original)
+++ trunk/boost/spirit/include/support_placeholders.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_SUPPORT_PLACEHOLDERS
 #define BOOST_SPIRIT_INCLUDE_SUPPORT_PLACEHOLDERS
-#include <boost/spirit/include/placeholders.hpp>
+#include <boost/spirit/home/support/placeholders.hpp>
 #endif

Modified: trunk/boost/spirit/include/support_safe_bool.hpp
==============================================================================
--- trunk/boost/spirit/include/support_safe_bool.hpp (original)
+++ trunk/boost/spirit/include/support_safe_bool.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_SUPPORT_SAFE_BOOL
 #define BOOST_SPIRIT_INCLUDE_SUPPORT_SAFE_BOOL
-#include <boost/spirit/include/safe_bool.hpp>
+#include <boost/spirit/home/support/safe_bool.hpp>
 #endif

Modified: trunk/boost/spirit/include/support_standard.hpp
==============================================================================
--- trunk/boost/spirit/include/support_standard.hpp (original)
+++ trunk/boost/spirit/include/support_standard.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_SUPPORT_STANDARD
 #define BOOST_SPIRIT_INCLUDE_SUPPORT_STANDARD
-#include <boost/spirit/include/standard.hpp>
+#include <boost/spirit/home/support/standard.hpp>
 #endif

Modified: trunk/boost/spirit/include/support_standard_wide.hpp
==============================================================================
--- trunk/boost/spirit/include/support_standard_wide.hpp (original)
+++ trunk/boost/spirit/include/support_standard_wide.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_SUPPORT_STANDARD_WIDE
 #define BOOST_SPIRIT_INCLUDE_SUPPORT_STANDARD_WIDE
-#include <boost/spirit/include/standard_wide.hpp>
+#include <boost/spirit/home/support/standard_wide.hpp>
 #endif

Modified: trunk/boost/spirit/include/support_unused.hpp
==============================================================================
--- trunk/boost/spirit/include/support_unused.hpp (original)
+++ trunk/boost/spirit/include/support_unused.hpp 2008-04-12 20:39:00 EDT (Sat, 12 Apr 2008)
@@ -8,5 +8,5 @@
 =============================================================================*/
 #ifndef BOOST_SPIRIT_INCLUDE_SUPPORT_UNUSED
 #define BOOST_SPIRIT_INCLUDE_SUPPORT_UNUSED
-#include <boost/spirit/include/unused.hpp>
+#include <boost/spirit/home/support/unused.hpp>
 #endif


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