|
|
Boost-Commit : |
From: hartmut.kaiser_at_[hidden]
Date: 2008-04-13 12:28:52
Author: hkaiser
Date: 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
New Revision: 44371
URL: http://svn.boost.org/trac/boost/changeset/44371
Log:
Fixed Spirit Classic namespace switching.
Added:
trunk/boost/spirit/home/classic/namespace.hpp (contents, props changed)
trunk/libs/spirit/classic/test/Jamfile
- copied, changed from r44366, /trunk/libs/spirit/classic/test/Jamfile.v2
Removed:
trunk/libs/spirit/classic/test/Jamfile.v2
Text files modified:
trunk/boost/spirit.hpp | 88 ++----------
trunk/boost/spirit/home/classic.hpp | 30 +++
trunk/boost/spirit/home/classic/actor/assign_actor.hpp | 5
trunk/boost/spirit/home/classic/actor/assign_key_actor.hpp | 5
trunk/boost/spirit/home/classic/actor/clear_actor.hpp | 4
trunk/boost/spirit/home/classic/actor/decrement_actor.hpp | 5
trunk/boost/spirit/home/classic/actor/erase_actor.hpp | 5
trunk/boost/spirit/home/classic/actor/increment_actor.hpp | 5
trunk/boost/spirit/home/classic/actor/insert_at_actor.hpp | 5
trunk/boost/spirit/home/classic/actor/insert_key_actor.hpp | 5
trunk/boost/spirit/home/classic/actor/push_back_actor.hpp | 5
trunk/boost/spirit/home/classic/actor/push_front_actor.hpp | 5
trunk/boost/spirit/home/classic/actor/ref_actor.hpp | 6
trunk/boost/spirit/home/classic/actor/ref_const_ref_actor.hpp | 6
trunk/boost/spirit/home/classic/actor/ref_const_ref_const_ref_a.hpp | 6
trunk/boost/spirit/home/classic/actor/ref_const_ref_value_actor.hpp | 6
trunk/boost/spirit/home/classic/actor/ref_value_actor.hpp | 6
trunk/boost/spirit/home/classic/actor/swap_actor.hpp | 5
trunk/boost/spirit/home/classic/actor/typeof.hpp | 37 +++--
trunk/boost/spirit/home/classic/attribute/closure.hpp | 7
trunk/boost/spirit/home/classic/attribute/closure_context.hpp | 8 +
trunk/boost/spirit/home/classic/attribute/closure_fwd.hpp | 7
trunk/boost/spirit/home/classic/attribute/parametric.hpp | 7
trunk/boost/spirit/home/classic/attribute/typeof.hpp | 32 ++--
trunk/boost/spirit/home/classic/core/composite/actions.hpp | 7
trunk/boost/spirit/home/classic/core/composite/alternative.hpp | 7
trunk/boost/spirit/home/classic/core/composite/composite.hpp | 7
trunk/boost/spirit/home/classic/core/composite/difference.hpp | 7
trunk/boost/spirit/home/classic/core/composite/directives.hpp | 7
trunk/boost/spirit/home/classic/core/composite/epsilon.hpp | 7
trunk/boost/spirit/home/classic/core/composite/exclusive_or.hpp | 7
trunk/boost/spirit/home/classic/core/composite/impl/alternative.ipp | 4
trunk/boost/spirit/home/classic/core/composite/impl/difference.ipp | 4
trunk/boost/spirit/home/classic/core/composite/impl/directives.ipp | 4
trunk/boost/spirit/home/classic/core/composite/impl/exclusive_or.ipp | 4
trunk/boost/spirit/home/classic/core/composite/impl/intersection.ipp | 4
trunk/boost/spirit/home/classic/core/composite/impl/kleene_star.ipp | 4
trunk/boost/spirit/home/classic/core/composite/impl/list.ipp | 4
trunk/boost/spirit/home/classic/core/composite/impl/optional.ipp | 4
trunk/boost/spirit/home/classic/core/composite/impl/positive.ipp | 4
trunk/boost/spirit/home/classic/core/composite/impl/sequence.ipp | 4
trunk/boost/spirit/home/classic/core/composite/impl/sequential_and.ipp | 4
trunk/boost/spirit/home/classic/core/composite/impl/sequential_or.ipp | 6
trunk/boost/spirit/home/classic/core/composite/intersection.hpp | 7
trunk/boost/spirit/home/classic/core/composite/kleene_star.hpp | 7
trunk/boost/spirit/home/classic/core/composite/list.hpp | 7
trunk/boost/spirit/home/classic/core/composite/no_actions.hpp | 3
trunk/boost/spirit/home/classic/core/composite/optional.hpp | 7
trunk/boost/spirit/home/classic/core/composite/positive.hpp | 7
trunk/boost/spirit/home/classic/core/composite/sequence.hpp | 7
trunk/boost/spirit/home/classic/core/composite/sequential_and.hpp | 7
trunk/boost/spirit/home/classic/core/composite/sequential_or.hpp | 7
trunk/boost/spirit/home/classic/core/impl/match.ipp | 8
trunk/boost/spirit/home/classic/core/impl/match_attr_traits.ipp | 12 +
trunk/boost/spirit/home/classic/core/impl/parser.ipp | 8
trunk/boost/spirit/home/classic/core/match.hpp | 11 +
trunk/boost/spirit/home/classic/core/nil.hpp | 11 +
trunk/boost/spirit/home/classic/core/non_terminal/grammar.hpp | 7
trunk/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp | 4
trunk/boost/spirit/home/classic/core/non_terminal/impl/object_with_id.ipp | 6
trunk/boost/spirit/home/classic/core/non_terminal/impl/rule.ipp | 4
trunk/boost/spirit/home/classic/core/non_terminal/impl/static.hpp | 11 +
trunk/boost/spirit/home/classic/core/non_terminal/impl/subrule.ipp | 8 +
trunk/boost/spirit/home/classic/core/non_terminal/parser_context.hpp | 4
trunk/boost/spirit/home/classic/core/non_terminal/parser_id.hpp | 7
trunk/boost/spirit/home/classic/core/non_terminal/rule.hpp | 7
trunk/boost/spirit/home/classic/core/non_terminal/subrule.hpp | 7
trunk/boost/spirit/home/classic/core/non_terminal/subrule_fwd.hpp | 7
trunk/boost/spirit/home/classic/core/parser.hpp | 11 +
trunk/boost/spirit/home/classic/core/primitives/impl/numerics.ipp | 4
trunk/boost/spirit/home/classic/core/primitives/impl/primitives.ipp | 8 +
trunk/boost/spirit/home/classic/core/primitives/numerics.hpp | 11 +
trunk/boost/spirit/home/classic/core/primitives/numerics_fwd.hpp | 12 +
trunk/boost/spirit/home/classic/core/primitives/primitives.hpp | 7
trunk/boost/spirit/home/classic/core/safe_bool.hpp | 10 +
trunk/boost/spirit/home/classic/core/scanner/impl/skipper.ipp | 4
trunk/boost/spirit/home/classic/core/scanner/scanner.hpp | 10 +
trunk/boost/spirit/home/classic/core/scanner/scanner_fwd.hpp | 11 +
trunk/boost/spirit/home/classic/core/scanner/skipper.hpp | 8 +
trunk/boost/spirit/home/classic/core/scanner/skipper_fwd.hpp | 7
trunk/boost/spirit/home/classic/core/typeof.hpp | 267 ++++++++++++++++++++-------------------
trunk/boost/spirit/home/classic/debug.hpp | 27 ++-
trunk/boost/spirit/home/classic/debug/debug_node.hpp | 7
trunk/boost/spirit/home/classic/debug/impl/parser_names.ipp | 4
trunk/boost/spirit/home/classic/debug/parser_names.hpp | 7
trunk/boost/spirit/home/classic/debug/typeof.hpp | 14 +
trunk/boost/spirit/home/classic/dynamic/for.hpp | 13 +
trunk/boost/spirit/home/classic/dynamic/if.hpp | 7
trunk/boost/spirit/home/classic/dynamic/impl/conditions.ipp | 4
trunk/boost/spirit/home/classic/dynamic/impl/select.ipp | 5
trunk/boost/spirit/home/classic/dynamic/impl/switch.ipp | 5
trunk/boost/spirit/home/classic/dynamic/lazy.hpp | 11 +
trunk/boost/spirit/home/classic/dynamic/rule_alias.hpp | 7
trunk/boost/spirit/home/classic/dynamic/select.hpp | 13 +
trunk/boost/spirit/home/classic/dynamic/stored_rule.hpp | 7
trunk/boost/spirit/home/classic/dynamic/stored_rule_fwd.hpp | 7
trunk/boost/spirit/home/classic/dynamic/switch.hpp | 7
trunk/boost/spirit/home/classic/dynamic/typeof.hpp | 35 ++--
trunk/boost/spirit/home/classic/dynamic/while.hpp | 7
trunk/boost/spirit/home/classic/error_handling/exceptions.hpp | 9 +
trunk/boost/spirit/home/classic/error_handling/exceptions_fwd.hpp | 7
trunk/boost/spirit/home/classic/error_handling/impl/exceptions.ipp | 12 +
trunk/boost/spirit/home/classic/error_handling/typeof.hpp | 12
trunk/boost/spirit/home/classic/iterator/file_iterator.hpp | 7
trunk/boost/spirit/home/classic/iterator/file_iterator_fwd.hpp | 8 +
trunk/boost/spirit/home/classic/iterator/fixed_size_queue.hpp | 7
trunk/boost/spirit/home/classic/iterator/impl/file_iterator.ipp | 4
trunk/boost/spirit/home/classic/iterator/impl/position_iterator.ipp | 8 +
trunk/boost/spirit/home/classic/iterator/multi_pass.hpp | 15 +
trunk/boost/spirit/home/classic/iterator/multi_pass_fwd.hpp | 8 +
trunk/boost/spirit/home/classic/iterator/position_iterator.hpp | 13 +
trunk/boost/spirit/home/classic/iterator/position_iterator_fwd.hpp | 7
trunk/boost/spirit/home/classic/iterator/typeof.hpp | 74 +++++-----
trunk/boost/spirit/home/classic/meta/as_parser.hpp | 7
trunk/boost/spirit/home/classic/meta/fundamental.hpp | 11 +
trunk/boost/spirit/home/classic/meta/impl/fundamental.ipp | 4
trunk/boost/spirit/home/classic/meta/impl/parser_traits.ipp | 4
trunk/boost/spirit/home/classic/meta/impl/refactoring.ipp | 4
trunk/boost/spirit/home/classic/meta/impl/traverse.ipp | 4
trunk/boost/spirit/home/classic/meta/parser_traits.hpp | 49 ++++---
trunk/boost/spirit/home/classic/meta/refactoring.hpp | 7
trunk/boost/spirit/home/classic/meta/traverse.hpp | 11 +
trunk/boost/spirit/home/classic/symbols/impl/symbols.ipp | 4
trunk/boost/spirit/home/classic/symbols/impl/tst.ipp | 4
trunk/boost/spirit/home/classic/symbols/symbols.hpp | 7
trunk/boost/spirit/home/classic/symbols/symbols_fwd.hpp | 8 +
trunk/boost/spirit/home/classic/symbols/typeof.hpp | 10
trunk/boost/spirit/home/classic/tree/ast.hpp | 6
trunk/boost/spirit/home/classic/tree/ast_fwd.hpp | 7
trunk/boost/spirit/home/classic/tree/common.hpp | 21 +-
trunk/boost/spirit/home/classic/tree/common_fwd.hpp | 7
trunk/boost/spirit/home/classic/tree/impl/parse_tree_utils.ipp | 4
trunk/boost/spirit/home/classic/tree/impl/tree_to_xml.ipp | 8
trunk/boost/spirit/home/classic/tree/parse_tree.hpp | 6
trunk/boost/spirit/home/classic/tree/parse_tree_fwd.hpp | 8 +
trunk/boost/spirit/home/classic/tree/parse_tree_utils.hpp | 2
trunk/boost/spirit/home/classic/tree/tree_to_xml.hpp | 8 +
trunk/boost/spirit/home/classic/tree/typeof.hpp | 84 ++++++------
trunk/boost/spirit/home/classic/utility/chset.hpp | 7
trunk/boost/spirit/home/classic/utility/chset_operators.hpp | 7
trunk/boost/spirit/home/classic/utility/confix.hpp | 7
trunk/boost/spirit/home/classic/utility/confix_fwd.hpp | 7
trunk/boost/spirit/home/classic/utility/distinct.hpp | 3
trunk/boost/spirit/home/classic/utility/distinct_fwd.hpp | 8 +
trunk/boost/spirit/home/classic/utility/escape_char.hpp | 7
trunk/boost/spirit/home/classic/utility/escape_char_fwd.hpp | 8 +
trunk/boost/spirit/home/classic/utility/flush_multi_pass.hpp | 11 +
trunk/boost/spirit/home/classic/utility/functor_parser.hpp | 7
trunk/boost/spirit/home/classic/utility/grammar_def.hpp | 7
trunk/boost/spirit/home/classic/utility/grammar_def_fwd.hpp | 7
trunk/boost/spirit/home/classic/utility/impl/chset.ipp | 4
trunk/boost/spirit/home/classic/utility/impl/chset/basic_chset.hpp | 7
trunk/boost/spirit/home/classic/utility/impl/chset/basic_chset.ipp | 5
trunk/boost/spirit/home/classic/utility/impl/chset/range_run.hpp | 16 +
trunk/boost/spirit/home/classic/utility/impl/chset/range_run.ipp | 4
trunk/boost/spirit/home/classic/utility/impl/chset_operators.ipp | 12 +
trunk/boost/spirit/home/classic/utility/impl/confix.ipp | 4
trunk/boost/spirit/home/classic/utility/impl/escape_char.ipp | 4
trunk/boost/spirit/home/classic/utility/impl/lists.ipp | 4
trunk/boost/spirit/home/classic/utility/impl/regex.ipp | 4
trunk/boost/spirit/home/classic/utility/lists.hpp | 7
trunk/boost/spirit/home/classic/utility/lists_fwd.hpp | 7
trunk/boost/spirit/home/classic/utility/loops.hpp | 7
trunk/boost/spirit/home/classic/utility/regex.hpp | 7
trunk/boost/spirit/home/classic/utility/rule_parser.hpp | 77 +++++++---
trunk/boost/spirit/home/classic/utility/scoped_lock.hpp | 9 +
trunk/boost/spirit/home/classic/utility/typeof.hpp | 83 ++++++-----
trunk/libs/spirit/classic/change_log.html | 30 ++++
trunk/libs/spirit/classic/example/fundamental/ast_calc.cpp | 2
trunk/libs/spirit/classic/example/fundamental/bind.cpp | 4
trunk/libs/spirit/classic/example/fundamental/boiler_plate.cpp | 2
trunk/libs/spirit/classic/example/fundamental/calc_debug.cpp | 2
trunk/libs/spirit/classic/example/fundamental/calc_plain.cpp | 2
trunk/libs/spirit/classic/example/fundamental/comments.cpp | 2
trunk/libs/spirit/classic/example/fundamental/complex_number.cpp | 2
trunk/libs/spirit/classic/example/fundamental/error_handling.cpp | 2
trunk/libs/spirit/classic/example/fundamental/error_reporting.cpp | 2
trunk/libs/spirit/classic/example/fundamental/file_parser.cpp | 2
trunk/libs/spirit/classic/example/fundamental/full_calc.cpp | 2
trunk/libs/spirit/classic/example/fundamental/functor_parser.cpp | 2
trunk/libs/spirit/classic/example/fundamental/list_parser.cpp | 2
trunk/libs/spirit/classic/example/fundamental/matching_tags.cpp | 4
trunk/libs/spirit/classic/example/fundamental/more_calculators/ast_calc2.cpp | 2
trunk/libs/spirit/classic/example/fundamental/more_calculators/calc_with_variables.cpp | 2
trunk/libs/spirit/classic/example/fundamental/more_calculators/phoenix_subrule_calc.cpp | 4
trunk/libs/spirit/classic/example/fundamental/more_calculators/primitive_calc.cpp | 2
trunk/libs/spirit/classic/example/fundamental/more_calculators/rpn_calc.cpp | 4
trunk/libs/spirit/classic/example/fundamental/more_calculators/vmachine_calc.cpp | 2
trunk/libs/spirit/classic/example/fundamental/number_list.cpp | 2
trunk/libs/spirit/classic/example/fundamental/parse_tree_calc1.cpp | 2
trunk/libs/spirit/classic/example/fundamental/phoenix_calc.cpp | 4
trunk/libs/spirit/classic/example/fundamental/position_iterator/position_iterator.cpp | 2
trunk/libs/spirit/classic/example/fundamental/refactoring.cpp | 2
trunk/libs/spirit/classic/example/fundamental/regular_expression.cpp | 2
trunk/libs/spirit/classic/example/fundamental/roman_numerals.cpp | 2
trunk/libs/spirit/classic/example/fundamental/stuff_vector.cpp | 2
trunk/libs/spirit/classic/example/fundamental/stuff_vector2.cpp | 2
trunk/libs/spirit/classic/example/fundamental/subrule_calc.cpp | 2
trunk/libs/spirit/classic/example/fundamental/sum.cpp | 2
trunk/libs/spirit/classic/example/fundamental/thousand_separated.cpp | 2
trunk/libs/spirit/classic/example/fundamental/tree_calc_grammar.hpp | 2
trunk/libs/spirit/classic/example/intermediate/ipv4.cpp | 2
trunk/libs/spirit/classic/example/intermediate/ipv4_opt.cpp | 2
trunk/libs/spirit/classic/example/intermediate/parameters.cpp | 8
trunk/libs/spirit/classic/example/intermediate/regex_convert.cpp | 2
trunk/libs/spirit/classic/example/intermediate/simple_xml/xml_g.hpp | 2
trunk/libs/spirit/classic/example/techniques/dynamic_rule.cpp | 2
trunk/libs/spirit/classic/example/techniques/multiple_scanners.cpp | 2
trunk/libs/spirit/classic/example/techniques/nabialek.cpp | 2
trunk/libs/spirit/classic/example/techniques/no_rules/no_rule1.cpp | 2
trunk/libs/spirit/classic/example/techniques/no_rules/no_rule2.cpp | 2
trunk/libs/spirit/classic/example/techniques/no_rules/no_rule3.cpp | 2
trunk/libs/spirit/classic/example/techniques/no_rules_with_typeof/opaque_rule_parser.cpp | 4
trunk/libs/spirit/classic/example/techniques/no_rules_with_typeof/rule_parser_1_1.cpp | 4
trunk/libs/spirit/classic/example/techniques/no_rules_with_typeof/rule_parser_1_2.cpp | 4
trunk/libs/spirit/classic/example/techniques/no_rules_with_typeof/rule_parser_2_1.cpp | 2
trunk/libs/spirit/classic/example/techniques/no_rules_with_typeof/rule_parser_2_2.cpp | 2
trunk/libs/spirit/classic/example/techniques/right_recursion.cpp | 2
trunk/libs/spirit/classic/example/techniques/typeof.cpp | 2
trunk/libs/spirit/classic/test/Jamfile | 32 ++--
trunk/libs/spirit/classic/test/actor/assign_key_test.cpp | 4
trunk/libs/spirit/classic/test/actor/assign_test.cpp | 4
trunk/libs/spirit/classic/test/actor/clear_test.cpp | 2
trunk/libs/spirit/classic/test/actor/decrement_test.cpp | 2
trunk/libs/spirit/classic/test/actor/erase_at_test.cpp | 2
trunk/libs/spirit/classic/test/actor/increment_test.cpp | 2
trunk/libs/spirit/classic/test/actor/insert_at_test.cpp | 6
trunk/libs/spirit/classic/test/actor/insert_key_test.cpp | 4
trunk/libs/spirit/classic/test/actor/push_back_test.cpp | 2
trunk/libs/spirit/classic/test/actor/push_front_test.cpp | 2
trunk/libs/spirit/classic/test/actor/swap_test.cpp | 2
trunk/libs/spirit/classic/test/ast_calc_tests.cpp | 4
trunk/libs/spirit/classic/test/bug_000008.cpp | 12
trunk/libs/spirit/classic/test/bug_fixes.cpp | 4
trunk/libs/spirit/classic/test/char_strings_test.cpp | 6
trunk/libs/spirit/classic/test/char_strings_test_fail.cpp | 4
trunk/libs/spirit/classic/test/chset_tests.cpp | 2
trunk/libs/spirit/classic/test/closure_tests.cpp | 14 +-
trunk/libs/spirit/classic/test/confix_tests.cpp | 2
trunk/libs/spirit/classic/test/custom_real_parser.cpp | 2
trunk/libs/spirit/classic/test/directives_tests.cpp | 2
trunk/libs/spirit/classic/test/distinct_tests.cpp | 2
trunk/libs/spirit/classic/test/epsilon_tests.cpp | 32 ++--
trunk/libs/spirit/classic/test/escape_char_parser_tests.cpp | 2
trunk/libs/spirit/classic/test/exception_tests.cpp | 2
trunk/libs/spirit/classic/test/file_iterator_tests.cpp | 2
trunk/libs/spirit/classic/test/fixed_size_queue_fail_tests.cpp | 2
trunk/libs/spirit/classic/test/fixed_size_queue_tests.cpp | 2
trunk/libs/spirit/classic/test/for_p_as_parser_tests.cpp | 8
trunk/libs/spirit/classic/test/for_tests.cpp | 10
trunk/libs/spirit/classic/test/fundamental_tests.cpp | 2
trunk/libs/spirit/classic/test/grammar_def_test.cpp | 32 ++--
trunk/libs/spirit/classic/test/grammar_mt_tests.cpp | 14 +-
trunk/libs/spirit/classic/test/grammar_multi_instance_tst.cpp | 2
trunk/libs/spirit/classic/test/grammar_tests.cpp | 2
trunk/libs/spirit/classic/test/group_match_bug.cpp | 2
trunk/libs/spirit/classic/test/if_p_as_parser_tests.cpp | 22 +-
trunk/libs/spirit/classic/test/if_p_int_as_condition_test.cpp | 2
trunk/libs/spirit/classic/test/if_tests.cpp | 46 +++---
trunk/libs/spirit/classic/test/lazy_tests.cpp | 2
trunk/libs/spirit/classic/test/loops_tests.cpp | 2
trunk/libs/spirit/classic/test/match_tests.cpp | 2
trunk/libs/spirit/classic/test/mix_and_match_trees.cpp | 2
trunk/libs/spirit/classic/test/multi_pass_compile_tests.cpp | 2
trunk/libs/spirit/classic/test/multi_pass_tests.cpp | 6
trunk/libs/spirit/classic/test/negated_eps_p_test.cpp | 2
trunk/libs/spirit/classic/test/numerics_tests.cpp | 2
trunk/libs/spirit/classic/test/operators_tests.cpp | 2
trunk/libs/spirit/classic/test/owi_mt_tests.cpp | 2
trunk/libs/spirit/classic/test/owi_st_tests.cpp | 2
trunk/libs/spirit/classic/test/parametric_tests.cpp | 2
trunk/libs/spirit/classic/test/parser_context_test.cpp | 2
trunk/libs/spirit/classic/test/parser_traits_tests.cpp | 2
trunk/libs/spirit/classic/test/position_iterator_tests.cpp | 2
trunk/libs/spirit/classic/test/post_skips.cpp | 2
trunk/libs/spirit/classic/test/primitives_tests.cpp | 2
trunk/libs/spirit/classic/test/repeat_ast_tests.cpp | 2
trunk/libs/spirit/classic/test/rule_tests.cpp | 2
trunk/libs/spirit/classic/test/scanner_tests.cpp | 2
trunk/libs/spirit/classic/test/scanner_value_type_tests.cpp | 2
trunk/libs/spirit/classic/test/scoped_lock_tests.cpp | 8
trunk/libs/spirit/classic/test/select_p_with_rule.cpp | 2
trunk/libs/spirit/classic/test/sf_bug_720917.cpp | 2
trunk/libs/spirit/classic/test/shortest_alternative_tests.cpp | 2
trunk/libs/spirit/classic/test/subrule_tests.cpp | 2
trunk/libs/spirit/classic/test/switch_problem.cpp | 2
trunk/libs/spirit/classic/test/switch_tests_eps_default.cpp | 4
trunk/libs/spirit/classic/test/switch_tests_general_def.cpp | 4
trunk/libs/spirit/classic/test/switch_tests_single.cpp | 4
trunk/libs/spirit/classic/test/switch_tests_wo_default.cpp | 4
trunk/libs/spirit/classic/test/symbols_add_null.cpp | 4
trunk/libs/spirit/classic/test/symbols_find_null.cpp | 4
trunk/libs/spirit/classic/test/symbols_tests.cpp | 2
trunk/libs/spirit/classic/test/traverse_tests.cpp | 5
trunk/libs/spirit/classic/test/tree_tests.cpp | 2
trunk/libs/spirit/classic/test/tree_to_xml.cpp | 2
trunk/libs/spirit/classic/test/while_p_as_parser_tests.cpp | 22 +-
trunk/libs/spirit/classic/test/while_tests.cpp | 14 +-
298 files changed, 1695 insertions(+), 866 deletions(-)
Modified: trunk/boost/spirit.hpp
==============================================================================
--- trunk/boost/spirit.hpp (original)
+++ trunk/boost/spirit.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -1,75 +1,23 @@
/*=============================================================================
- Copyright (c) 1998-2003 Joel de Guzman
- Copyright (c) 2001-2003 Daniel Nuffer
- Copyright (c) 2001-2003 Hartmut Kaiser
- Copyright (c) 2002-2003 Martin Wille
- Copyright (c) 2002 Juan Carlos Arevalo-Baeza
- Copyright (c) 2002 Raghavendra Satish
- Copyright (c) 2002 Jeff Westfahl
- Copyright (c) 2001 Bruce Florman
- Copyright (c) 2003 Giovanni Bajo
- Copyright (c) 2003 Vaclav Vesely
- Copyright (c) 2003 Jonathan de Halleux
- http://spirit.sourceforge.net/
- http://www.boost.org/libs/spirit
+ Copyright (c) 2001-2008 Joel de Guzman
+ Copyright (c) 2001-2008 Hartmut Kaiser
+ http://spirit.sourceforge.net/
- Use, modification and distribution is subject to 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)
-
- See http://www.boost.org/libs/spirit for documentation
+ 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)
=============================================================================*/
-#if !defined(SPIRIT_HPP)
-#define SPIRIT_HPP
-
-///////////////////////////////////////////////////////////////////////////////
-//
-// If BOOST_SPIRIT_DEBUG is defined, the following header includes the
-// Spirit.Debug layer, otherwise the non-debug Spirit.Core is included.
-//
-///////////////////////////////////////////////////////////////////////////////
-#include <boost/spirit/core.hpp>
-
-///////////////////////////////////////////////////////////////////////////////
-//
-// Spirit.Meta
-//
-///////////////////////////////////////////////////////////////////////////////
-#include <boost/spirit/meta.hpp>
-
-///////////////////////////////////////////////////////////////////////////////
-//
-// Spirit.ErrorHandling
-//
-///////////////////////////////////////////////////////////////////////////////
-#include <boost/spirit/error_handling.hpp>
-
-///////////////////////////////////////////////////////////////////////////////
-//
-// Spirit.Iterators
-//
-///////////////////////////////////////////////////////////////////////////////
-#include <boost/spirit/iterator.hpp>
-
-///////////////////////////////////////////////////////////////////////////////
-//
-// Spirit.Symbols
-//
-///////////////////////////////////////////////////////////////////////////////
-#include <boost/spirit/symbols.hpp>
-
-///////////////////////////////////////////////////////////////////////////////
-//
-// Spirit.Utilities
-//
-///////////////////////////////////////////////////////////////////////////////
-#include <boost/spirit/utility.hpp>
+#ifndef BOOST_SPIRIT_DEPRECATED_INCLUDE_SPIRIT
+#define BOOST_SPIRIT_DEPRECATED_INCLUDE_SPIRIT
-///////////////////////////////////////////////////////////////////////////////
-//
-// Spirit.Attributes
-//
-///////////////////////////////////////////////////////////////////////////////
-#include <boost/spirit/attribute.hpp>
+#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__DMC__)
+# pragma message ("Warning: This header is deprecated. Please use: boost/spirit/include/classic_spirit.hpp")
+#elif defined(__GNUC__) || defined(__HP_aCC) || defined(__SUNPRO_CC) || defined(__IBMCPP__)
+# warning "This header is deprecated. Please use: boost/spirit/include/classic_spirit.hpp"
+#endif
+
+#if !defined(BOOST_SPIRIT_USE_OLD_NAMESPACE)
+#define BOOST_SPIRIT_USE_OLD_NAMESPACE
+#endif
+#include <boost/spirit/include/classic_spirit.hpp>
-#endif // !defined(SPIRIT_HPP)
+#endif
Modified: trunk/boost/spirit/home/classic.hpp
==============================================================================
--- trunk/boost/spirit/home/classic.hpp (original)
+++ trunk/boost/spirit/home/classic.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -1,10 +1,32 @@
/*=============================================================================
- Copyright (c) 2001-2008 Joel de Guzman
+ Copyright (c) 1998-2008 Joel de Guzman
+ Copyright (c) 2001-2008 Hartmut Kaiser
+ Copyright (c) 2001-2003 Daniel Nuffer
+ Copyright (c) 2002-2003 Martin Wille
+ Copyright (c) 2002 Juan Carlos Arevalo-Baeza
+ Copyright (c) 2002 Raghavendra Satish
+ Copyright (c) 2002 Jeff Westfahl
+ Copyright (c) 2001 Bruce Florman
+ Copyright (c) 2003 Giovanni Bajo
+ Copyright (c) 2003 Vaclav Vesely
+ Copyright (c) 2003 Jonathan de Halleux
+ http://spirit.sourceforge.net/
+ http://www.boost.org/libs/spirit
- 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)
-==============================================================================*/
+ 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)
+
+ See http://www.boost.org/libs/spirit for documentation
+=============================================================================*/
#if !defined(BOOST_SPIRIT_CLASSIC_APRIL_11_2008_0849AM)
#define BOOST_SPIRIT_CLASSIC_APRIL_11_2008_0849AM
+#include <boost/spirit/home/classic/core.hpp>
+#include <boost/spirit/home/classic/meta.hpp>
+#include <boost/spirit/home/classic/error_handling.hpp>
+#include <boost/spirit/home/classic/iterator.hpp>
+#include <boost/spirit/home/classic/symbols.hpp>
+#include <boost/spirit/home/classic/utility.hpp>
+#include <boost/spirit/home/classic/attribute.hpp>
+
#endif
Modified: trunk/boost/spirit/home/classic/actor/assign_actor.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/actor/assign_actor.hpp (original)
+++ trunk/boost/spirit/home/classic/actor/assign_actor.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -8,11 +8,14 @@
#ifndef BOOST_SPIRIT_ACTOR_ASSIGN_ACTOR_HPP
#define BOOST_SPIRIT_ACTOR_ASSIGN_ACTOR_HPP
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/actor/ref_value_actor.hpp>
#include <boost/spirit/home/classic/actor/ref_const_ref_actor.hpp>
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////
// Summary:
// A semantic action policy that applies the assignement operator.
@@ -90,6 +93,8 @@
return ref_const_ref_actor<T,ValueT,assign_action>(ref_,value_);
}
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
}}
#endif
Modified: trunk/boost/spirit/home/classic/actor/assign_key_actor.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/actor/assign_key_actor.hpp (original)
+++ trunk/boost/spirit/home/classic/actor/assign_key_actor.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -8,11 +8,14 @@
#ifndef BOOST_SPIRIT_ACTOR_ASSIGN_KEY_ACTOR_HPP
#define BOOST_SPIRIT_ACTOR_ASSIGN_KEY_ACTOR_HPP
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/actor/ref_const_ref_value_actor.hpp>
#include <boost/spirit/home/classic/actor/ref_const_ref_const_ref_a.hpp>
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
struct assign_key_action
{
template<
@@ -86,6 +89,8 @@
);
}
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
}}
#endif
Modified: trunk/boost/spirit/home/classic/actor/clear_actor.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/actor/clear_actor.hpp (original)
+++ trunk/boost/spirit/home/classic/actor/clear_actor.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -8,10 +8,13 @@
#ifndef BOOST_SPIRIT_ACTOR_CLEAR_ACTOR_HPP
#define BOOST_SPIRIT_ACTOR_CLEAR_ACTOR_HPP
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/actor/ref_actor.hpp>
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////
// Summary:
// A semantic action policy that calls clear method.
@@ -50,6 +53,7 @@
return ref_actor<T,clear_action>(ref_);
}
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
}}
Modified: trunk/boost/spirit/home/classic/actor/decrement_actor.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/actor/decrement_actor.hpp (original)
+++ trunk/boost/spirit/home/classic/actor/decrement_actor.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -8,10 +8,13 @@
#ifndef BOOST_SPIRIT_ACTOR_DECREMENT_ACTOR_HPP
#define BOOST_SPIRIT_ACTOR_DECREMENT_ACTOR_HPP
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/actor/ref_actor.hpp>
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////
// Summary:
// A semantic action policy that calls the -- operator on a reference.
@@ -50,6 +53,8 @@
return ref_actor<T,decrement_action>(ref_);
}
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
}}
#endif
Modified: trunk/boost/spirit/home/classic/actor/erase_actor.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/actor/erase_actor.hpp (original)
+++ trunk/boost/spirit/home/classic/actor/erase_actor.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -8,11 +8,14 @@
#ifndef BOOST_SPIRIT_ACTOR_ERASE_ACTOR_HPP
#define BOOST_SPIRIT_ACTOR_ERASE_ACTOR_HPP
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/actor/ref_value_actor.hpp>
#include <boost/spirit/home/classic/actor/ref_const_ref_actor.hpp>
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////
// Summary:
// A semantic action policy that calss the erase method.
@@ -79,6 +82,8 @@
return ref_const_ref_actor<T,KeyT,erase_action>(ref_,key_);
}
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
}}
#endif
Modified: trunk/boost/spirit/home/classic/actor/increment_actor.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/actor/increment_actor.hpp (original)
+++ trunk/boost/spirit/home/classic/actor/increment_actor.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -8,10 +8,13 @@
#ifndef BOOST_SPIRIT_ACTOR_INCREMENT_ACTOR_HPP
#define BOOST_SPIRIT_ACTOR_INCREMENT_ACTOR_HPP
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/actor/ref_actor.hpp>
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////
// Summary:
// A semantic action policy that calls the ++ operator on a reference.
@@ -50,6 +53,8 @@
return ref_actor<T,increment_action>(ref_);
}
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
}}
#endif
Modified: trunk/boost/spirit/home/classic/actor/insert_at_actor.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/actor/insert_at_actor.hpp (original)
+++ trunk/boost/spirit/home/classic/actor/insert_at_actor.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -8,11 +8,14 @@
#ifndef BOOST_SPIRIT_ACTOR_INSERT_AT_ACTOR_HPP
#define BOOST_SPIRIT_ACTOR_INSERT_AT_ACTOR_HPP
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/actor/ref_const_ref_value_actor.hpp>
#include <boost/spirit/home/classic/actor/ref_const_ref_const_ref_a.hpp>
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////
// Summary:
// A semantic action policy that insert data into an associative
@@ -111,6 +114,8 @@
>(ref_,key_,value_);
}
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
}}
#endif
Modified: trunk/boost/spirit/home/classic/actor/insert_key_actor.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/actor/insert_key_actor.hpp (original)
+++ trunk/boost/spirit/home/classic/actor/insert_key_actor.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -8,10 +8,13 @@
#ifndef BOOST_SPIRIT_ACTOR_INSERT_KEY_ACTOR_HPP
#define BOOST_SPIRIT_ACTOR_INSERT_KEY_ACTOR_HPP
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/actor/ref_const_ref_value_actor.hpp>
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////
// Summary:
// A semantic action policy that insert data into an associative
@@ -87,6 +90,8 @@
>(ref_,value_);
}
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
}}
#endif
Modified: trunk/boost/spirit/home/classic/actor/push_back_actor.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/actor/push_back_actor.hpp (original)
+++ trunk/boost/spirit/home/classic/actor/push_back_actor.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -8,11 +8,14 @@
#ifndef BOOST_SPIRIT_ACTOR_PUSH_BACK_ACTOR_HPP
#define BOOST_SPIRIT_ACTOR_PUSH_BACK_ACTOR_HPP
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/actor/ref_value_actor.hpp>
#include <boost/spirit/home/classic/actor/ref_const_ref_actor.hpp>
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////
// Summary:
//
@@ -91,6 +94,8 @@
return ref_const_ref_actor<T,ValueT,push_back_action>(ref_,value_);
}
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
}}
#endif
Modified: trunk/boost/spirit/home/classic/actor/push_front_actor.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/actor/push_front_actor.hpp (original)
+++ trunk/boost/spirit/home/classic/actor/push_front_actor.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -8,11 +8,14 @@
#ifndef BOOST_SPIRIT_ACTOR_PUSH_FRONT_ACTOR_HPP
#define BOOST_SPIRIT_ACTOR_PUSH_FRONT_ACTOR_HPP
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/actor/ref_value_actor.hpp>
#include <boost/spirit/home/classic/actor/ref_const_ref_actor.hpp>
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////
// Summary:
//
@@ -81,6 +84,8 @@
return ref_const_ref_actor<T,ValueT,push_front_action>(ref_,value_);
}
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
}}
#endif
Modified: trunk/boost/spirit/home/classic/actor/ref_actor.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/actor/ref_actor.hpp (original)
+++ trunk/boost/spirit/home/classic/actor/ref_actor.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -8,8 +8,12 @@
#ifndef BOOST_SPIRIT_ACTOR_REF_ACTOR_HPP
#define BOOST_SPIRIT_ACTOR_REF_ACTOR_HPP
+#include <boost/spirit/home/classic/namespace.hpp>
+
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////
// Summary:
// A semantic action policy holder. This holder stores a reference to ref,
@@ -59,6 +63,8 @@
}
};
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
}}
#endif
Modified: trunk/boost/spirit/home/classic/actor/ref_const_ref_actor.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/actor/ref_const_ref_actor.hpp (original)
+++ trunk/boost/spirit/home/classic/actor/ref_const_ref_actor.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -8,8 +8,12 @@
#ifndef BOOST_SPIRIT_ACTOR_REF_CONST_REF_ACTOR_HPP
#define BOOST_SPIRIT_ACTOR_REF_CONST_REF_ACTOR_HPP
+#include <boost/spirit/home/classic/namespace.hpp>
+
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////
// Summary:
// A semantic action policy holder. This holder stores a reference to ref
@@ -67,6 +71,8 @@
}
};
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
}}
#endif
Modified: trunk/boost/spirit/home/classic/actor/ref_const_ref_const_ref_a.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/actor/ref_const_ref_const_ref_a.hpp (original)
+++ trunk/boost/spirit/home/classic/actor/ref_const_ref_const_ref_a.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -8,8 +8,12 @@
#ifndef BOOST_SPIRIT_ACTOR_REF_CONST_REF_CONST_REF_ACTOR_HPP
#define BOOST_SPIRIT_ACTOR_REF_CONST_REF_CONST_REF_ACTOR_HPP
+#include <boost/spirit/home/classic/namespace.hpp>
+
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////
// Summary:
// A semantic action policy holder. This holder stores a reference to ref
@@ -76,6 +80,8 @@
}
};
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
}}
#endif
Modified: trunk/boost/spirit/home/classic/actor/ref_const_ref_value_actor.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/actor/ref_const_ref_value_actor.hpp (original)
+++ trunk/boost/spirit/home/classic/actor/ref_const_ref_value_actor.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -8,8 +8,12 @@
#ifndef BOOST_SPIRIT_ACTOR_REF_CONST_REF_VALUE_ACTOR_HPP
#define BOOST_SPIRIT_ACTOR_REF_CONST_REF_VALUE_ACTOR_HPP
+#include <boost/spirit/home/classic/namespace.hpp>
+
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////
// Summary:
// A semantic action policy holder. This holder stores a reference to ref
@@ -67,6 +71,8 @@
}
};
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
}}
#endif
Modified: trunk/boost/spirit/home/classic/actor/ref_value_actor.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/actor/ref_value_actor.hpp (original)
+++ trunk/boost/spirit/home/classic/actor/ref_value_actor.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -8,8 +8,12 @@
#ifndef BOOST_SPIRIT_ACTOR_REF_VALUE_ACTOR_HPP
#define BOOST_SPIRIT_ACTOR_REF_VALUE_ACTOR_HPP
+#include <boost/spirit/home/classic/namespace.hpp>
+
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////
// Summary:
// A semantic action policy holder. This holder stores a reference to ref.
@@ -59,6 +63,8 @@
}
};
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
}}
#endif
Modified: trunk/boost/spirit/home/classic/actor/swap_actor.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/actor/swap_actor.hpp (original)
+++ trunk/boost/spirit/home/classic/actor/swap_actor.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -8,10 +8,13 @@
#ifndef BOOST_SPIRIT_ACTOR_SWAP_ACTOR_HPP
#define BOOST_SPIRIT_ACTOR_SWAP_ACTOR_HPP
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/actor/ref_value_actor.hpp>
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////
// Summary:
// A semantic action policy that swaps values.
@@ -75,6 +78,8 @@
return swap_actor<T>(ref_,swap_ref_);
}
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
}}
#endif
Modified: trunk/boost/spirit/home/classic/actor/typeof.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/actor/typeof.hpp (original)
+++ trunk/boost/spirit/home/classic/actor/typeof.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -8,10 +8,13 @@
#if !defined(BOOST_SPIRIT_ACTOR_TYPEOF_HPP)
#define BOOST_SPIRIT_ACTOR_TYPEOF_HPP
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/typeof/typeof.hpp>
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
template<typename T, typename ActionT> class ref_actor;
template<typename T, typename ActionT> class ref_value_actor;
@@ -38,32 +41,34 @@
template<typename T> class swap_actor;
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#include BOOST_TYPEOF_INCREMENT_REGISTRATION_GROUP()
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::ref_actor,2)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::ref_actor,2)
#if !defined(BOOST_SPIRIT_CORE_TYPEOF_HPP)
// this part also lives in the core master header and is deprecated there...
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::ref_value_actor,2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::ref_const_ref_actor,3)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::assign_action)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::push_back_action)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::ref_value_actor,2)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::ref_const_ref_actor,3)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::assign_action)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::push_back_action)
#endif
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::ref_const_ref_value_actor,3)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::ref_const_ref_const_ref_actor,4)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::ref_const_ref_value_actor,3)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::ref_const_ref_const_ref_actor,4)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::clear_action)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::increment_action)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::decrement_action)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::push_front_action)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::insert_key_action)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::insert_at_action)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::assign_key_action)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::clear_action)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::increment_action)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::decrement_action)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::push_front_action)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::insert_key_action)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::insert_at_action)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::assign_key_action)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::swap_actor,1)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::swap_actor,1)
#endif
Modified: trunk/boost/spirit/home/classic/attribute/closure.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/attribute/closure.hpp (original)
+++ trunk/boost/spirit/home/classic/attribute/closure.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -10,6 +10,7 @@
#define BOOST_SPIRIT_CLOSURE_HPP
///////////////////////////////////////////////////////////////////////////////
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/core/parser.hpp>
#include <boost/spirit/home/classic/core/composite/composite.hpp>
#include <boost/spirit/home/classic/core/non_terminal/parser_context.hpp>
@@ -52,6 +53,8 @@
///////////////////////////////////////////////////////////////////////////////
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////
//
// closure_context class
@@ -1073,6 +1076,8 @@
return result_t(container_begin_t(a), container_end_t(a));
}
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif
Modified: trunk/boost/spirit/home/classic/attribute/closure_context.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/attribute/closure_context.hpp (original)
+++ trunk/boost/spirit/home/classic/attribute/closure_context.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -9,9 +9,13 @@
#if !defined(BOOST_SPIRIT_CLOSURE_CONTEXT_HPP)
#define BOOST_SPIRIT_CLOSURE_CONTEXT_HPP
+#include <boost/spirit/home/classic/namespace.hpp>
+
///////////////////////////////////////////////////////////////////////////////
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
#if !defined(BOOST_SPIRIT_CLOSURE_CONTEXT_LINKER_DEFINED)
#define BOOST_SPIRIT_CLOSURE_CONTEXT_LINKER_DEFINED
@@ -45,6 +49,8 @@
#endif // !defined(BOOST_SPIRIT_CLOSURE_CONTEXT_LINKER_DEFINED)
///////////////////////////////////////////////////////////////////////////////
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif // BOOST_SPIRIT_CLOSURE_CONTEXT_HPP
Modified: trunk/boost/spirit/home/classic/attribute/closure_fwd.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/attribute/closure_fwd.hpp (original)
+++ trunk/boost/spirit/home/classic/attribute/closure_fwd.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -8,6 +8,7 @@
#if !defined(BOOST_SPIRIT_CLOSURE_FWD_HPP)
#define BOOST_SPIRIT_CLOSURE_FWD_HPP
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/phoenix/tuples.hpp>
#if !defined(BOOST_SPIRIT_CLOSURE_LIMIT)
@@ -16,6 +17,8 @@
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
template<typename ClosureT>
class closure_context;
@@ -58,7 +61,9 @@
>
struct closure;
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif
Modified: trunk/boost/spirit/home/classic/attribute/parametric.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/attribute/parametric.hpp (original)
+++ trunk/boost/spirit/home/classic/attribute/parametric.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -9,12 +9,15 @@
#define BOOST_SPIRIT_PARAMETRIC_HPP
///////////////////////////////////////////////////////////////////////////////
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/core/parser.hpp>
#include <boost/spirit/home/classic/core/composite/composite.hpp>
#include <boost/spirit/home/classic/core/primitives/primitives.hpp>
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////
//
// f_chlit class [ functional version of chlit ]
@@ -134,6 +137,8 @@
f_str_p(IterGenAT first, IterGenBT last)
{ return f_strlit<IterGenAT, IterGenBT>(first, last); }
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif
Modified: trunk/boost/spirit/home/classic/attribute/typeof.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/attribute/typeof.hpp (original)
+++ trunk/boost/spirit/home/classic/attribute/typeof.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -10,19 +10,23 @@
#include <boost/typeof/typeof.hpp>
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/core/typeof.hpp>
-
#include <boost/spirit/home/classic/attribute/closure_fwd.hpp>
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
// parametric.hpp
template<typename ChGenT> struct f_chlit;
template<typename ChGenAT, typename ChGenBT> struct f_range;
template<typename IterGenAT, typename IterGenBT> class f_chseq;
template<typename IterGenAT, typename IterGenBT> class f_strlit;
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#include BOOST_TYPEOF_INCREMENT_REGISTRATION_GROUP()
@@ -30,31 +34,31 @@
// parametric.hpp
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::f_chlit,1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::f_range,2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::f_chseq,2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::f_strlit,2)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::f_chlit,1)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::f_range,2)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::f_chseq,2)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::f_strlit,2)
// closure.hpp (has forward header)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::closure,BOOST_SPIRIT_CLOSURE_LIMIT)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::closure_context,1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::init_closure_context,1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::init_closure_parser,2)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::closure,BOOST_SPIRIT_CLOSURE_LIMIT)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::closure_context,1)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::init_closure_context,1)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::init_closure_parser,2)
#if BOOST_SPIRIT_CLOSURE_LIMIT > 12
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::closure,12)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::closure,12)
#endif
#if BOOST_SPIRIT_CLOSURE_LIMIT > 9
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::closure, 9)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::closure, 9)
#endif
#if BOOST_SPIRIT_CLOSURE_LIMIT > 6
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::closure, 6)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::closure, 6)
#endif
#if BOOST_SPIRIT_CLOSURE_LIMIT > 3
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::closure, 3)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::closure, 3)
#endif
Modified: trunk/boost/spirit/home/classic/core/composite/actions.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/core/composite/actions.hpp (original)
+++ trunk/boost/spirit/home/classic/core/composite/actions.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -8,11 +8,14 @@
#ifndef BOOST_SPIRIT_ACTIONS_HPP
#define BOOST_SPIRIT_ACTIONS_HPP
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/core/parser.hpp>
#include <boost/spirit/home/classic/core/composite/composite.hpp>
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////
//
// action class
@@ -117,6 +120,8 @@
ActionT actor;
};
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif
Modified: trunk/boost/spirit/home/classic/core/composite/alternative.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/core/composite/alternative.hpp (original)
+++ trunk/boost/spirit/home/classic/core/composite/alternative.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -10,6 +10,7 @@
#if !defined(BOOST_SPIRIT_ALTERNATIVE_HPP)
#define BOOST_SPIRIT_ALTERNATIVE_HPP
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/core/parser.hpp>
#include <boost/spirit/home/classic/core/primitives/primitives.hpp>
#include <boost/spirit/home/classic/core/composite/composite.hpp>
@@ -17,6 +18,8 @@
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////
//
// alternative class
@@ -126,7 +129,9 @@
alternative<strlit<wchar_t const*>, B>
operator|(wchar_t const* a, parser<B> const& b);
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif
Modified: trunk/boost/spirit/home/classic/core/composite/composite.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/core/composite/composite.hpp (original)
+++ trunk/boost/spirit/home/classic/core/composite/composite.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -10,10 +10,13 @@
///////////////////////////////////////////////////////////////////////////////
#include <boost/compressed_pair.hpp>
+#include <boost/spirit/home/classic/namespace.hpp>
///////////////////////////////////////////////////////////////////////////////
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////
//
// unary class.
@@ -132,6 +135,8 @@
boost::compressed_pair<left_embed_t, right_embed_t> subj;
};
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif
Modified: trunk/boost/spirit/home/classic/core/composite/difference.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/core/composite/difference.hpp (original)
+++ trunk/boost/spirit/home/classic/core/composite/difference.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -10,6 +10,7 @@
#if !defined(BOOST_SPIRIT_DIFFERENCE_HPP)
#define BOOST_SPIRIT_DIFFERENCE_HPP
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/core/parser.hpp>
#include <boost/spirit/home/classic/core/primitives/primitives.hpp>
#include <boost/spirit/home/classic/core/composite/composite.hpp>
@@ -17,6 +18,8 @@
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////
//
// difference: a - b; Matches a but not b
@@ -129,7 +132,9 @@
difference<strlit<wchar_t const*>, B>
operator-(wchar_t const* a, parser<B> const& b);
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif
Modified: trunk/boost/spirit/home/classic/core/composite/directives.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/core/composite/directives.hpp (original)
+++ trunk/boost/spirit/home/classic/core/composite/directives.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -12,6 +12,7 @@
///////////////////////////////////////////////////////////////////////////////
#include <algorithm>
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/core/parser.hpp>
#include <boost/spirit/home/classic/core/scanner/skipper.hpp>
#include <boost/spirit/home/classic/core/primitives/primitives.hpp>
@@ -20,6 +21,8 @@
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////
//
// contiguous class
@@ -596,7 +599,9 @@
limit_d(BoundsT const& min_, BoundsT const& max_)
{ return bounded_gen<BoundsT>(min_, max_); }
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif
Modified: trunk/boost/spirit/home/classic/core/composite/epsilon.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/core/composite/epsilon.hpp (original)
+++ trunk/boost/spirit/home/classic/core/composite/epsilon.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -10,6 +10,7 @@
#define BOOST_SPIRIT_EPSILON_HPP
////////////////////////////////////////////////////////////////////////////////
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/core/parser.hpp>
#include <boost/spirit/home/classic/meta/parser_traits.hpp>
#include <boost/spirit/home/classic/core/composite/composite.hpp>
@@ -18,6 +19,8 @@
////////////////////////////////////////////////////////////////////////////////
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////////
//
// condition_parser class
@@ -266,6 +269,8 @@
epsilon_parser const eps_p = epsilon_parser();
///////////////////////////////////////////////////////////////////////////////
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif
Modified: trunk/boost/spirit/home/classic/core/composite/exclusive_or.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/core/composite/exclusive_or.hpp (original)
+++ trunk/boost/spirit/home/classic/core/composite/exclusive_or.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -10,6 +10,7 @@
#if !defined(BOOST_SPIRIT_EXCLUSIVE_OR_HPP)
#define BOOST_SPIRIT_EXCLUSIVE_OR_HPP
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/core/parser.hpp>
#include <boost/spirit/home/classic/core/primitives/primitives.hpp>
#include <boost/spirit/home/classic/core/composite/composite.hpp>
@@ -17,6 +18,8 @@
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////
//
// exclusive_or class
@@ -130,7 +133,9 @@
exclusive_or<strlit<wchar_t const*>, B>
operator^(wchar_t const* a, parser<B> const& b);
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif
Modified: trunk/boost/spirit/home/classic/core/composite/impl/alternative.ipp
==============================================================================
--- trunk/boost/spirit/home/classic/core/composite/impl/alternative.ipp (original)
+++ trunk/boost/spirit/home/classic/core/composite/impl/alternative.ipp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -13,6 +13,8 @@
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////
//
// alternative class implementation
@@ -81,6 +83,8 @@
return alternative<strlit<wchar_t const*>, B>(a, b.derived());
}
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
}} // namespace boost::spirit
#endif
Modified: trunk/boost/spirit/home/classic/core/composite/impl/difference.ipp
==============================================================================
--- trunk/boost/spirit/home/classic/core/composite/impl/difference.ipp (original)
+++ trunk/boost/spirit/home/classic/core/composite/impl/difference.ipp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -13,6 +13,8 @@
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////
//
// difference class implementation
@@ -81,6 +83,8 @@
return difference<strlit<wchar_t const*>, B>(a, b.derived());
}
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
}} // namespace boost::spirit
#endif
Modified: trunk/boost/spirit/home/classic/core/composite/impl/directives.ipp
==============================================================================
--- trunk/boost/spirit/home/classic/core/composite/impl/directives.ipp (original)
+++ trunk/boost/spirit/home/classic/core/composite/impl/directives.ipp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -17,6 +17,8 @@
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
template <typename BaseT>
struct no_skipper_iteration_policy;
@@ -364,6 +366,8 @@
#endif
}
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
}} // namespace boost::spirit
#endif
Modified: trunk/boost/spirit/home/classic/core/composite/impl/exclusive_or.ipp
==============================================================================
--- trunk/boost/spirit/home/classic/core/composite/impl/exclusive_or.ipp (original)
+++ trunk/boost/spirit/home/classic/core/composite/impl/exclusive_or.ipp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -13,6 +13,8 @@
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////
//
// exclusive_or class implementation
@@ -81,6 +83,8 @@
return exclusive_or<strlit<wchar_t const*>, B>(a, b.derived());
}
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
}} // namespace boost::spirit
#endif
Modified: trunk/boost/spirit/home/classic/core/composite/impl/intersection.ipp
==============================================================================
--- trunk/boost/spirit/home/classic/core/composite/impl/intersection.ipp (original)
+++ trunk/boost/spirit/home/classic/core/composite/impl/intersection.ipp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -13,6 +13,8 @@
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////
//
// intersection class implementation
@@ -81,6 +83,8 @@
return intersection<strlit<wchar_t const*>, B>(a, b.derived());
}
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
}} // namespace boost::spirit
#endif
Modified: trunk/boost/spirit/home/classic/core/composite/impl/kleene_star.ipp
==============================================================================
--- trunk/boost/spirit/home/classic/core/composite/impl/kleene_star.ipp (original)
+++ trunk/boost/spirit/home/classic/core/composite/impl/kleene_star.ipp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -13,6 +13,8 @@
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////
//
// kleene_star class implementation
@@ -25,6 +27,8 @@
return kleene_star<S>(a.derived());
}
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
}} // namespace boost::spirit
#endif
Modified: trunk/boost/spirit/home/classic/core/composite/impl/list.ipp
==============================================================================
--- trunk/boost/spirit/home/classic/core/composite/impl/list.ipp (original)
+++ trunk/boost/spirit/home/classic/core/composite/impl/list.ipp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -13,6 +13,8 @@
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////
//
// operator% is defined as:
@@ -84,6 +86,8 @@
return a >> *(b.derived() >> a);
}
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
}} // namespace boost::spirit
#endif
Modified: trunk/boost/spirit/home/classic/core/composite/impl/optional.ipp
==============================================================================
--- trunk/boost/spirit/home/classic/core/composite/impl/optional.ipp (original)
+++ trunk/boost/spirit/home/classic/core/composite/impl/optional.ipp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -13,6 +13,8 @@
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////
//
// optional class implementation
@@ -25,6 +27,8 @@
return optional<S>(a.derived());
}
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
}} // namespace boost::spirit
#endif
Modified: trunk/boost/spirit/home/classic/core/composite/impl/positive.ipp
==============================================================================
--- trunk/boost/spirit/home/classic/core/composite/impl/positive.ipp (original)
+++ trunk/boost/spirit/home/classic/core/composite/impl/positive.ipp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -13,6 +13,8 @@
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////
//
// positive class implementation
@@ -25,6 +27,8 @@
return positive<S>(a.derived());
}
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
}} // namespace boost::spirit
#endif
Modified: trunk/boost/spirit/home/classic/core/composite/impl/sequence.ipp
==============================================================================
--- trunk/boost/spirit/home/classic/core/composite/impl/sequence.ipp (original)
+++ trunk/boost/spirit/home/classic/core/composite/impl/sequence.ipp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -13,6 +13,8 @@
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////
//
// sequence class implementation
@@ -81,6 +83,8 @@
return sequence<strlit<wchar_t const*>, B>(a, b.derived());
}
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
}} // namespace boost::spirit
#endif
Modified: trunk/boost/spirit/home/classic/core/composite/impl/sequential_and.ipp
==============================================================================
--- trunk/boost/spirit/home/classic/core/composite/impl/sequential_and.ipp (original)
+++ trunk/boost/spirit/home/classic/core/composite/impl/sequential_and.ipp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -13,6 +13,8 @@
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////
//
// sequential-and operators implementation
@@ -81,6 +83,8 @@
return sequence<strlit<wchar_t const*>, B>(a, b.derived());
}
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
}} // namespace boost::spirit
#endif
Modified: trunk/boost/spirit/home/classic/core/composite/impl/sequential_or.ipp
==============================================================================
--- trunk/boost/spirit/home/classic/core/composite/impl/sequential_or.ipp (original)
+++ trunk/boost/spirit/home/classic/core/composite/impl/sequential_or.ipp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -13,7 +13,9 @@
namespace boost { namespace spirit {
- ///////////////////////////////////////////////////////////////////////////
+ BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
+ ///////////////////////////////////////////////////////////////////////////
//
// sequential-or class implementation
//
@@ -81,6 +83,8 @@
return sequential_or<strlit<wchar_t const*>, B>(a, b.derived());
}
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
}} // namespace boost::spirit
#endif
Modified: trunk/boost/spirit/home/classic/core/composite/intersection.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/core/composite/intersection.hpp (original)
+++ trunk/boost/spirit/home/classic/core/composite/intersection.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -10,6 +10,7 @@
#if !defined(BOOST_SPIRIT_INTERSECTION_HPP)
#define BOOST_SPIRIT_INTERSECTION_HPP
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/core/parser.hpp>
#include <boost/spirit/home/classic/core/primitives/primitives.hpp>
#include <boost/spirit/home/classic/core/composite/composite.hpp>
@@ -17,6 +18,8 @@
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////
//
// intersection class
@@ -130,7 +133,9 @@
intersection<strlit<wchar_t const*>, B>
operator&(wchar_t const* a, parser<B> const& b);
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif
Modified: trunk/boost/spirit/home/classic/core/composite/kleene_star.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/core/composite/kleene_star.hpp (original)
+++ trunk/boost/spirit/home/classic/core/composite/kleene_star.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -10,6 +10,7 @@
#if !defined(BOOST_SPIRIT_KLEENE_STAR_HPP)
#define BOOST_SPIRIT_KLEENE_STAR_HPP
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/core/parser.hpp>
#include <boost/spirit/home/classic/core/primitives/primitives.hpp>
#include <boost/spirit/home/classic/core/composite/composite.hpp>
@@ -17,6 +18,8 @@
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////
//
// kleene_star class
@@ -88,7 +91,9 @@
kleene_star<S>
operator*(parser<S> const& a);
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif
Modified: trunk/boost/spirit/home/classic/core/composite/list.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/core/composite/list.hpp (original)
+++ trunk/boost/spirit/home/classic/core/composite/list.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -10,6 +10,7 @@
#if !defined(BOOST_SPIRIT_LIST_HPP)
#define BOOST_SPIRIT_LIST_HPP
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/core/parser.hpp>
#include <boost/spirit/home/classic/core/primitives/primitives.hpp>
#include <boost/spirit/home/classic/core/composite/composite.hpp>
@@ -17,6 +18,8 @@
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////
//
// operator% is defined as:
@@ -61,7 +64,9 @@
kleene_star<sequence<B, strlit<wchar_t const*> > > >
operator%(wchar_t const* a, parser<B> const& b);
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif
Modified: trunk/boost/spirit/home/classic/core/composite/no_actions.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/core/composite/no_actions.hpp (original)
+++ trunk/boost/spirit/home/classic/core/composite/no_actions.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -15,6 +15,8 @@
namespace boost {
namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
//-----------------------------------------------------------------------------
// no_actions_action_policy
@@ -156,6 +158,7 @@
const no_actions_parser_gen no_actions_d = no_actions_parser_gen();
//-----------------------------------------------------------------------------
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
} // namespace spirit
} // namespace boost
Modified: trunk/boost/spirit/home/classic/core/composite/optional.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/core/composite/optional.hpp (original)
+++ trunk/boost/spirit/home/classic/core/composite/optional.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -10,6 +10,7 @@
#if !defined(BOOST_SPIRIT_OPTIONAL_HPP)
#define BOOST_SPIRIT_OPTIONAL_HPP
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/core/parser.hpp>
#include <boost/spirit/home/classic/core/primitives/primitives.hpp>
#include <boost/spirit/home/classic/core/composite/composite.hpp>
@@ -17,6 +18,8 @@
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////
//
// optional class
@@ -82,7 +85,9 @@
optional<S>
operator!(parser<S> const& a);
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif
Modified: trunk/boost/spirit/home/classic/core/composite/positive.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/core/composite/positive.hpp (original)
+++ trunk/boost/spirit/home/classic/core/composite/positive.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -10,6 +10,7 @@
#if !defined(BOOST_SPIRIT_POSITIVE_HPP)
#define BOOST_SPIRIT_POSITIVE_HPP
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/core/parser.hpp>
#include <boost/spirit/home/classic/core/primitives/primitives.hpp>
#include <boost/spirit/home/classic/core/composite/composite.hpp>
@@ -17,6 +18,8 @@
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////
//
// positive class
@@ -91,7 +94,9 @@
inline positive<S>
operator+(parser<S> const& a);
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif
Modified: trunk/boost/spirit/home/classic/core/composite/sequence.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/core/composite/sequence.hpp (original)
+++ trunk/boost/spirit/home/classic/core/composite/sequence.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -10,6 +10,7 @@
#if !defined(BOOST_SPIRIT_SEQUENCE_HPP)
#define BOOST_SPIRIT_SEQUENCE_HPP
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/core/parser.hpp>
#include <boost/spirit/home/classic/core/primitives/primitives.hpp>
#include <boost/spirit/home/classic/core/composite/composite.hpp>
@@ -17,6 +18,8 @@
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////
//
// sequence class
@@ -121,7 +124,9 @@
sequence<strlit<wchar_t const*>, B>
operator>>(wchar_t const* a, parser<B> const& b);
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif
Modified: trunk/boost/spirit/home/classic/core/composite/sequential_and.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/core/composite/sequential_and.hpp (original)
+++ trunk/boost/spirit/home/classic/core/composite/sequential_and.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -10,6 +10,7 @@
#if !defined(BOOST_SPIRIT_SEQUENTIAL_AND_HPP)
#define BOOST_SPIRIT_SEQUENTIAL_AND_HPP
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/core/parser.hpp>
#include <boost/spirit/home/classic/core/primitives/primitives.hpp>
#include <boost/spirit/home/classic/core/composite/composite.hpp>
@@ -17,6 +18,8 @@
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////
//
// sequential-and operators
@@ -64,7 +67,9 @@
sequence<strlit<wchar_t const*>, B>
operator&&(wchar_t const* a, parser<B> const& b);
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif
Modified: trunk/boost/spirit/home/classic/core/composite/sequential_or.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/core/composite/sequential_or.hpp (original)
+++ trunk/boost/spirit/home/classic/core/composite/sequential_or.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -10,6 +10,7 @@
#if !defined(BOOST_SPIRIT_SEQUENTIAL_OR_HPP)
#define BOOST_SPIRIT_SEQUENTIAL_OR_HPP
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/core/parser.hpp>
#include <boost/spirit/home/classic/core/primitives/primitives.hpp>
#include <boost/spirit/home/classic/core/composite/composite.hpp>
@@ -17,6 +18,8 @@
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////
//
// sequential-or class
@@ -142,7 +145,9 @@
sequential_or<strlit<wchar_t const*>, B>
operator||(wchar_t const* a, parser<B> const& b);
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif
Modified: trunk/boost/spirit/home/classic/core/impl/match.ipp
==============================================================================
--- trunk/boost/spirit/home/classic/core/impl/match.ipp (original)
+++ trunk/boost/spirit/home/classic/core/impl/match.ipp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -10,8 +10,10 @@
#define BOOST_SPIRIT_MATCH_IPP
#include <algorithm>
-namespace boost { namespace spirit
-{
+namespace boost { namespace spirit {
+
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
template <typename T>
inline match<T>::match()
: len(-1), val() {}
@@ -103,6 +105,8 @@
std::swap(len, other.len);
}
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
}} // namespace boost::spirit
#endif
Modified: trunk/boost/spirit/home/classic/core/impl/match_attr_traits.ipp
==============================================================================
--- trunk/boost/spirit/home/classic/core/impl/match_attr_traits.ipp (original)
+++ trunk/boost/spirit/home/classic/core/impl/match_attr_traits.ipp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -15,7 +15,11 @@
#include <boost/type_traits/is_convertible.hpp>
#include <boost/type_traits/is_same.hpp>
-namespace boost { namespace spirit { namespace impl
+namespace boost { namespace spirit {
+
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
+namespace impl
{
template <typename T>
struct match_attr_traits
@@ -88,7 +92,11 @@
}
};
-}}} // namespace boost::spirit::impl
+}
+
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace boost::spirit::impl
#endif
Modified: trunk/boost/spirit/home/classic/core/impl/parser.ipp
==============================================================================
--- trunk/boost/spirit/home/classic/core/impl/parser.ipp (original)
+++ trunk/boost/spirit/home/classic/core/impl/parser.ipp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -9,8 +9,10 @@
#if !defined(BOOST_SPIRIT_PARSER_IPP)
#define BOOST_SPIRIT_PARSER_IPP
-namespace boost { namespace spirit
-{
+namespace boost { namespace spirit {
+
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////
//
// Generic parse function implementation
@@ -45,6 +47,8 @@
return parse(str, last, p);
}
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
}} // namespace boost::spirit
#endif
Modified: trunk/boost/spirit/home/classic/core/match.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/core/match.hpp (original)
+++ trunk/boost/spirit/home/classic/core/match.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -8,6 +8,7 @@
#if !defined(BOOST_SPIRIT_MATCH_HPP)
#define BOOST_SPIRIT_MATCH_HPP
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/core/config.hpp>
#include <boost/spirit/home/classic/core/nil.hpp>
#include <boost/call_traits.hpp>
@@ -18,8 +19,10 @@
#include <boost/type_traits/add_const.hpp>
#include <boost/type_traits/is_reference.hpp>
-namespace boost { namespace spirit
-{
+namespace boost { namespace spirit {
+
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////
//
// match class
@@ -173,7 +176,9 @@
std::ptrdiff_t len;
};
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif
#include <boost/spirit/home/classic/core/impl/match.ipp>
Modified: trunk/boost/spirit/home/classic/core/nil.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/core/nil.hpp (original)
+++ trunk/boost/spirit/home/classic/core/nil.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -8,9 +8,16 @@
#if !defined(BOOST_SPIRIT_NIL_HPP)
#define BOOST_SPIRIT_NIL_HPP
-namespace boost { namespace spirit
-{
+#include <boost/spirit/home/classic/namespace.hpp>
+
+namespace boost { namespace spirit {
+
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
struct nil_t {};
+
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
}}
#endif
Modified: trunk/boost/spirit/home/classic/core/non_terminal/grammar.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/core/non_terminal/grammar.hpp (original)
+++ trunk/boost/spirit/home/classic/core/non_terminal/grammar.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -15,6 +15,7 @@
#undef BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE
#endif
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/core/parser.hpp>
#include <boost/spirit/home/classic/core/non_terminal/parser_context.hpp>
#include <boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp>
@@ -22,6 +23,8 @@
///////////////////////////////////////////////////////////////////////////////
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////////
//
// grammar class
@@ -71,7 +74,9 @@
};
///////////////////////////////////////////////////////////////////////////////
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#undef BOOST_SPIRIT_GRAMMAR_ID
#undef BOOST_SPIRIT_GRAMMAR_ACCESS
Modified: trunk/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp
==============================================================================
--- trunk/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp (original)
+++ trunk/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -28,6 +28,8 @@
///////////////////////////////////////////////////////////////////////////////
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
template <typename DerivedT, typename ContextT>
struct grammar;
@@ -398,6 +400,8 @@
#endif
///////////////////////////////////////////////////////////////////////////////
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
}} // namespace boost::spirit
#endif
Modified: trunk/boost/spirit/home/classic/core/non_terminal/impl/object_with_id.ipp
==============================================================================
--- trunk/boost/spirit/home/classic/core/non_terminal/impl/object_with_id.ipp (original)
+++ trunk/boost/spirit/home/classic/core/non_terminal/impl/object_with_id.ipp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -18,9 +18,13 @@
#include <boost/thread/once.hpp>
#endif
+#include <boost/spirit/home/classic/namespace.hpp>
+
///////////////////////////////////////////////////////////////////////////////
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
namespace impl {
//////////////////////////////////
@@ -180,6 +184,8 @@
} // namespace impl
///////////////////////////////////////////////////////////////////////////////
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
}} // namespace boost::spirit
#endif
Modified: trunk/boost/spirit/home/classic/core/non_terminal/impl/rule.ipp
==============================================================================
--- trunk/boost/spirit/home/classic/core/non_terminal/impl/rule.ipp (original)
+++ trunk/boost/spirit/home/classic/core/non_terminal/impl/rule.ipp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -28,6 +28,8 @@
///////////////////////////////////////////////////////////////////////////////
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
#if BOOST_SPIRIT_RULE_SCANNERTYPE_LIMIT > 1
template <
@@ -402,6 +404,8 @@
} // namespace impl
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
}} // namespace boost::spirit
#endif
Modified: trunk/boost/spirit/home/classic/core/non_terminal/impl/static.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/core/non_terminal/impl/static.hpp (original)
+++ trunk/boost/spirit/home/classic/core/non_terminal/impl/static.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -19,8 +19,11 @@
#include <memory> // for placement new
-namespace boost { namespace spirit
-{
+#include <boost/spirit/home/classic/namespace.hpp>
+
+namespace boost { namespace spirit {
+
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
//
// Provides thread-safe initialization of a single static instance of T.
@@ -106,6 +109,8 @@
template <class T, class Tag>
once_flag static_<T, Tag>::constructed_ = BOOST_ONCE_INIT;
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif // include guard
Modified: trunk/boost/spirit/home/classic/core/non_terminal/impl/subrule.ipp
==============================================================================
--- trunk/boost/spirit/home/classic/core/non_terminal/impl/subrule.ipp (original)
+++ trunk/boost/spirit/home/classic/core/non_terminal/impl/subrule.ipp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -12,6 +12,8 @@
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
template <typename FirstT, typename RestT>
struct subrule_list;
@@ -199,7 +201,11 @@
}
};
-}}} // namespace boost::spirit::impl
+}
+
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace boost::spirit::impl
#endif
Modified: trunk/boost/spirit/home/classic/core/non_terminal/parser_context.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/core/non_terminal/parser_context.hpp (original)
+++ trunk/boost/spirit/home/classic/core/non_terminal/parser_context.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -14,6 +14,8 @@
{
namespace spirit
{
+ BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////
//
@@ -140,6 +142,8 @@
result_t hit = parse_main(scan); \
return context_wrap.post_parse(hit, this_, scan_wrap);
+ BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
} // namespace spirit
} // namespace boost
Modified: trunk/boost/spirit/home/classic/core/non_terminal/parser_id.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/core/non_terminal/parser_id.hpp (original)
+++ trunk/boost/spirit/home/classic/core/non_terminal/parser_id.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -12,10 +12,13 @@
#if defined(BOOST_SPIRIT_DEBUG)
# include <ostream>
#endif
+#include <boost/spirit/home/classic/namespace.hpp>
///////////////////////////////////////////////////////////////////////////////
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////
//
// parser_id class
@@ -111,7 +114,9 @@
};
///////////////////////////////////////////////////////////////////////////////
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif
Modified: trunk/boost/spirit/home/classic/core/non_terminal/rule.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/core/non_terminal/rule.hpp (original)
+++ trunk/boost/spirit/home/classic/core/non_terminal/rule.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -29,6 +29,7 @@
BOOST_STATIC_ASSERT(BOOST_SPIRIT_RULE_SCANNERTYPE_LIMIT > 0);
#include <boost/scoped_ptr.hpp>
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/core/non_terminal/impl/rule.ipp>
#if BOOST_SPIRIT_RULE_SCANNERTYPE_LIMIT > 1
@@ -38,6 +39,8 @@
///////////////////////////////////////////////////////////////////////////////
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
#if BOOST_SPIRIT_RULE_SCANNERTYPE_LIMIT > 1
///////////////////////////////////////////////////////////////////////////
@@ -165,6 +168,8 @@
scoped_ptr<abstract_parser_t> ptr;
};
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif
Modified: trunk/boost/spirit/home/classic/core/non_terminal/subrule.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/core/non_terminal/subrule.hpp (original)
+++ trunk/boost/spirit/home/classic/core/non_terminal/subrule.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -12,6 +12,7 @@
#include <boost/config.hpp>
#include <boost/static_assert.hpp>
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/core/parser.hpp>
#include <boost/spirit/home/classic/core/non_terminal/parser_context.hpp>
@@ -20,6 +21,8 @@
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////
//
// subrules_scanner class
@@ -289,7 +292,9 @@
subrule& operator=(subrule<ID2, ContextT2> const&);
};
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif
Modified: trunk/boost/spirit/home/classic/core/non_terminal/subrule_fwd.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/core/non_terminal/subrule_fwd.hpp (original)
+++ trunk/boost/spirit/home/classic/core/non_terminal/subrule_fwd.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -8,10 +8,13 @@
#if !defined(BOOST_SPIRIT_SUBRULE_FWD_HPP)
#define BOOST_SPIRIT_SUBRULE_FWD_HPP
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/core/non_terminal/parser_context.hpp>
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
template <int ID, typename ContextT = parser_context<> >
struct subrule;
@@ -24,7 +27,9 @@
template <typename FirstT, typename RestT>
struct subrule_list;
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif
Modified: trunk/boost/spirit/home/classic/core/parser.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/core/parser.hpp (original)
+++ trunk/boost/spirit/home/classic/core/parser.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -10,11 +10,14 @@
#include <boost/config.hpp>
#include <boost/type_traits.hpp>
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/core/scanner/scanner.hpp>
#include <boost/spirit/home/classic/core/nil.hpp>
-namespace boost { namespace spirit
-{
+namespace boost { namespace spirit {
+
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
template <typename ParserT, typename ActionT>
class action; // forward declaration
@@ -211,7 +214,9 @@
CharT const* str,
parser<DerivedT> const& p);
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif
Modified: trunk/boost/spirit/home/classic/core/primitives/impl/numerics.ipp
==============================================================================
--- trunk/boost/spirit/home/classic/core/primitives/impl/numerics.ipp (original)
+++ trunk/boost/spirit/home/classic/core/primitives/impl/numerics.ipp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -15,6 +15,8 @@
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
struct sign_parser; // forward declaration only
namespace impl
@@ -469,6 +471,8 @@
} // namespace impl
///////////////////////////////////////////////////////////////////////////////
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
}} // namespace boost::spirit
#endif
Modified: trunk/boost/spirit/home/classic/core/primitives/impl/primitives.ipp
==============================================================================
--- trunk/boost/spirit/home/classic/core/primitives/impl/primitives.ipp (original)
+++ trunk/boost/spirit/home/classic/core/primitives/impl/primitives.ipp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -33,6 +33,8 @@
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
template <typename DrivedT> struct char_parser;
namespace impl
@@ -461,7 +463,11 @@
#endif // !defined(BOOST_NO_CWCTYPE)
-}}} // namespace boost::spirit::impl
+}
+
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace boost::spirit::impl
#ifdef BOOST_MSVC
#pragma warning (pop)
Modified: trunk/boost/spirit/home/classic/core/primitives/numerics.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/core/primitives/numerics.hpp (original)
+++ trunk/boost/spirit/home/classic/core/primitives/numerics.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -10,14 +10,17 @@
#define BOOST_SPIRIT_NUMERICS_HPP
#include <boost/config.hpp>
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/core/parser.hpp>
#include <boost/spirit/home/classic/core/composite/directives.hpp>
#include <boost/spirit/home/classic/core/primitives/numerics_fwd.hpp>
#include <boost/spirit/home/classic/core/primitives/impl/numerics.ipp>
-namespace boost { namespace spirit
-{
+namespace boost { namespace spirit {
+
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////
//
// uint_parser class
@@ -279,6 +282,8 @@
strict_real_p
= real_parser<double, strict_real_parser_policies<double> >();
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif
Modified: trunk/boost/spirit/home/classic/core/primitives/numerics_fwd.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/core/primitives/numerics_fwd.hpp (original)
+++ trunk/boost/spirit/home/classic/core/primitives/numerics_fwd.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -8,8 +8,12 @@
#if !defined(BOOST_SPIRIT_NUMERICS_FWD_HPP)
# define BOOST_SPIRIT_NUMERICS_FWD_HPP
-namespace boost { namespace spirit
-{
+#include <boost/spirit/home/classic/namespace.hpp>
+
+namespace boost { namespace spirit {
+
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////
//
// uint_parser class
@@ -76,7 +80,9 @@
template <typename T>
struct strict_real_parser_policies;
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif
Modified: trunk/boost/spirit/home/classic/core/primitives/primitives.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/core/primitives/primitives.hpp (original)
+++ trunk/boost/spirit/home/classic/core/primitives/primitives.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -10,6 +10,7 @@
#define BOOST_SPIRIT_PRIMITIVES_HPP
#include <boost/ref.hpp>
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/core/assert.hpp>
#include <boost/spirit/home/classic/core/parser.hpp>
#include <boost/spirit/home/classic/core/composite/impl/directives.ipp>
@@ -22,6 +23,8 @@
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////
//
// char_parser class
@@ -640,7 +643,9 @@
return your_favorite_pizza;
}
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#ifdef BOOST_MSVC
#pragma warning (pop)
Modified: trunk/boost/spirit/home/classic/core/safe_bool.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/core/safe_bool.hpp (original)
+++ trunk/boost/spirit/home/classic/core/safe_bool.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -10,9 +10,12 @@
#include <boost/config.hpp>
#include <boost/detail/workaround.hpp>
+#include <boost/spirit/home/classic/namespace.hpp>
+
+namespace boost { namespace spirit {
+
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
-namespace boost { namespace spirit
-{
namespace impl
{
template <typename T>
@@ -52,6 +55,9 @@
&impl_t::stub : 0;
}
};
+
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
}}
#endif
Modified: trunk/boost/spirit/home/classic/core/scanner/impl/skipper.ipp
==============================================================================
--- trunk/boost/spirit/home/classic/core/scanner/impl/skipper.ipp (original)
+++ trunk/boost/spirit/home/classic/core/scanner/impl/skipper.ipp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -12,6 +12,8 @@
///////////////////////////////////////////////////////////////////////////////
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
struct space_parser;
template <typename BaseT>
struct no_skipper_iteration_policy;
@@ -171,6 +173,8 @@
return parse(str, last, p, skip);
}
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
}} // namespace boost::spirit
#endif
Modified: trunk/boost/spirit/home/classic/core/scanner/scanner.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/core/scanner/scanner.hpp (original)
+++ trunk/boost/spirit/home/classic/core/scanner/scanner.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -10,14 +10,17 @@
#include <iterator>
#include <boost/config.hpp>
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/core/match.hpp>
#include <boost/spirit/home/classic/core/non_terminal/parser_id.hpp>
#include <boost/detail/iterator.hpp> // for boost::detail::iterator_traits
#include <boost/spirit/home/classic/core/scanner/scanner_fwd.hpp>
-namespace boost { namespace spirit
-{
+namespace boost { namespace spirit {
+
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////
//
// iteration_policy class
@@ -318,6 +321,9 @@
typedef typename ScannerT::template
rebind_iterator<IteratorT>::type type;
};
+
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
}}
#endif
Modified: trunk/boost/spirit/home/classic/core/scanner/scanner_fwd.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/core/scanner/scanner_fwd.hpp (original)
+++ trunk/boost/spirit/home/classic/core/scanner/scanner_fwd.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -8,8 +8,11 @@
#if !defined(BOOST_SPIRIT_SCANNER_FWD_HPP)
#define BOOST_SPIRIT_SCANNER_FWD_HPP
-namespace boost { namespace spirit
-{
+#include <boost/spirit/home/classic/namespace.hpp>
+
+namespace boost { namespace spirit {
+
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
///////////////////////////////////////////////////////////////////////////
//
@@ -41,7 +44,9 @@
typename PoliciesT = scanner_policies<> >
class scanner;
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif
Modified: trunk/boost/spirit/home/classic/core/scanner/skipper.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/core/scanner/skipper.hpp (original)
+++ trunk/boost/spirit/home/classic/core/scanner/skipper.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -11,6 +11,7 @@
///////////////////////////////////////////////////////////////////////////////
#include <cctype>
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/core/scanner/scanner.hpp>
#include <boost/spirit/home/classic/core/primitives/impl/primitives.ipp>
@@ -18,6 +19,8 @@
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////
//
// skipper_iteration_policy class
@@ -184,7 +187,10 @@
typedef scanner<wchar_t const*, scanner_policies_t> wide_phrase_scanner_t;
///////////////////////////////////////////////////////////////////////////////
-}} // namespace boost::spirit
+
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#include <boost/spirit/home/classic/core/scanner/impl/skipper.ipp>
#endif
Modified: trunk/boost/spirit/home/classic/core/scanner/skipper_fwd.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/core/scanner/skipper_fwd.hpp (original)
+++ trunk/boost/spirit/home/classic/core/scanner/skipper_fwd.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -8,10 +8,13 @@
#if !defined(BOOST_SPIRIT_SKIPPER_FWD_HPP)
#define BOOST_SPIRIT_SKIPPER_FWD_HPP
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/core/scanner/scanner_fwd.hpp>
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
template <typename BaseT = iteration_policy>
struct skipper_iteration_policy;
@@ -21,7 +24,9 @@
template <typename ParserT, typename BaseT = iteration_policy>
class skip_parser_iteration_policy;
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif
Modified: trunk/boost/spirit/home/classic/core/typeof.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/core/typeof.hpp (original)
+++ trunk/boost/spirit/home/classic/core/typeof.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -13,6 +13,7 @@
#include <boost/typeof/typeof.hpp>
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/core/nil.hpp>
#include <boost/spirit/home/classic/core/primitives/numerics_fwd.hpp>
#include <boost/spirit/home/classic/core/scanner/scanner_fwd.hpp>
@@ -21,6 +22,8 @@
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
// parser.hpp
template <typename IteratorT> struct parse_info;
struct plain_parser_category;
@@ -105,7 +108,9 @@
template<typename T, typename ValueT, typename ActionT>
class ref_const_ref_actor;
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
@@ -114,219 +119,223 @@
// parser.hpp
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::parse_info,1)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::plain_parser_category)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::binary_parser_category)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::unary_parser_category)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::action_parser_category)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::parse_info,1)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::plain_parser_category)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::binary_parser_category)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::unary_parser_category)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::action_parser_category)
// nil.hpp (included directly)
#if !defined(BOOST_SPIRIT_NIL_T_TYPEOF_REGISTERED)
// registration guard to decouple the iterators from the core
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::nil_t)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::nil_t)
# define BOOST_SPIRIT_NIL_T_TYPEOF_REGISTERED
#endif
// match.hpp
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::match, 1)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::match, 1)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::match<boost::spirit::nil_t>)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::match<BOOST_SPIRIT_CLASSIC_NS::nil_t>)
// primitives/primitives.hpp
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::negated_char_parser, 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::chlit, 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::range, 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::chseq, 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::strlit, 1)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::nothing_parser)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::anychar_parser)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::alnum_parser)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::alpha_parser)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::cntrl_parser)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::digit_parser)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::xdigit_parser)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::graph_parser)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::upper_parser)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::lower_parser)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::print_parser)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::punct_parser)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::blank_parser)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::space_parser)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::eol_parser)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::end_parser)
-
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::chlit<char>)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::chlit<wchar_t>)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::range<char>)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::range<wchar_t>)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::chseq<char const *>)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::chseq<wchar_t const *>)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::strlit<char const *>)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::strlit<wchar_t const *>)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::negated_char_parser, 1)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::chlit, 1)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::range, 1)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::chseq, 1)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::strlit, 1)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::nothing_parser)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::anychar_parser)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::alnum_parser)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::alpha_parser)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::cntrl_parser)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::digit_parser)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::xdigit_parser)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::graph_parser)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::upper_parser)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::lower_parser)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::print_parser)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::punct_parser)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::blank_parser)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::space_parser)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::eol_parser)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::end_parser)
+
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::chlit<char>)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::chlit<wchar_t>)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::range<char>)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::range<wchar_t>)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::chseq<char const *>)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::chseq<wchar_t const *>)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::strlit<char const *>)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::strlit<wchar_t const *>)
// primitives/numerics.hpp (has forward header)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::int_parser, (class)(int)(unsigned)(int))
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::uint_parser, (class)(int)(unsigned)(int))
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::sign_parser)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::real_parser, 2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::real_parser_policies, 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::ureal_parser_policies, 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::strict_real_parser_policies, 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::strict_ureal_parser_policies, 1)
-
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::int_parser, (class)(int))
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::uint_parser, (class)(int))
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::int_parser<boost::int32_t>)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::uint_parser<boost::uint32_t>)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::int_parser, (class)(int)(unsigned)(int))
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::uint_parser, (class)(int)(unsigned)(int))
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::sign_parser)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::real_parser, 2)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::real_parser_policies, 1)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::ureal_parser_policies, 1)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::strict_real_parser_policies, 1)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::strict_ureal_parser_policies, 1)
+
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::int_parser, (class)(int))
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::uint_parser, (class)(int))
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::int_parser<boost::int32_t>)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::uint_parser<boost::uint32_t>)
#if !defined(BOOST_NO_INT64_T)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::int_parser<boost::int64_t>)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::uint_parser<boost::uint64_t>)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::int_parser<boost::int64_t>)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::uint_parser<boost::uint64_t>)
#endif
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::real_parser_policies<float>)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::real_parser_policies<double>)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::ureal_parser_policies<float>)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::ureal_parser_policies<double>)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::strict_real_parser_policies<float>)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::strict_real_parser_policies<double>)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::strict_ureal_parser_policies<float>)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::strict_ureal_parser_policies<double>)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::real_parser_policies<float>)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::real_parser_policies<double>)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::ureal_parser_policies<float>)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::ureal_parser_policies<double>)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::strict_real_parser_policies<float>)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::strict_real_parser_policies<double>)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::strict_ureal_parser_policies<float>)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::strict_ureal_parser_policies<double>)
// scanner/scanner.hpp (has forward header)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::scanner,2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::scanner_policies,3)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::iteration_policy)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::action_policy)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::match_policy)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::scanner,2)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::scanner_policies,3)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::iteration_policy)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::action_policy)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::match_policy)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::scanner,1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::scanner_policies,2)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::scanner,1)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::scanner_policies,2)
// scanner/skipper.hpp (has forward header)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::skipper_iteration_policy,1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::no_skipper_iteration_policy,1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::skip_parser_iteration_policy,2)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::skipper_iteration_policy,1)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::no_skipper_iteration_policy,1)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::skip_parser_iteration_policy,2)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::skipper_iteration_policy<>)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::skip_parser_iteration_policy,1)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::skipper_iteration_policy<>)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::skip_parser_iteration_policy,1)
// non_terminal/parser_context.hpp
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::parser_context,1)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::parser_context,1)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::parser_context<boost::spirit::nil_t>)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::parser_context<BOOST_SPIRIT_CLASSIC_NS::nil_t>)
// non_terminal/parser_id.hpp
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::parser_id)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::parser_tag, (int))
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::dynamic_parser_tag)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::parser_address_tag)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::parser_id)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::parser_tag, (int))
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::dynamic_parser_tag)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::parser_address_tag)
// non_terminal/subrule.hpp (has forward header)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::subrule,(int)(class))
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::subrule_parser,(int)(class)(class))
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::subrule_list,2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::subrules_scanner,2)
-
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::subrule,(int))
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::subrule_parser,(int)(class))
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::subrule<0>)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::subrule<1>)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::subrule<2>)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::subrule<3>)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::subrule<4>)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::subrule<5>)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::subrule<6>)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::subrule<7>)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::subrule,(int)(class))
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::subrule_parser,(int)(class)(class))
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::subrule_list,2)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::subrules_scanner,2)
+
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::subrule,(int))
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::subrule_parser,(int)(class))
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::subrule<0>)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::subrule<1>)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::subrule<2>)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::subrule<3>)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::subrule<4>)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::subrule<5>)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::subrule<6>)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::subrule<7>)
// non_terminal/rule.hpp
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::rule,3)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::rule,3)
#if BOOST_SPIRIT_RULE_SCANNERTYPE_LIMIT > 1
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::scanner_list,1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::scanner_list,BOOST_SPIRIT_RULE_SCANNERTYPE_LIMIT)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::scanner_list,1)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::scanner_list,BOOST_SPIRIT_RULE_SCANNERTYPE_LIMIT)
#endif
// non_terminal/grammar.hpp
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::grammar,2)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::grammar,2)
// composite.hpp
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::action, 2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::alternative, 2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::difference, 2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::exclusive_or, 2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::intersection, 2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::sequence, 2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::sequential_or, 2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::kleene_star, 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::positive, 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::optional, 1)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::action, 2)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::alternative, 2)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::difference, 2)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::exclusive_or, 2)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::intersection, 2)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::sequence, 2)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::sequential_or, 2)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::kleene_star, 1)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::positive, 1)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::optional, 1)
// composite/directives.hpp
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::contiguous, 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::inhibit_case, 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::inhibit_case_iteration_policy,1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::longest_alternative, 2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::shortest_alternative, 2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::min_bounded, 2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::max_bounded, 2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::bounded, 2)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::contiguous, 1)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::inhibit_case, 1)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::inhibit_case_iteration_policy,1)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::longest_alternative, 2)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::shortest_alternative, 2)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::min_bounded, 2)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::max_bounded, 2)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::bounded, 2)
// composite/no_actions.hpp
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::no_actions_parser, 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::no_actions_action_policy, 1)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::no_actions_parser, 1)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::no_actions_action_policy, 1)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::no_actions_action_policy<boost::spirit::action_policy>)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::no_actions_action_policy<BOOST_SPIRIT_CLASSIC_NS::action_policy>)
// composite/epsilon.hpp
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::epsilon_parser)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::condition_parser, (class)(bool))
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::empty_match_parser, 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::negated_empty_match_parser, 1)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::epsilon_parser)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::condition_parser, (class)(bool))
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::empty_match_parser, 1)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::negated_empty_match_parser, 1)
#if !defined(BOOST_SPIRIT_ACTOR_TYPEOF_HPP)
// deprecated assign/push_back actor -- they live somewhere else, now
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::ref_value_actor,2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::ref_const_ref_actor,3)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::assign_action)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::push_back_action)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::ref_value_actor,2)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::ref_const_ref_actor,3)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::assign_action)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::push_back_action)
#endif
#if BOOST_WORKAROUND(BOOST_MSVC,BOOST_TESTED_AT(1400)) && BOOST_MSVC >= 1400
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
nil_t & operator* (nil_t);
nil_t & operator+ (nil_t);
-} } // namespace ::boost::spirit::type_of
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+} } // namespace ::BOOST_SPIRIT_CLASSIC_NS
#endif
Modified: trunk/boost/spirit/home/classic/debug.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/debug.hpp (original)
+++ trunk/boost/spirit/home/classic/debug.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -89,47 +89,56 @@
///////////////////////////////////////////////////////////////////////////
#if !defined(BOOST_SPIRIT_DEBUG_RULE)
#define BOOST_SPIRIT_DEBUG_RULE(r) \
- ::boost::spirit::impl::get_node_registry().register_node(&r, #r, BOOST_SPIRIT_DEBUG_TRACENODE)
+ ::BOOST_SPIRIT_CLASSIC_NS::impl::get_node_registry(). \
+ register_node(&r, #r, BOOST_SPIRIT_DEBUG_TRACENODE)
#endif // !defined(BOOST_SPIRIT_DEBUG_RULE)
#if !defined(BOOST_SPIRIT_DEBUG_NODE)
#define BOOST_SPIRIT_DEBUG_NODE(r) \
- ::boost::spirit::impl::get_node_registry().register_node(&r, #r, BOOST_SPIRIT_DEBUG_TRACENODE)
+ ::BOOST_SPIRIT_CLASSIC_NS::impl::get_node_registry(). \
+ register_node(&r, #r, BOOST_SPIRIT_DEBUG_TRACENODE)
#endif // !defined(BOOST_SPIRIT_DEBUG_NODE)
#if !defined(BOOST_SPIRIT_DEBUG_GRAMMAR)
#define BOOST_SPIRIT_DEBUG_GRAMMAR(r) \
- ::boost::spirit::impl::get_node_registry().register_node(&r, #r, BOOST_SPIRIT_DEBUG_TRACENODE)
+ ::BOOST_SPIRIT_CLASSIC_NS::impl::get_node_registry(). \
+ register_node(&r, #r, BOOST_SPIRIT_DEBUG_TRACENODE)
#endif // !defined(BOOST_SPIRIT_DEBUG_GRAMMAR)
#if !defined(BOOST_SPIRIT_DEBUG_TRACE_RULE)
#define BOOST_SPIRIT_DEBUG_TRACE_RULE(r, t) \
- ::boost::spirit::impl::get_node_registry().register_node(&r, #r, (t))
+ ::BOOST_SPIRIT_CLASSIC_NS::impl::get_node_registry(). \
+ register_node(&r, #r, (t))
#endif // !defined(BOOST_SPIRIT_TRACE_RULE)
#if !defined(BOOST_SPIRIT_DEBUG_TRACE_NODE)
#define BOOST_SPIRIT_DEBUG_TRACE_NODE(r, t) \
- ::boost::spirit::impl::get_node_registry().register_node(&r, #r, (t))
+ ::BOOST_SPIRIT_CLASSIC_NS::impl::get_node_registry(). \
+ register_node(&r, #r, (t))
#endif // !defined(BOOST_SPIRIT_DEBUG_TRACE_NODE)
#if !defined(BOOST_SPIRIT_DEBUG_TRACE_GRAMMAR)
#define BOOST_SPIRIT_DEBUG_TRACE_GRAMMAR(r, t) \
- ::boost::spirit::impl::get_node_registry().register_node(&r, #r, (t))
+ ::BOOST_SPIRIT_CLASSIC_NS::impl::get_node_registry(). \
+ register_node(&r, #r, (t))
#endif // !defined(BOOST_SPIRIT_DEBUG_TRACE_GRAMMAR)
#if !defined(BOOST_SPIRIT_DEBUG_TRACE_RULE_NAME)
#define BOOST_SPIRIT_DEBUG_TRACE_RULE_NAME(r, n, t) \
- ::boost::spirit::impl::get_node_registry().register_node(&r, (n), (t))
+ ::BOOST_SPIRIT_CLASSIC_NS::impl::get_node_registry(). \
+ register_node(&r, (n), (t))
#endif // !defined(BOOST_SPIRIT_DEBUG_TRACE_RULE_NAME)
#if !defined(BOOST_SPIRIT_DEBUG_TRACE_NODE_NAME)
#define BOOST_SPIRIT_DEBUG_TRACE_NODE_NAME(r, n, t) \
- ::boost::spirit::impl::get_node_registry().register_node(&r, (n), (t))
+ ::BOOST_SPIRIT_CLASSIC_NS::impl::get_node_registry(). \
+ register_node(&r, (n), (t))
#endif // !defined(BOOST_SPIRIT_DEBUG_TRACE_NODE_NAME)
#if !defined(BOOST_SPIRIT_DEBUG_TRACE_GRAMMAR_NAME)
#define BOOST_SPIRIT_DEBUG_TRACE_GRAMMAR_NAME(r, n, t) \
- ::boost::spirit::impl::get_node_registry().register_node(&r, (n), (t))
+ ::BOOST_SPIRIT_CLASSIC_NS::impl::get_node_registry(). \
+ register_node(&r, (n), (t))
#endif // !defined(BOOST_SPIRIT_DEBUG_TRACE_GRAMMAR_NAME)
//////////////////////////////////
Modified: trunk/boost/spirit/home/classic/debug/debug_node.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/debug/debug_node.hpp (original)
+++ trunk/boost/spirit/home/classic/debug/debug_node.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -21,10 +21,13 @@
#include <boost/type_traits/is_convertible.hpp>
#include <boost/mpl/if.hpp>
#include <boost/mpl/and.hpp>
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/core/primitives/primitives.hpp> // for iscntrl_
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////////
//
// Debug helper classes for rules, which ensure maximum non-intrusiveness of
@@ -306,7 +309,9 @@
#endif // !defined(BOOST_SPIRIT_CLOSURE_CONTEXT_LINKER_DEFINED)
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif // defined(BOOST_SPIRIT_DEBUG)
Modified: trunk/boost/spirit/home/classic/debug/impl/parser_names.ipp
==============================================================================
--- trunk/boost/spirit/home/classic/debug/impl/parser_names.ipp (original)
+++ trunk/boost/spirit/home/classic/debug/impl/parser_names.ipp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -35,6 +35,8 @@
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////////
// from actions.hpp
template <typename ParserT, typename ActionT>
@@ -541,6 +543,8 @@
}
///////////////////////////////////////////////////////////////////////////////
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
}} // namespace boost::spirit
#undef BOOST_SPIRIT_SSTREAM
Modified: trunk/boost/spirit/home/classic/debug/parser_names.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/debug/parser_names.hpp (original)
+++ trunk/boost/spirit/home/classic/debug/parser_names.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -12,10 +12,13 @@
#if defined(BOOST_SPIRIT_DEBUG)
//////////////////////////////////
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/core.hpp>
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////////
//
// Declaration of helper functions, which return the name of a concrete
@@ -239,7 +242,9 @@
trace_parser(init_closure_parser<ParserT, ActorTupleT> const& p);
///////////////////////////////////////////////////////////////////////////////
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
//////////////////////////////////
#include <boost/spirit/home/classic/debug/impl/parser_names.ipp>
Modified: trunk/boost/spirit/home/classic/debug/typeof.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/debug/typeof.hpp (original)
+++ trunk/boost/spirit/home/classic/debug/typeof.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -10,26 +10,28 @@
#include <boost/typeof/typeof.hpp>
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/core/typeof.hpp>
-
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
// debug_node.hpp
template<typename ContextT> struct parser_context_linker;
template<typename ScannerT> struct scanner_context_linker;
template<typename ContextT> struct closure_context_linker;
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#include BOOST_TYPEOF_INCREMENT_REGISTRATION_GROUP()
-
// debug_node.hpp
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::parser_context_linker,1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::scanner_context_linker,1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::closure_context_linker,1)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::parser_context_linker,1)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::scanner_context_linker,1)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::closure_context_linker,1)
#endif
Modified: trunk/boost/spirit/home/classic/dynamic/for.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/dynamic/for.hpp (original)
+++ trunk/boost/spirit/home/classic/dynamic/for.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -9,14 +9,17 @@
#ifndef BOOST_SPIRIT_FOR_HPP
#define BOOST_SPIRIT_FOR_HPP
////////////////////////////////////////////////////////////////////////////////
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/core/parser.hpp>
#include <boost/spirit/home/classic/core/composite/composite.hpp>
#include <boost/spirit/home/classic/dynamic/impl/conditions.ipp>
////////////////////////////////////////////////////////////////////////////////
-namespace boost { namespace spirit
-{
+namespace boost { namespace spirit {
+
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
namespace impl
{
@@ -131,7 +134,7 @@
this->step();
}
- boost::spirit::nil_t attr;
+ BOOST_SPIRIT_CLASSIC_NS::nil_t attr;
return scan.create_match
(length, attr, save, scan.first);
}
@@ -177,6 +180,8 @@
(init_f, condition, step_f);
}
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif // BOOST_SPIRIT_FOR_HPP
Modified: trunk/boost/spirit/home/classic/dynamic/if.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/dynamic/if.hpp (original)
+++ trunk/boost/spirit/home/classic/dynamic/if.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -10,12 +10,15 @@
#ifndef BOOST_SPIRIT_IF_HPP
#define BOOST_SPIRIT_IF_HPP
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/core/parser.hpp>
#include <boost/spirit/home/classic/core/composite/composite.hpp>
#include <boost/spirit/home/classic/dynamic/impl/conditions.ipp>
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
namespace impl {
//////////////////////////////////
@@ -219,6 +222,8 @@
return impl::if_parser_gen<CondT>(cond);
}
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif // BOOST_SPIRIT_IF_HPP
Modified: trunk/boost/spirit/home/classic/dynamic/impl/conditions.ipp
==============================================================================
--- trunk/boost/spirit/home/classic/dynamic/impl/conditions.ipp (original)
+++ trunk/boost/spirit/home/classic/dynamic/impl/conditions.ipp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -16,6 +16,8 @@
///////////////////////////////////////////////////////////////////////////////
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
namespace impl {
///////////////////////////////////////////////////////////////////////////////
@@ -95,6 +97,8 @@
///////////////////////////////////////////////////////////////////////////////
} // namespace impl
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
}} // namespace boost::spirit
#endif
Modified: trunk/boost/spirit/home/classic/dynamic/impl/select.ipp
==============================================================================
--- trunk/boost/spirit/home/classic/dynamic/impl/select.ipp (original)
+++ trunk/boost/spirit/home/classic/dynamic/impl/select.ipp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -16,6 +16,8 @@
///////////////////////////////////////////////////////////////////////////////
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////////
namespace impl {
@@ -110,6 +112,9 @@
///////////////////////////////////////////////////////////////////////////////
} // namespace impl
+
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
}} // namespace boost::spirit
#endif // BOOST_SPIRIT_SELECT_IPP
Modified: trunk/boost/spirit/home/classic/dynamic/impl/switch.ipp
==============================================================================
--- trunk/boost/spirit/home/classic/dynamic/impl/switch.ipp (original)
+++ trunk/boost/spirit/home/classic/dynamic/impl/switch.ipp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -29,6 +29,8 @@
///////////////////////////////////////////////////////////////////////////////
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
// forward declaration
template <int N, typename ParserT, bool IsDefault> struct case_parser;
@@ -564,6 +566,9 @@
///////////////////////////////////////////////////////////////////////////////
} // namespace impl
+
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
}} // namespace boost::spirit
#endif // BOOST_SPIRIT_SWITCH_IPP
Modified: trunk/boost/spirit/home/classic/dynamic/lazy.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/dynamic/lazy.hpp (original)
+++ trunk/boost/spirit/home/classic/dynamic/lazy.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -10,13 +10,16 @@
#define BOOST_SPIRIT_LAZY_HPP
////////////////////////////////////////////////////////////////////////////////
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/core/parser.hpp>
#include <boost/spirit/home/classic/phoenix/actor.hpp>
////////////////////////////////////////////////////////////////////////////////
-namespace boost { namespace spirit
-{
+namespace boost { namespace spirit {
+
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
////////////////////////////////////////////////////////////////////////////
//
// lazy_parser, holds phoenix actor which returns a spirit parser.
@@ -56,6 +59,8 @@
lazy_parser<ActorT> lazy_p(ActorT const& actor)
{ return lazy_parser<ActorT>(actor); }
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif // BOOST_SPIRIT_LAZY_HPP
Modified: trunk/boost/spirit/home/classic/dynamic/rule_alias.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/dynamic/rule_alias.hpp (original)
+++ trunk/boost/spirit/home/classic/dynamic/rule_alias.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -8,10 +8,13 @@
#if !defined(BOOST_SPIRIT_RULE_ALIAS_HPP)
#define BOOST_SPIRIT_RULE_ALIAS_HPP
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/core/parser.hpp>
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////
//
// rule_alias class
@@ -66,6 +69,8 @@
ParserT const* ptr; // hold it by pointer
};
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif
Modified: trunk/boost/spirit/home/classic/dynamic/select.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/dynamic/select.hpp (original)
+++ trunk/boost/spirit/home/classic/dynamic/select.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -16,6 +16,7 @@
#include <boost/preprocessor/cat.hpp>
#include <boost/preprocessor/facilities/intercept.hpp>
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/core/parser.hpp>
#include <boost/spirit/home/classic/phoenix/tuples.hpp>
@@ -65,6 +66,8 @@
///////////////////////////////////////////////////////////////////////////////
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////////
//
// The select_default_no_fail and select_default_fail structs are used to
@@ -83,7 +86,9 @@
struct select_default_no_fail {};
struct select_default_fail {};
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
///////////////////////////////////////////////////////////////////////////////
#include <boost/spirit/home/classic/dynamic/impl/select.ipp>
@@ -91,6 +96,8 @@
///////////////////////////////////////////////////////////////////////////////
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////////
template <typename TupleT, typename BehaviourT, typename T>
struct select_parser
@@ -231,6 +238,8 @@
#undef BOOST_SPIRIT_SELECT_LIMIT_A
///////////////////////////////////////////////////////////////////////////////
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif // BOOST_SPIRIT_SELECT_HPP
Modified: trunk/boost/spirit/home/classic/dynamic/stored_rule.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/dynamic/stored_rule.hpp (original)
+++ trunk/boost/spirit/home/classic/dynamic/stored_rule.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -9,6 +9,7 @@
#define BOOST_SPIRIT_STORED_RULE_HPP
///////////////////////////////////////////////////////////////////////////////
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/core/non_terminal/impl/rule.ipp>
#include <boost/spirit/home/classic/dynamic/rule_alias.hpp>
#include <boost/shared_ptr.hpp>
@@ -18,6 +19,8 @@
///////////////////////////////////////////////////////////////////////////////
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////
//
// stored_rule class
@@ -117,6 +120,8 @@
};
///////////////////////////////////////////////////////////////////////////////
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif
Modified: trunk/boost/spirit/home/classic/dynamic/stored_rule_fwd.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/dynamic/stored_rule_fwd.hpp (original)
+++ trunk/boost/spirit/home/classic/dynamic/stored_rule_fwd.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -8,10 +8,13 @@
#if !defined(BOOST_SPIRIT_STORED_RULE_FWD_HPP)
#define BOOST_SPIRIT_STORED_RULE_FWD_HPP
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/core/nil.hpp>
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
template <
typename T0 = nil_t
, typename T1 = nil_t
@@ -20,7 +23,9 @@
>
class stored_rule;
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif
Modified: trunk/boost/spirit/home/classic/dynamic/switch.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/dynamic/switch.hpp (original)
+++ trunk/boost/spirit/home/classic/dynamic/switch.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -40,6 +40,7 @@
///////////////////////////////////////////////////////////////////////////////
BOOST_STATIC_ASSERT(BOOST_SPIRIT_SWITCH_CASE_LIMIT > 0);
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/core/config.hpp>
#include <boost/type_traits/is_same.hpp>
#include <boost/spirit/home/classic/core/parser.hpp>
@@ -49,6 +50,8 @@
///////////////////////////////////////////////////////////////////////////////
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////////
//
// The switch_parser allows to build switch like parsing constructs, which
@@ -249,6 +252,8 @@
default_parser_gen const default_p = default_parser_gen();
///////////////////////////////////////////////////////////////////////////////
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif // BOOST_SPIRIT_SWITCH_HPP
Modified: trunk/boost/spirit/home/classic/dynamic/typeof.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/dynamic/typeof.hpp (original)
+++ trunk/boost/spirit/home/classic/dynamic/typeof.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -10,12 +10,15 @@
#include <boost/typeof/typeof.hpp>
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/core/typeof.hpp>
#include <boost/spirit/home/classic/dynamic/stored_rule_fwd.hpp>
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
// if.hpp
template <class ParsableT, typename CondT> struct if_parser;
template <class ParsableTrueT, class ParsableFalseT, typename CondT>
@@ -45,40 +48,42 @@
template <typename TupleT, typename BehaviourT, typename T>
struct select_parser;
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#include BOOST_TYPEOF_INCREMENT_REGISTRATION_GROUP()
// if.hpp
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::if_parser,2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::if_else_parser,3)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::if_parser,2)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::if_else_parser,3)
// for.hpp
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::impl::for_parser,4)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::impl::for_parser,4)
// while.hpp
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::while_parser,(class)(class)(bool))
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::while_parser,(class)(class)(bool))
// lazy.hpp
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::lazy_parser,1)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::lazy_parser,1)
// stored_rule.hpp (has forward header)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::stored_rule,(typename)(typename)(typename)(bool))
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::stored_rule,3)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::stored_rule,2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::stored_rule,1)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::stored_rule<>)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::stored_rule,(typename)(typename)(typename)(bool))
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::stored_rule,3)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::stored_rule,2)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::stored_rule,1)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::stored_rule<>)
// rule_alias.hpp
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::rule_alias,1)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::rule_alias,1)
// switch.hpp
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::switch_parser,2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::case_parser,(int)(class)(bool))
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::switch_parser,2)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::case_parser,(int)(class)(bool))
// select.hpp
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::select_parser,3)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::select_parser,3)
#endif
Modified: trunk/boost/spirit/home/classic/dynamic/while.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/dynamic/while.hpp (original)
+++ trunk/boost/spirit/home/classic/dynamic/while.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -9,6 +9,7 @@
#ifndef BOOST_SPIRIT_WHILE_HPP
#define BOOST_SPIRIT_WHILE_HPP
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/core/parser.hpp>
#include <boost/spirit/home/classic/core/composite/composite.hpp>
#include <boost/spirit/home/classic/dynamic/impl/conditions.ipp>
@@ -16,6 +17,8 @@
////////////////////////////////////////////////////////////////////////////////
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
namespace impl {
//////////////////////////////////
@@ -179,6 +182,8 @@
// Usage: spirit::do_p[Body].while_p(Condition)
impl::do_parser_gen const do_p = impl::do_parser_gen();
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif // BOOST_SPIRIT_WHILE_HPP
Modified: trunk/boost/spirit/home/classic/error_handling/exceptions.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/error_handling/exceptions.hpp (original)
+++ trunk/boost/spirit/home/classic/error_handling/exceptions.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -10,6 +10,7 @@
#include <boost/config.hpp>
#include <boost/throw_exception.hpp>
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/core/parser.hpp>
#include <boost/spirit/home/classic/core/composite/composite.hpp>
#include <exception>
@@ -18,6 +19,8 @@
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////
//
// parser_error_base class
@@ -89,7 +92,7 @@
virtual const char*
what() const throw()
{
- return "boost::spirit::parser_error";
+ return "BOOST_SPIRIT_CLASSIC_NS::parser_error";
}
IteratorT where;
@@ -353,7 +356,9 @@
}
};
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#include <boost/spirit/home/classic/error_handling/impl/exceptions.ipp>
#endif
Modified: trunk/boost/spirit/home/classic/error_handling/exceptions_fwd.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/error_handling/exceptions_fwd.hpp (original)
+++ trunk/boost/spirit/home/classic/error_handling/exceptions_fwd.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -8,10 +8,13 @@
#if !defined(BOOST_SPIRIT_EXCEPTIONS_FWD_HPP)
#define BOOST_SPIRIT_EXCEPTIONS_FWD_HPP
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/core/nil.hpp>
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
template <typename ErrorDescrT, typename IteratorT = char const*>
struct parser_error;
@@ -30,7 +33,9 @@
template <typename ErrorDescrT>
struct guard;
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif
Modified: trunk/boost/spirit/home/classic/error_handling/impl/exceptions.ipp
==============================================================================
--- trunk/boost/spirit/home/classic/error_handling/impl/exceptions.ipp (original)
+++ trunk/boost/spirit/home/classic/error_handling/impl/exceptions.ipp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -9,7 +9,11 @@
#ifndef BOOST_SPIRIT_EXCEPTIONS_IPP
#define BOOST_SPIRIT_EXCEPTIONS_IPP
-namespace boost { namespace spirit { namespace impl {
+namespace boost { namespace spirit {
+
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
+namespace impl {
#ifdef __BORLANDC__
template <typename ParserT, typename ScannerT>
@@ -78,7 +82,11 @@
#endif
-}}} // namespace boost::spirit::impl
+}
+
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace boost::spirit::impl
///////////////////////////////////////////////////////////////////////////////
#endif
Modified: trunk/boost/spirit/home/classic/error_handling/typeof.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/error_handling/typeof.hpp (original)
+++ trunk/boost/spirit/home/classic/error_handling/typeof.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -20,13 +20,13 @@
// exceptions.hpp (has forward header)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::parser_error,2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::assertive_parser,2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::error_status,1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::fallback_parser,3)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::guard,1)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::parser_error,2)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::assertive_parser,2)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::error_status,1)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::fallback_parser,3)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::guard,1)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::error_status<>)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::error_status<>)
#endif
Modified: trunk/boost/spirit/home/classic/iterator/file_iterator.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/iterator/file_iterator.hpp (original)
+++ trunk/boost/spirit/home/classic/iterator/file_iterator.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -52,6 +52,7 @@
#include <string>
#include <boost/config.hpp>
#include <boost/iterator_adaptors.hpp>
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/core/safe_bool.hpp>
#include <boost/spirit/home/classic/iterator/file_iterator_fwd.hpp>
@@ -79,6 +80,8 @@
///////////////////////////////////////////////////////////////////////////////
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
template <
typename CharT = char,
typename BaseIterator =
@@ -215,7 +218,9 @@
};
///////////////////////////////////////////////////////////////////////////////
-}} /* namespace boost::spirit */
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} /* namespace BOOST_SPIRIT_CLASSIC_NS */
///////////////////////////////////////////////////////////////////////////////
#include <boost/spirit/home/classic/iterator/impl/file_iterator.ipp> /* implementation */
Modified: trunk/boost/spirit/home/classic/iterator/file_iterator_fwd.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/iterator/file_iterator_fwd.hpp (original)
+++ trunk/boost/spirit/home/classic/iterator/file_iterator_fwd.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -9,8 +9,12 @@
#if !defined(BOOST_SPIRIT_FILE_ITERATOR_FWD_HPP)
#define BOOST_SPIRIT_FILE_ITERATOR_FWD_HPP
+#include <boost/spirit/home/classic/namespace.hpp>
+
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
namespace fileiter_impl
{
template <typename CharT = char>
@@ -27,7 +31,9 @@
typename BaseIterator
> class file_iterator;
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif
Modified: trunk/boost/spirit/home/classic/iterator/fixed_size_queue.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/iterator/fixed_size_queue.hpp (original)
+++ trunk/boost/spirit/home/classic/iterator/fixed_size_queue.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -13,6 +13,7 @@
#include <iterator>
#include <cstddef>
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/core/assert.hpp> // for BOOST_SPIRIT_ASSERT
// FIXES for broken compilers
@@ -26,6 +27,8 @@
///////////////////////////////////////////////////////////////////////////////
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////////
namespace impl {
@@ -390,7 +393,9 @@
}
///////////////////////////////////////////////////////////////////////////////
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#undef BOOST_SPIRIT_ASSERT_FSQ_SIZE
Modified: trunk/boost/spirit/home/classic/iterator/impl/file_iterator.ipp
==============================================================================
--- trunk/boost/spirit/home/classic/iterator/impl/file_iterator.ipp (original)
+++ trunk/boost/spirit/home/classic/iterator/impl/file_iterator.ipp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -34,6 +34,8 @@
///////////////////////////////////////////////////////////////////////////////
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////////
namespace fileiter_impl {
@@ -453,6 +455,8 @@
}
///////////////////////////////////////////////////////////////////////////////
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
}} /* namespace boost::spirit */
Modified: trunk/boost/spirit/home/classic/iterator/impl/position_iterator.ipp
==============================================================================
--- trunk/boost/spirit/home/classic/iterator/impl/position_iterator.ipp (original)
+++ trunk/boost/spirit/home/classic/iterator/impl/position_iterator.ipp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -21,6 +21,8 @@
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////////
//
// position_policy<file_position_without_column>
@@ -126,6 +128,10 @@
> type;
};
-}}}} /* namespace boost::spirit::iterator_::impl */
+}}
+
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} /* namespace boost::spirit::iterator_::impl */
#endif
Modified: trunk/boost/spirit/home/classic/iterator/multi_pass.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/iterator/multi_pass.hpp (original)
+++ trunk/boost/spirit/home/classic/iterator/multi_pass.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -18,6 +18,7 @@
#include <boost/limits.hpp>
#include <boost/iterator.hpp>
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/core/assert.hpp> // for BOOST_SPIRIT_ASSERT
#include <boost/spirit/home/classic/iterator/fixed_size_queue.hpp>
#include <boost/detail/iterator.hpp> // for boost::detail::iterator_traits
@@ -26,6 +27,8 @@
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
namespace impl {
template <typename T>
inline void mp_swap(T& t1, T& t2);
@@ -153,7 +156,7 @@
virtual const char*
what() const throw()
- { return "boost::spirit::illegal_backtracking"; }
+ { return "BOOST_SPIRIT_CLASSIC_NS::illegal_backtracking"; }
};
///////////////////////////////////////////////////////////////////////////////
@@ -367,7 +370,7 @@
// class fixed_size_queue
// Implementation of the StoragePolicy used by multi_pass
// fixed_size_queue keeps a circular buffer (implemented by
-// boost::spirit::fixed_size_queue class) that is size N+1 and stores N elements.
+// BOOST_SPIRIT_CLASSIC_NS::fixed_size_queue class) that is size N+1 and stores N elements.
// It is up to the user to ensure that there is enough look ahead for their
// grammar. Currently there is no way to tell if an iterator is pointing
// to forgotten data. The leading iterator will put an item in the queue
@@ -384,7 +387,7 @@
{
private:
- typedef boost::spirit::fixed_size_queue<ValueT, N> queue_type;
+ typedef BOOST_SPIRIT_CLASSIC_NS::fixed_size_queue<ValueT, N> queue_type;
queue_type * queuedElements;
mutable typename queue_type::iterator queuePosition;
@@ -1286,12 +1289,14 @@
inline void mp_swap(T& t1, T& t2)
{
using std::swap;
- using boost::spirit::swap;
+ using BOOST_SPIRIT_CLASSIC_NS::swap;
swap(t1, t2);
}
}
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif // BOOST_SPIRIT_ITERATOR_MULTI_PASS_HPP
Modified: trunk/boost/spirit/home/classic/iterator/multi_pass_fwd.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/iterator/multi_pass_fwd.hpp (original)
+++ trunk/boost/spirit/home/classic/iterator/multi_pass_fwd.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -10,8 +10,12 @@
#include <cstddef>
+#include <boost/spirit/home/classic/namespace.hpp>
+
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
namespace multi_pass_policies
{
class ref_counted;
@@ -35,7 +39,9 @@
>
class multi_pass;
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif
Modified: trunk/boost/spirit/home/classic/iterator/position_iterator.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/iterator/position_iterator.hpp (original)
+++ trunk/boost/spirit/home/classic/iterator/position_iterator.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -14,10 +14,13 @@
#include <boost/config.hpp>
#include <boost/concept_check.hpp>
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/iterator/position_iterator_fwd.hpp>
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////////
//
// file_position_without_column
@@ -86,7 +89,9 @@
template <typename PositionT> class position_policy;
///////////////////////////////////////////////////////////////////////////////
-}} /* namespace boost::spirit */
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} /* namespace BOOST_SPIRIT_CLASSIC_NS */
// This must be included here for full compatibility with old MSVC
@@ -95,6 +100,8 @@
///////////////////////////////////////////////////////////////////////////////
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////////
//
// position_iterator
@@ -423,6 +430,8 @@
{ _startline = this->base(); }
};
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif
Modified: trunk/boost/spirit/home/classic/iterator/position_iterator_fwd.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/iterator/position_iterator_fwd.hpp (original)
+++ trunk/boost/spirit/home/classic/iterator/position_iterator_fwd.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -11,10 +11,13 @@
#include <string>
#include <boost/detail/iterator.hpp> // for boost::detail::iterator_traits
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/core/nil.hpp>
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
template <typename String = std::string>
struct file_position_base;
@@ -49,7 +52,9 @@
template <typename PositionT> class position_policy;
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif
Modified: trunk/boost/spirit/home/classic/iterator/typeof.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/iterator/typeof.hpp (original)
+++ trunk/boost/spirit/home/classic/iterator/typeof.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -11,6 +11,7 @@
#include <boost/typeof/typeof.hpp>
#include <boost/typeof/std/string.hpp>
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/iterator/multi_pass_fwd.hpp>
#include <boost/spirit/home/classic/iterator/file_iterator_fwd.hpp>
#include <boost/spirit/home/classic/iterator/position_iterator_fwd.hpp>
@@ -19,6 +20,8 @@
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
// external (from core)
struct nil_t;
@@ -27,66 +30,65 @@
template<typename QueueT, typename T, typename PointerT>
class fsq_iterator;
-}} // namespace boost::spirit
-
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#include BOOST_TYPEOF_INCREMENT_REGISTRATION_GROUP()
-
#if !defined(BOOST_SPIRIT_NIL_T_TYPEOF_REGISTERED)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::nil_t)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::nil_t)
# define BOOST_SPIRIT_NIL_T_TYPEOF_REGISTERED
#endif
// multi_pass.hpp (has forward header)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::multi_pass,5)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::multi_pass_policies::ref_counted)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::multi_pass_policies::first_owner)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::multi_pass_policies::buf_id_check)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::multi_pass_policies::no_check)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::multi_pass_policies::std_deque)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::multi_pass_policies::fixed_size_queue,(BOOST_TYPEOF_INTEGRAL(std::size_t)))
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::multi_pass_policies::input_iterator)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::multi_pass_policies::lex_input)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::multi_pass_policies::functor_input)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::multi_pass,5)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::multi_pass_policies::ref_counted)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::multi_pass_policies::first_owner)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::multi_pass_policies::buf_id_check)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::multi_pass_policies::no_check)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::multi_pass_policies::std_deque)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::multi_pass_policies::fixed_size_queue,(BOOST_TYPEOF_INTEGRAL(std::size_t)))
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::multi_pass_policies::input_iterator)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::multi_pass_policies::lex_input)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::multi_pass_policies::functor_input)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::multi_pass,3)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::multi_pass,1)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::multi_pass,3)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::multi_pass,1)
// file_iterator.hpp
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::file_iterator,2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::fileiter_impl::std_file_iterator,1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::fileiter_impl::mmap_file_iterator,1)
-
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::fileiter_impl::std_file_iterator<char>)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::fileiter_impl::std_file_iterator<wchar_t>)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::fileiter_impl::mmap_file_iterator<char>)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::fileiter_impl::mmap_file_iterator<wchar_t>)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::file_iterator,2)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::fileiter_impl::std_file_iterator,1)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::fileiter_impl::mmap_file_iterator,1)
+
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::fileiter_impl::std_file_iterator<char>)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::fileiter_impl::std_file_iterator<wchar_t>)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::fileiter_impl::mmap_file_iterator<char>)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::fileiter_impl::mmap_file_iterator<wchar_t>)
// fixed_size_queue.hpp
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::fixed_size_queue,(typename)(BOOST_TYPEOF_INTEGRAL(std::size_t)))
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::fsq_iterator,3)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::fixed_size_queue,(typename)(BOOST_TYPEOF_INTEGRAL(std::size_t)))
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::fsq_iterator,3)
// position_iterator.hpp
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::position_iterator,3)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::position_iterator2,2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::position_policy,1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::file_position_base,1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::file_position_without_column_base,1)
-
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::file_position)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::file_position_base<std::basic_string<wchar_t> >)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::file_position_without_column)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::file_position_without_column_base<std::basic_string<wchar_t> >)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::position_iterator,3)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::position_iterator2,2)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::position_policy,1)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::file_position_base,1)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::file_position_without_column_base,1)
+
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::file_position)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::file_position_base<std::basic_string<wchar_t> >)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::file_position_without_column)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::file_position_without_column_base<std::basic_string<wchar_t> >)
#endif
Modified: trunk/boost/spirit/home/classic/meta/as_parser.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/meta/as_parser.hpp (original)
+++ trunk/boost/spirit/home/classic/meta/as_parser.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -9,10 +9,13 @@
#if !defined(BOOST_SPIRIT_AS_PARSER_HPP)
#define BOOST_SPIRIT_AS_PARSER_HPP
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/core/primitives/primitives.hpp>
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////
//
// Helper templates to derive the parser type from an auxilliary type
@@ -103,6 +106,8 @@
template<int N>
struct as_parser<wchar_t const[N]> : impl::wstring_as_parser {};
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif
Modified: trunk/boost/spirit/home/classic/meta/fundamental.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/meta/fundamental.hpp (original)
+++ trunk/boost/spirit/home/classic/meta/fundamental.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -8,10 +8,13 @@
#if !defined(BOOST_SPIRIT_FUNDAMENTAL_HPP)
#define BOOST_SPIRIT_FUNDAMENTAL_HPP
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/meta/impl/fundamental.ipp>
-namespace boost { namespace spirit
-{
+namespace boost { namespace spirit {
+
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////
//
// Helper template for counting the number of nodes contained in a
@@ -46,6 +49,8 @@
BOOST_STATIC_CONSTANT(int, value = count_t::value);
};
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif // !defined(BOOST_SPIRIT_FUNDAMENTAL_HPP)
Modified: trunk/boost/spirit/home/classic/meta/impl/fundamental.ipp
==============================================================================
--- trunk/boost/spirit/home/classic/meta/impl/fundamental.ipp (original)
+++ trunk/boost/spirit/home/classic/meta/impl/fundamental.ipp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -13,6 +13,8 @@
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
#if defined(BOOST_MSVC) && (BOOST_MSVC <= 1300)
BOOST_SPIRIT_DEPENDENT_TEMPLATE_WRAPPER2(count_wrapper, count);
#endif // defined(BOOST_MSVC) && (BOOST_MSVC <= 1300)
@@ -300,6 +302,8 @@
} // namespace impl
///////////////////////////////////////////////////////////////////////////////
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
}} // namespace boost::spirit
#endif // !defined(BOOST_SPIRIT_FUNDAMENTAL_IPP)
Modified: trunk/boost/spirit/home/classic/meta/impl/parser_traits.ipp
==============================================================================
--- trunk/boost/spirit/home/classic/meta/impl/parser_traits.ipp (original)
+++ trunk/boost/spirit/home/classic/meta/impl/parser_traits.ipp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -16,6 +16,8 @@
///////////////////////////////////////////////////////////////////////////////
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
namespace impl
{
@@ -182,6 +184,8 @@
} // namespace impl
///////////////////////////////////////////////////////////////////////////////
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
}} // namespace boost::spirit
#endif // !defined(BOOST_SPIRIT_PARSER_TRAITS_IPP)
Modified: trunk/boost/spirit/home/classic/meta/impl/refactoring.ipp
==============================================================================
--- trunk/boost/spirit/home/classic/meta/impl/refactoring.ipp (original)
+++ trunk/boost/spirit/home/classic/meta/impl/refactoring.ipp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -12,6 +12,8 @@
///////////////////////////////////////////////////////////////////////////////
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////////
//
// The struct 'self_nested_refactoring' is used to indicate, that the
@@ -441,6 +443,8 @@
} // namespace impl
///////////////////////////////////////////////////////////////////////////////
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
}} // namespace boost::spirit
#endif
Modified: trunk/boost/spirit/home/classic/meta/impl/traverse.ipp
==============================================================================
--- trunk/boost/spirit/home/classic/meta/impl/traverse.ipp (original)
+++ trunk/boost/spirit/home/classic/meta/impl/traverse.ipp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -16,6 +16,8 @@
///////////////////////////////////////////////////////////////////////////////
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////////
namespace impl
{
@@ -384,6 +386,8 @@
} // namespace impl
///////////////////////////////////////////////////////////////////////////////
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
}} // namespace boost::spirit
#endif // !defined(BOOST_SPIRIT_TRAVERSE_IPP)
Modified: trunk/boost/spirit/home/classic/meta/parser_traits.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/meta/parser_traits.hpp (original)
+++ trunk/boost/spirit/home/classic/meta/parser_traits.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -13,12 +13,15 @@
#include <boost/type_traits/is_base_and_derived.hpp>
#include <boost/static_assert.hpp>
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/core/parser.hpp>
#include <boost/spirit/home/classic/meta/impl/parser_traits.ipp>
///////////////////////////////////////////////////////////////////////////////
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////////
//
// Parser traits templates
@@ -94,8 +97,8 @@
struct is_composite_parser {
BOOST_STATIC_CONSTANT(bool, value = (
- ::boost::spirit::is_unary_composite<CompositeT>::value ||
- ::boost::spirit::is_binary_composite<CompositeT>::value));
+ ::BOOST_SPIRIT_CLASSIC_NS::is_unary_composite<CompositeT>::value ||
+ ::BOOST_SPIRIT_CLASSIC_NS::is_binary_composite<CompositeT>::value));
};
///////////////////////////////////////////////////////////////////////////////
@@ -103,63 +106,63 @@
struct is_alternative {
BOOST_STATIC_CONSTANT(bool, value = (
- ::boost::spirit::impl::parser_type_traits<ParserT>::is_alternative));
+ ::BOOST_SPIRIT_CLASSIC_NS::impl::parser_type_traits<ParserT>::is_alternative));
};
template <typename ParserT>
struct is_sequence {
BOOST_STATIC_CONSTANT(bool, value = (
- ::boost::spirit::impl::parser_type_traits<ParserT>::is_sequence));
+ ::BOOST_SPIRIT_CLASSIC_NS::impl::parser_type_traits<ParserT>::is_sequence));
};
template <typename ParserT>
struct is_sequential_or {
BOOST_STATIC_CONSTANT(bool, value = (
- ::boost::spirit::impl::parser_type_traits<ParserT>::is_sequential_or));
+ ::BOOST_SPIRIT_CLASSIC_NS::impl::parser_type_traits<ParserT>::is_sequential_or));
};
template <typename ParserT>
struct is_intersection {
BOOST_STATIC_CONSTANT(bool, value = (
- ::boost::spirit::impl::parser_type_traits<ParserT>::is_intersection));
+ ::BOOST_SPIRIT_CLASSIC_NS::impl::parser_type_traits<ParserT>::is_intersection));
};
template <typename ParserT>
struct is_difference {
BOOST_STATIC_CONSTANT(bool, value = (
- ::boost::spirit::impl::parser_type_traits<ParserT>::is_difference));
+ ::BOOST_SPIRIT_CLASSIC_NS::impl::parser_type_traits<ParserT>::is_difference));
};
template <typename ParserT>
struct is_exclusive_or {
BOOST_STATIC_CONSTANT(bool, value = (
- ::boost::spirit::impl::parser_type_traits<ParserT>::is_exclusive_or));
+ ::BOOST_SPIRIT_CLASSIC_NS::impl::parser_type_traits<ParserT>::is_exclusive_or));
};
template <typename ParserT>
struct is_optional {
BOOST_STATIC_CONSTANT(bool, value = (
- ::boost::spirit::impl::parser_type_traits<ParserT>::is_optional));
+ ::BOOST_SPIRIT_CLASSIC_NS::impl::parser_type_traits<ParserT>::is_optional));
};
template <typename ParserT>
struct is_kleene_star {
BOOST_STATIC_CONSTANT(bool, value = (
- ::boost::spirit::impl::parser_type_traits<ParserT>::is_kleene_star));
+ ::BOOST_SPIRIT_CLASSIC_NS::impl::parser_type_traits<ParserT>::is_kleene_star));
};
template <typename ParserT>
struct is_positive {
BOOST_STATIC_CONSTANT(bool, value = (
- ::boost::spirit::impl::parser_type_traits<ParserT>::is_positive));
+ ::BOOST_SPIRIT_CLASSIC_NS::impl::parser_type_traits<ParserT>::is_positive));
};
///////////////////////////////////////////////////////////////////////////////
@@ -179,7 +182,7 @@
template <typename UnaryT>
struct unary_subject {
- BOOST_STATIC_ASSERT(::boost::spirit::is_unary_composite<UnaryT>::value);
+ BOOST_STATIC_ASSERT(BOOST_SPIRIT_CLASSIC_NS::is_unary_composite<UnaryT>::value);
typedef typename UnaryT::subject_t type;
};
@@ -195,7 +198,7 @@
inline typename unary_subject<UnaryT>::type const &
get_unary_subject(UnaryT const &unary_)
{
- BOOST_STATIC_ASSERT(::boost::spirit::is_unary_composite<UnaryT>::value);
+ BOOST_STATIC_ASSERT(::BOOST_SPIRIT_CLASSIC_NS::is_unary_composite<UnaryT>::value);
return unary_.subject();
}
@@ -211,14 +214,14 @@
template <typename BinaryT>
struct binary_left_subject {
- BOOST_STATIC_ASSERT(::boost::spirit::is_binary_composite<BinaryT>::value);
+ BOOST_STATIC_ASSERT(::BOOST_SPIRIT_CLASSIC_NS::is_binary_composite<BinaryT>::value);
typedef typename BinaryT::left_t type;
};
template <typename BinaryT>
struct binary_right_subject {
- BOOST_STATIC_ASSERT(::boost::spirit::is_binary_composite<BinaryT>::value);
+ BOOST_STATIC_ASSERT(::BOOST_SPIRIT_CLASSIC_NS::is_binary_composite<BinaryT>::value);
typedef typename BinaryT::right_t type;
};
@@ -235,7 +238,7 @@
inline typename binary_left_subject<BinaryT>::type const &
get_binary_left_subject(BinaryT const &binary_)
{
- BOOST_STATIC_ASSERT(::boost::spirit::is_binary_composite<BinaryT>::value);
+ BOOST_STATIC_ASSERT(::BOOST_SPIRIT_CLASSIC_NS::is_binary_composite<BinaryT>::value);
return binary_.left();
}
@@ -243,7 +246,7 @@
inline typename binary_right_subject<BinaryT>::type const &
get_binary_right_subject(BinaryT const &binary_)
{
- BOOST_STATIC_ASSERT(::boost::spirit::is_binary_composite<BinaryT>::value);
+ BOOST_STATIC_ASSERT(::BOOST_SPIRIT_CLASSIC_NS::is_binary_composite<BinaryT>::value);
return binary_.right();
}
@@ -258,7 +261,7 @@
template <typename ActionT>
struct action_subject {
- BOOST_STATIC_ASSERT(::boost::spirit::is_action_parser<ActionT>::value);
+ BOOST_STATIC_ASSERT(::BOOST_SPIRIT_CLASSIC_NS::is_action_parser<ActionT>::value);
typedef typename ActionT::subject_t type;
};
@@ -274,7 +277,7 @@
inline typename action_subject<ActionT>::type const &
get_action_subject(ActionT const &action_)
{
- BOOST_STATIC_ASSERT(::boost::spirit::is_action_parser<ActionT>::value);
+ BOOST_STATIC_ASSERT(::BOOST_SPIRIT_CLASSIC_NS::is_action_parser<ActionT>::value);
return action_.subject();
}
@@ -289,7 +292,7 @@
template <typename ActionT>
struct semantic_action {
- BOOST_STATIC_ASSERT(::boost::spirit::is_action_parser<ActionT>::value);
+ BOOST_STATIC_ASSERT(::BOOST_SPIRIT_CLASSIC_NS::is_action_parser<ActionT>::value);
typedef typename ActionT::predicate_t type;
};
@@ -305,11 +308,13 @@
inline typename semantic_action<ActionT>::type const &
get_semantic_action(ActionT const &action_)
{
- BOOST_STATIC_ASSERT(::boost::spirit::is_action_parser<ActionT>::value);
+ BOOST_STATIC_ASSERT(::BOOST_SPIRIT_CLASSIC_NS::is_action_parser<ActionT>::value);
return action_.predicate();
}
///////////////////////////////////////////////////////////////////////////////
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif // !defined(BOOST_SPIRIT_PARSER_TRAITS_HPP)
Modified: trunk/boost/spirit/home/classic/meta/refactoring.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/meta/refactoring.hpp (original)
+++ trunk/boost/spirit/home/classic/meta/refactoring.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -10,6 +10,7 @@
///////////////////////////////////////////////////////////////////////////////
#include <boost/static_assert.hpp>
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/meta/as_parser.hpp>
#include <boost/spirit/home/classic/core/parser.hpp>
#include <boost/spirit/home/classic/core/composite/composite.hpp>
@@ -18,6 +19,8 @@
///////////////////////////////////////////////////////////////////////////////
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////////
//
// refactor_unary_parser class
@@ -267,7 +270,9 @@
const attach_action_gen<> attach_action_d = attach_action_gen<>();
///////////////////////////////////////////////////////////////////////////////
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif // BOOST_SPIRIT_REFACTORING_HPP
Modified: trunk/boost/spirit/home/classic/meta/traverse.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/meta/traverse.hpp (original)
+++ trunk/boost/spirit/home/classic/meta/traverse.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -9,10 +9,13 @@
#if !defined(BOOST_SPIRIT_TRAVERSE_HPP)
#define BOOST_SPIRIT_TRAVERSE_HPP
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/meta/impl/traverse.ipp>
-namespace boost { namespace spirit
-{
+namespace boost { namespace spirit {
+
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////
//
// Post-order traversal of auxilliary parsers.
@@ -212,6 +215,8 @@
struct identity_transform : transform_policies<identity_transform> {};
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif // !defined(BOOST_SPIRIT_TRAVERSE_HPP)
Added: trunk/boost/spirit/home/classic/namespace.hpp
==============================================================================
--- (empty file)
+++ trunk/boost/spirit/home/classic/namespace.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -0,0 +1,26 @@
+/*=============================================================================
+ 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)
+=============================================================================*/
+#if !defined(SPIRIT_CLASSIC_NAMESPACE_HPP)
+#define SPIRIT_CLASSIC_NAMESPACE_HPP
+
+#if defined(BOOST_SPIRIT_USE_OLD_NAMESPACE)
+
+#define BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN /*namespace classic {*/
+#define BOOST_SPIRIT_CLASSIC_NS boost::spirit::/*classic*/
+#define BOOST_SPIRIT_CLASSIC_NAMESPACE_END /*}*/
+
+#else
+
+#define BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN namespace classic {
+#define BOOST_SPIRIT_CLASSIC_NS boost::spirit::classic
+#define BOOST_SPIRIT_CLASSIC_NAMESPACE_END }
+
+#endif
+
+#endif
Modified: trunk/boost/spirit/home/classic/symbols/impl/symbols.ipp
==============================================================================
--- trunk/boost/spirit/home/classic/symbols/impl/symbols.ipp (original)
+++ trunk/boost/spirit/home/classic/symbols/impl/symbols.ipp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -22,6 +22,8 @@
///////////////////////////////////////////////////////////////////////////////
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////////
//
// symbols class implementation
@@ -105,6 +107,8 @@
}
///////////////////////////////////////////////////////////////////////////////
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
}} // namespace boost::spirit
#if defined(BOOST_MSVC)
Modified: trunk/boost/spirit/home/classic/symbols/impl/tst.ipp
==============================================================================
--- trunk/boost/spirit/home/classic/symbols/impl/tst.ipp (original)
+++ trunk/boost/spirit/home/classic/symbols/impl/tst.ipp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -16,6 +16,8 @@
///////////////////////////////////////////////////////////////////////////////
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
namespace impl
{
@@ -272,6 +274,8 @@
///////////////////////////////////////////////////////////////////////////////
} // namespace impl
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
}} // namespace boost::spirit
#endif
Modified: trunk/boost/spirit/home/classic/symbols/symbols.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/symbols/symbols.hpp (original)
+++ trunk/boost/spirit/home/classic/symbols/symbols.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -13,6 +13,7 @@
#include <boost/ref.hpp>
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/core/parser.hpp>
#include <boost/spirit/home/classic/core/composite/directives.hpp>
@@ -22,6 +23,8 @@
///////////////////////////////////////////////////////////////////////////////
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////////
//
// symbols class
@@ -218,7 +221,9 @@
};
///////////////////////////////////////////////////////////////////////////////
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#include <boost/spirit/home/classic/symbols/impl/symbols.ipp>
#endif
Modified: trunk/boost/spirit/home/classic/symbols/symbols_fwd.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/symbols/symbols_fwd.hpp (original)
+++ trunk/boost/spirit/home/classic/symbols/symbols_fwd.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -8,8 +8,12 @@
#if !defined(BOOST_SPIRIT_SYMBOLS_FWD_HPP)
#define BOOST_SPIRIT_SYMBOLS_FWD_HPP
+#include <boost/spirit/home/classic/namespace.hpp>
+
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
namespace impl
{
template <typename CharT, typename T>
@@ -27,7 +31,9 @@
template <typename T, typename SetT>
class symbol_inserter;
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif
Modified: trunk/boost/spirit/home/classic/symbols/typeof.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/symbols/typeof.hpp (original)
+++ trunk/boost/spirit/home/classic/symbols/typeof.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -14,12 +14,12 @@
#include BOOST_TYPEOF_INCREMENT_REGISTRATION_GROUP()
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::symbols,3)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::symbol_inserter,2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::impl::tst,2)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::symbols,3)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::symbol_inserter,2)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::impl::tst,2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::symbols,2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::symbols,1)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::symbols,2)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::symbols,1)
#endif
Modified: trunk/boost/spirit/home/classic/tree/ast.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/tree/ast.hpp (original)
+++ trunk/boost/spirit/home/classic/tree/ast.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -9,6 +9,7 @@
#ifndef BOOST_SPIRIT_TREE_AST_HPP
#define BOOST_SPIRIT_TREE_AST_HPP
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/tree/common.hpp>
#include <boost/spirit/home/classic/core/scanner/scanner.hpp>
@@ -17,6 +18,7 @@
///////////////////////////////////////////////////////////////////////////////
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
//////////////////////////////////
// ast_match_policy is simply an id so the correct specialization of
@@ -377,7 +379,9 @@
}
///////////////////////////////////////////////////////////////////////////////
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif
Modified: trunk/boost/spirit/home/classic/tree/ast_fwd.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/tree/ast_fwd.hpp (original)
+++ trunk/boost/spirit/home/classic/tree/ast_fwd.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -8,10 +8,13 @@
#if !defined(BOOST_SPIRIT_TREE_AST_FWD_HPP)
#define BOOST_SPIRIT_TREE_AST_FWD_HPP
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/core/nil.hpp>
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
template <
typename MatchPolicyT,
typename NodeFactoryT,
@@ -31,7 +34,9 @@
struct root_node_op;
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif
Modified: trunk/boost/spirit/home/classic/tree/common.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/tree/common.hpp (original)
+++ trunk/boost/spirit/home/classic/tree/common.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -24,6 +24,7 @@
#include <boost/ref.hpp>
#include <boost/call_traits.hpp>
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/core.hpp>
#include <boost/detail/iterator.hpp> // for boost::detail::iterator_traits
@@ -37,6 +38,8 @@
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
template <typename T>
void swap(tree_node<T>& a, tree_node<T>& b);
@@ -523,7 +526,7 @@
inline void cp_swap(T& t1, T& t2)
{
using std::swap;
- using boost::spirit::swap;
+ using BOOST_SPIRIT_CLASSIC_NS::swap;
using boost::swap;
swap(t1, t2);
}
@@ -1050,7 +1053,7 @@
using std::swap;
using boost::swap;
- using boost::spirit::swap;
+ using BOOST_SPIRIT_CLASSIC_NS::swap;
// copying the tree nodes is expensive, since it may copy a whole
// tree. swapping them is cheap, so swap the nodes we want into
@@ -1102,7 +1105,7 @@
using std::swap;
using boost::swap;
- using boost::spirit::swap;
+ using BOOST_SPIRIT_CLASSIC_NS::swap;
// copying the tree nodes is expensive, since it may copy a whole
// tree. swapping them is cheap, so swap the nodes we want into
@@ -1166,7 +1169,7 @@
using std::swap;
using boost::swap;
- using boost::spirit::swap;
+ using BOOST_SPIRIT_CLASSIC_NS::swap;
// copying the tree nodes is expensive, since it may copy a whole
// tree. swapping them is cheap, so swap the nodes we want into
@@ -1226,7 +1229,7 @@
using std::swap;
using boost::swap;
- using boost::spirit::swap;
+ using BOOST_SPIRIT_CLASSIC_NS::swap;
// copying the tree nodes is expensive, since it may copy a whole
// tree. swapping them is cheap, so swap the nodes we want into
@@ -1549,7 +1552,7 @@
{
using std::swap;
using boost::swap;
- using boost::spirit::swap;
+ using BOOST_SPIRIT_CLASSIC_NS::swap;
// use auto_ptr like ownership for the trees data member
swap(trees, pi.trees);
@@ -1569,14 +1572,16 @@
{
using std::swap;
using boost::swap;
- using boost::spirit::swap;
+ using BOOST_SPIRIT_CLASSIC_NS::swap;
// use auto_ptr like ownership for the trees data member
swap(trees, trees_);
}
};
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif
Modified: trunk/boost/spirit/home/classic/tree/common_fwd.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/tree/common_fwd.hpp (original)
+++ trunk/boost/spirit/home/classic/tree/common_fwd.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -8,10 +8,13 @@
#if !defined(BOOST_SPIRIT_TREE_COMMON_FWD_HPP)
#define BOOST_SPIRIT_TREE_COMMON_FWD_HPP
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/core/nil.hpp>
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
template <typename T>
struct tree_node;
@@ -86,6 +89,8 @@
>
struct tree_parse_info;
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif
Modified: trunk/boost/spirit/home/classic/tree/impl/parse_tree_utils.ipp
==============================================================================
--- trunk/boost/spirit/home/classic/tree/impl/parse_tree_utils.ipp (original)
+++ trunk/boost/spirit/home/classic/tree/impl/parse_tree_utils.ipp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -15,6 +15,8 @@
namespace boost {
namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////////
//
// Returnes the first leaf node of the given parsetree.
@@ -125,6 +127,8 @@
}
///////////////////////////////////////////////////////////////////////////////
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
} // namespace spirit
} // namespace boost
Modified: trunk/boost/spirit/home/classic/tree/impl/tree_to_xml.ipp
==============================================================================
--- trunk/boost/spirit/home/classic/tree/impl/tree_to_xml.ipp (original)
+++ trunk/boost/spirit/home/classic/tree/impl/tree_to_xml.ipp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -40,6 +40,8 @@
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
namespace impl {
///////////////////////////////////////////////////////////////////////////
@@ -327,7 +329,7 @@
template <typename AssocContainerT>
inline typename AssocContainerT::value_type::second_type
get_rulename (AssocContainerT const &id_to_name_map,
- boost::spirit::parser_id const &id)
+ BOOST_SPIRIT_CLASSIC_NS::parser_id const &id)
{
typename AssocContainerT::const_iterator it = id_to_name_map.find(id);
if (it != id_to_name_map.end())
@@ -510,9 +512,11 @@
std::basic_string<CharT> const &input_line)
{
return basic_tree_to_xml<CharT>(ostrm, tree, input_line,
- std::map<boost::spirit::parser_id, std::basic_string<CharT> >());
+ std::map<BOOST_SPIRIT_CLASSIC_NS::parser_id, std::basic_string<CharT> >());
}
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
}} // namespace boost::spirit
#undef BOOST_SPIRIT_OSSTREAM
Modified: trunk/boost/spirit/home/classic/tree/parse_tree.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/tree/parse_tree.hpp (original)
+++ trunk/boost/spirit/home/classic/tree/parse_tree.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -9,6 +9,7 @@
#ifndef BOOST_SPIRIT_TREE_PARSE_TREE_HPP
#define BOOST_SPIRIT_TREE_PARSE_TREE_HPP
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/tree/common.hpp>
#include <boost/spirit/home/classic/core/scanner/scanner.hpp>
@@ -17,6 +18,7 @@
///////////////////////////////////////////////////////////////////////////////
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
//////////////////////////////////
// pt_match_policy is simply an id so the correct specialization of tree_policy can be found.
@@ -286,7 +288,9 @@
}
///////////////////////////////////////////////////////////////////////////////
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif
Modified: trunk/boost/spirit/home/classic/tree/parse_tree_fwd.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/tree/parse_tree_fwd.hpp (original)
+++ trunk/boost/spirit/home/classic/tree/parse_tree_fwd.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -8,8 +8,12 @@
#if !defined(BOOST_SPIRIT_TREE_PARSE_TREE_FWD_HPP)
#define BOOST_SPIRIT_TREE_PARSE_TREE_FWD_HPP
+#include <boost/spirit/home/classic/namespace.hpp>
+
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
template <
typename MatchPolicyT,
typename NodeFactoryT,
@@ -27,7 +31,9 @@
template <typename T>
struct gen_pt_node_parser;
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif
Modified: trunk/boost/spirit/home/classic/tree/parse_tree_utils.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/tree/parse_tree_utils.hpp (original)
+++ trunk/boost/spirit/home/classic/tree/parse_tree_utils.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -17,6 +17,7 @@
///////////////////////////////////////////////////////////////////////////////
namespace boost {
namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
///////////////////////////////////////////////////////////////////////////////
//
@@ -54,6 +55,7 @@
typename tree_node<T>::const_tree_iterator> &nodes);
///////////////////////////////////////////////////////////////////////////////
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
} // namespace spirit
} // namespace boost
Modified: trunk/boost/spirit/home/classic/tree/tree_to_xml.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/tree/tree_to_xml.hpp (original)
+++ trunk/boost/spirit/home/classic/tree/tree_to_xml.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -10,8 +10,12 @@
#if !defined(TREE_TO_XML_HPP)
#define TREE_TO_XML_HPP
+#include <boost/spirit/home/classic/namespace.hpp>
+
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
namespace impl {
template <typename CharT> struct default_string;
}
@@ -102,7 +106,9 @@
basic_tree_to_xml<char>(ostrm, tree, input_line);
}
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#include <boost/spirit/home/classic/tree/impl/tree_to_xml.ipp>
Modified: trunk/boost/spirit/home/classic/tree/typeof.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/tree/typeof.hpp (original)
+++ trunk/boost/spirit/home/classic/tree/typeof.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -22,58 +22,58 @@
// common.hpp (has forward header)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::tree_node,1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::node_iter_data,2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::node_iter_data_factory,1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::node_val_data_factory,1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::node_all_val_data_factory,1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::tree_match,3)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::tree_policy)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::common_tree_match_policy,4)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::common_tree_tree_policy,2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::no_tree_gen_node_parser,1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::leaf_node_parser,1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::node_parser,2)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::discard_node_op)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::reduced_node_op)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::infix_node_op)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::discard_first_node_op)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::discard_last_node_op)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::inner_node_op)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::action_directive_parser,2)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::access_match_action)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::access_match_action::action,2)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::access_node_action)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::access_node_action::action,2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::tree_parse_info,3)
-
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::node_iter_data,1)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::node_iter_data_factory<boost::spirit::nil_t>)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::node_val_data_factory<boost::spirit::nil_t>)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::node_all_val_data_factory<boost::spirit::nil_t>)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::tree_match,2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::tree_match,1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::tree_parse_info,2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::tree_parse_info,1)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::tree_node,1)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::node_iter_data,2)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::node_iter_data_factory,1)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::node_val_data_factory,1)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::node_all_val_data_factory,1)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::tree_match,3)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::tree_policy)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::common_tree_match_policy,4)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::common_tree_tree_policy,2)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::no_tree_gen_node_parser,1)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::leaf_node_parser,1)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::node_parser,2)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::discard_node_op)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::reduced_node_op)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::infix_node_op)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::discard_first_node_op)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::discard_last_node_op)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::inner_node_op)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::action_directive_parser,2)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::access_match_action)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::access_match_action::action,2)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::access_node_action)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::access_node_action::action,2)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::tree_parse_info,3)
+
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::node_iter_data,1)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::node_iter_data_factory<BOOST_SPIRIT_CLASSIC_NS::nil_t>)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::node_val_data_factory<BOOST_SPIRIT_CLASSIC_NS::nil_t>)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::node_all_val_data_factory<BOOST_SPIRIT_CLASSIC_NS::nil_t>)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::tree_match,2)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::tree_match,1)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::tree_parse_info,2)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::tree_parse_info,1)
// parse_tree.hpp (has forward header)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::pt_tree_policy,2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::pt_match_policy,2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::gen_pt_node_parser,1)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::pt_tree_policy,2)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::pt_match_policy,2)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::gen_pt_node_parser,1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::pt_match_policy,1)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::pt_match_policy,1)
// ast.hpp (has forward header)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::ast_tree_policy,2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::ast_match_policy,2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::gen_ast_node_parser,1)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::root_node_op)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::ast_tree_policy,2)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::ast_match_policy,2)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::gen_ast_node_parser,1)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::root_node_op)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::ast_match_policy,1)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::ast_match_policy,1)
#endif
Modified: trunk/boost/spirit/home/classic/utility/chset.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/utility/chset.hpp (original)
+++ trunk/boost/spirit/home/classic/utility/chset.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -11,12 +11,15 @@
///////////////////////////////////////////////////////////////////////////////
#include <boost/shared_ptr.hpp>
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/core/primitives/primitives.hpp>
#include <boost/spirit/home/classic/utility/impl/chset/basic_chset.hpp>
///////////////////////////////////////////////////////////////////////////////
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
namespace utility { namespace impl {
// This is here because some compilers choke on out-of-line member
@@ -174,7 +177,9 @@
#endif
///////////////////////////////////////////////////////////////////////////////
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif
Modified: trunk/boost/spirit/home/classic/utility/chset_operators.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/utility/chset_operators.hpp (original)
+++ trunk/boost/spirit/home/classic/utility/chset_operators.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -10,11 +10,14 @@
#define BOOST_SPIRIT_CHSET_OPERATORS_HPP
///////////////////////////////////////////////////////////////////////////////
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/utility/chset.hpp>
///////////////////////////////////////////////////////////////////////////////
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////////
//
// chset free operators
@@ -390,7 +393,9 @@
operator^(nothing_parser a, chset<CharT> const& b);
///////////////////////////////////////////////////////////////////////////////
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif
Modified: trunk/boost/spirit/home/classic/utility/confix.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/utility/confix.hpp (original)
+++ trunk/boost/spirit/home/classic/utility/confix.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -10,6 +10,7 @@
///////////////////////////////////////////////////////////////////////////////
#include <boost/config.hpp>
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/meta/as_parser.hpp>
#include <boost/spirit/home/classic/core/composite/operators.hpp>
@@ -19,6 +20,8 @@
///////////////////////////////////////////////////////////////////////////////
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////////
//
// confix_parser class
@@ -386,6 +389,8 @@
}
///////////////////////////////////////////////////////////////////////////////
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif
Modified: trunk/boost/spirit/home/classic/utility/confix_fwd.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/utility/confix_fwd.hpp (original)
+++ trunk/boost/spirit/home/classic/utility/confix_fwd.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -8,10 +8,13 @@
#if !defined(BOOST_SPIRIT_CONFIX_FWD_HPP)
#define BOOST_SPIRIT_CONFIX_FWD_HPP
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/core/parser.hpp>
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
struct is_nested;
struct non_nested;
struct is_lexeme;
@@ -27,7 +30,9 @@
template<typename OpenT, typename CloseT>
struct comment_nest_parser;
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif
Modified: trunk/boost/spirit/home/classic/utility/distinct.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/utility/distinct.hpp (original)
+++ trunk/boost/spirit/home/classic/utility/distinct.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -21,6 +21,8 @@
namespace boost {
namespace spirit {
+ BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
//-----------------------------------------------------------------------------
// distinct_parser class
@@ -220,6 +222,7 @@
};
//-----------------------------------------------------------------------------
+ BOOST_SPIRIT_CLASSIC_NAMESPACE_END
} // namespace spirit
} // namespace boost
Modified: trunk/boost/spirit/home/classic/utility/distinct_fwd.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/utility/distinct_fwd.hpp (original)
+++ trunk/boost/spirit/home/classic/utility/distinct_fwd.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -8,8 +8,12 @@
#if !defined(BOOST_SPIRIT_DISTINCT_FWD_HPP)
#define BOOST_SPIRIT_DISTINCT_FWD_HPP
+#include <boost/spirit/home/classic/namespace.hpp>
+
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
template<typename CharT> class chset;
template <typename CharT = char, typename TailT = chset<CharT> >
@@ -24,7 +28,9 @@
template <typename ScannerT = scanner<> >
class dynamic_distinct_directive;
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif
Modified: trunk/boost/spirit/home/classic/utility/escape_char.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/utility/escape_char.hpp (original)
+++ trunk/boost/spirit/home/classic/utility/escape_char.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -14,6 +14,7 @@
#include <cctype>
#include <boost/limits.hpp>
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/debug.hpp>
#include <boost/spirit/home/classic/utility/escape_char_fwd.hpp>
@@ -22,6 +23,8 @@
///////////////////////////////////////////////////////////////////////////////
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////////
//
// escape_char_action class
@@ -174,6 +177,8 @@
escape_char_parser<c_escapes>();
///////////////////////////////////////////////////////////////////////////////
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif
Modified: trunk/boost/spirit/home/classic/utility/escape_char_fwd.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/utility/escape_char_fwd.hpp (original)
+++ trunk/boost/spirit/home/classic/utility/escape_char_fwd.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -8,8 +8,12 @@
#if !defined(BOOST_SPIRIT_ESCAPE_CHAR_FWD_HPP)
#define BOOST_SPIRIT_ESCAPE_CHAR_FWD_HPP
+#include <boost/spirit/home/classic/namespace.hpp>
+
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
template <unsigned long Flags, typename CharT = char>
struct escape_char_parser;
@@ -18,7 +22,9 @@
unsigned long Flags, typename CharT = char>
struct escape_char_action;
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif
Modified: trunk/boost/spirit/home/classic/utility/flush_multi_pass.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/utility/flush_multi_pass.hpp (original)
+++ trunk/boost/spirit/home/classic/utility/flush_multi_pass.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -9,20 +9,23 @@
#define BOOST_SPIRIT_FLUSH_MULTI_PASS_HPP
///////////////////////////////////////////////////////////////////////////////
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/core.hpp>
#include <boost/spirit/home/classic/iterator/multi_pass.hpp>
///////////////////////////////////////////////////////////////////////////////
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
namespace impl {
template <typename T>
void flush_iterator(T &) {}
template <typename T1, typename T2, typename T3, typename T4>
- void flush_iterator(boost::spirit::multi_pass<
- T1, T2, T3, T4, boost::spirit::multi_pass_policies::std_deque> &i)
+ void flush_iterator(BOOST_SPIRIT_CLASSIC_NS::multi_pass<
+ T1, T2, T3, T4, BOOST_SPIRIT_CLASSIC_NS::multi_pass_policies::std_deque> &i)
{
i.clear_queue();
}
@@ -67,6 +70,8 @@
flush_multi_pass_parser const
flush_multi_pass_p = flush_multi_pass_parser();
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif // BOOST_SPIRIT_FLUSH_MULTI_PASS_HPP
Modified: trunk/boost/spirit/home/classic/utility/functor_parser.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/utility/functor_parser.hpp (original)
+++ trunk/boost/spirit/home/classic/utility/functor_parser.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -10,11 +10,14 @@
#define BOOST_SPIRIT_FUNCTOR_PARSER_HPP
///////////////////////////////////////////////////////////////////////////////
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/core/parser.hpp>
///////////////////////////////////////////////////////////////////////////////
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////
//
// functor_parser class
@@ -61,6 +64,8 @@
}
};
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif
Modified: trunk/boost/spirit/home/classic/utility/grammar_def.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/utility/grammar_def.hpp (original)
+++ trunk/boost/spirit/home/classic/utility/grammar_def.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -18,6 +18,7 @@
#include <boost/preprocessor/enum_params.hpp>
#include <boost/preprocessor/repeat.hpp>
#include <boost/preprocessor/repeat_from_to.hpp>
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/phoenix/tuples.hpp>
#include <boost/spirit/home/classic/core/assert.hpp>
#include <boost/spirit/home/classic/utility/grammar_def_fwd.hpp>
@@ -52,6 +53,8 @@
//////////////////////////////////////////////////////////////////////////////
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
struct same {};
///////////////////////////////////////////////////////////////////////////////
@@ -297,6 +300,8 @@
#undef BOOST_SPIRIT_GRAMMAR_STARTRULE_TYPE_LIMIT_A
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif // BOOST_SPIRIT_GRAMMAR_DEF_HPP
Modified: trunk/boost/spirit/home/classic/utility/grammar_def_fwd.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/utility/grammar_def_fwd.hpp (original)
+++ trunk/boost/spirit/home/classic/utility/grammar_def_fwd.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -8,6 +8,7 @@
#if !defined(BOOST_SPIRIT_GRAMMAR_DEF_FWD_HPP)
#define BOOST_SPIRIT_GRAMMAR_DEF_FWD_HPP
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/phoenix/tuples.hpp>
#include <boost/preprocessor/repetition/enum_binary_params.hpp>
@@ -32,6 +33,8 @@
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
template <
typename T,
BOOST_PP_ENUM_BINARY_PARAMS(
@@ -41,7 +44,9 @@
>
class grammar_def;
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif
Modified: trunk/boost/spirit/home/classic/utility/impl/chset.ipp
==============================================================================
--- trunk/boost/spirit/home/classic/utility/impl/chset.ipp (original)
+++ trunk/boost/spirit/home/classic/utility/impl/chset.ipp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -17,6 +17,8 @@
///////////////////////////////////////////////////////////////////////////////
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////////
//
// chset class
@@ -356,6 +358,8 @@
}
///////////////////////////////////////////////////////////////////////////////
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
}} // namespace boost::spirit
#endif
Modified: trunk/boost/spirit/home/classic/utility/impl/chset/basic_chset.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/utility/impl/chset/basic_chset.hpp (original)
+++ trunk/boost/spirit/home/classic/utility/impl/chset/basic_chset.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -12,9 +12,12 @@
///////////////////////////////////////////////////////////////////////////////
#include <bitset>
#include <boost/spirit/home/classic/utility/impl/chset/range_run.hpp>
+#include <boost/spirit/home/classic/namespace.hpp>
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////
//
// basic_chset: basic character set implementation using range_run
@@ -94,7 +97,9 @@
#endif
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif
Modified: trunk/boost/spirit/home/classic/utility/impl/chset/basic_chset.ipp
==============================================================================
--- trunk/boost/spirit/home/classic/utility/impl/chset/basic_chset.ipp (original)
+++ trunk/boost/spirit/home/classic/utility/impl/chset/basic_chset.ipp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -17,6 +17,8 @@
///////////////////////////////////////////////////////////////////////////////
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////////
//
// basic_chset: character set implementation
@@ -235,6 +237,9 @@
}
#endif
+
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
}} // namespace boost::spirit
#endif
Modified: trunk/boost/spirit/home/classic/utility/impl/chset/range_run.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/utility/impl/chset/range_run.hpp (original)
+++ trunk/boost/spirit/home/classic/utility/impl/chset/range_run.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -11,8 +11,14 @@
///////////////////////////////////////////////////////////////////////////////
#include <vector>
+#include <boost/spirit/home/classic/namespace.hpp>
+
///////////////////////////////////////////////////////////////////////////////
-namespace boost { namespace spirit { namespace utility { namespace impl {
+namespace boost { namespace spirit {
+
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
+namespace utility { namespace impl {
///////////////////////////////////////////////////////////////////////////
//
@@ -22,7 +28,7 @@
// the implementation of the range_run class.
//
// { Low level implementation detail }
- // { Not to be confused with boost::spirit::range }
+ // { Not to be confused with BOOST_SPIRIT_CLASSIC_NS::range }
//
///////////////////////////////////////////////////////////////////////////
template <typename CharT>
@@ -110,7 +116,11 @@
run_t run;
};
-}}}} // namespace boost::spirit::utility::impl
+}}
+
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS::utility::impl
#endif
Modified: trunk/boost/spirit/home/classic/utility/impl/chset/range_run.ipp
==============================================================================
--- trunk/boost/spirit/home/classic/utility/impl/chset/range_run.ipp (original)
+++ trunk/boost/spirit/home/classic/utility/impl/chset/range_run.ipp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -19,6 +19,8 @@
///////////////////////////////////////////////////////////////////////////////
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
namespace utility { namespace impl {
///////////////////////////////////////////////////////////////////////
@@ -209,6 +211,8 @@
}} // namespace utility::impl
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
}} // namespace boost::spirit
#endif
Modified: trunk/boost/spirit/home/classic/utility/impl/chset_operators.ipp
==============================================================================
--- trunk/boost/spirit/home/classic/utility/impl/chset_operators.ipp (original)
+++ trunk/boost/spirit/home/classic/utility/impl/chset_operators.ipp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -15,6 +15,8 @@
///////////////////////////////////////////////////////////////////////////////
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////////
//
// chset free operators implementation
@@ -505,20 +507,20 @@
namespace impl {
template <typename CharT>
- inline boost::spirit::range<CharT> const&
+ inline BOOST_SPIRIT_CLASSIC_NS::range<CharT> const&
full()
{
- static boost::spirit::range<CharT> full_(
+ static BOOST_SPIRIT_CLASSIC_NS::range<CharT> full_(
(std::numeric_limits<CharT>::min)(),
(std::numeric_limits<CharT>::max)());
return full_;
}
template <typename CharT>
- inline boost::spirit::range<CharT> const&
+ inline BOOST_SPIRIT_CLASSIC_NS::range<CharT> const&
empty()
{
- static boost::spirit::range<CharT> empty_;
+ static BOOST_SPIRIT_CLASSIC_NS::range<CharT> empty_;
return empty_;
}
}
@@ -656,6 +658,8 @@
}
///////////////////////////////////////////////////////////////////////////////
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
}} // namespace boost::spirit
#endif
Modified: trunk/boost/spirit/home/classic/utility/impl/confix.ipp
==============================================================================
--- trunk/boost/spirit/home/classic/utility/impl/confix.ipp (original)
+++ trunk/boost/spirit/home/classic/utility/impl/confix.ipp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -16,6 +16,8 @@
///////////////////////////////////////////////////////////////////////////////
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////////
//
// Types to distinguish nested and non-nested confix parsers
@@ -211,6 +213,8 @@
} // namespace impl
///////////////////////////////////////////////////////////////////////////////
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
}} // namespace boost::spirit
#endif
Modified: trunk/boost/spirit/home/classic/utility/impl/escape_char.ipp
==============================================================================
--- trunk/boost/spirit/home/classic/utility/impl/escape_char.ipp (original)
+++ trunk/boost/spirit/home/classic/utility/impl/escape_char.ipp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -18,6 +18,8 @@
///////////////////////////////////////////////////////////////////////////////
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////////
//
// escape_char_parser class
@@ -214,6 +216,8 @@
} // namespace impl
///////////////////////////////////////////////////////////////////////////////
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
}} // namespace boost::spirit
#endif
Modified: trunk/boost/spirit/home/classic/utility/impl/lists.ipp
==============================================================================
--- trunk/boost/spirit/home/classic/utility/impl/lists.ipp (original)
+++ trunk/boost/spirit/home/classic/utility/impl/lists.ipp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -15,6 +15,8 @@
///////////////////////////////////////////////////////////////////////////////
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////////
//
// list_parser_type class implementation
@@ -158,6 +160,8 @@
} // namespace impl
///////////////////////////////////////////////////////////////////////////////
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
}} // namespace boost::spirit
#endif
Modified: trunk/boost/spirit/home/classic/utility/impl/regex.ipp
==============================================================================
--- trunk/boost/spirit/home/classic/utility/impl/regex.ipp (original)
+++ trunk/boost/spirit/home/classic/utility/impl/regex.ipp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -15,6 +15,8 @@
///////////////////////////////////////////////////////////////////////////////
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
namespace impl {
///////////////////////////////////////////////////////////////////////////////
@@ -72,6 +74,8 @@
} // namespace impl
///////////////////////////////////////////////////////////////////////////////
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
}} // namespace boost::spirit
#endif // BOOST_SPIRIT_REGEX_IPP
Modified: trunk/boost/spirit/home/classic/utility/lists.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/utility/lists.hpp (original)
+++ trunk/boost/spirit/home/classic/utility/lists.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -10,6 +10,7 @@
///////////////////////////////////////////////////////////////////////////////
#include <boost/config.hpp>
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/meta/as_parser.hpp>
#include <boost/spirit/home/classic/core/parser.hpp>
#include <boost/spirit/home/classic/core/composite/composite.hpp>
@@ -20,6 +21,8 @@
///////////////////////////////////////////////////////////////////////////////
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////////
//
// list_parser class
@@ -330,6 +333,8 @@
const list_parser_gen<> list_p = list_parser_gen<>();
///////////////////////////////////////////////////////////////////////////////
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif
Modified: trunk/boost/spirit/home/classic/utility/lists_fwd.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/utility/lists_fwd.hpp (original)
+++ trunk/boost/spirit/home/classic/utility/lists_fwd.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -8,10 +8,13 @@
#if !defined(BOOST_SPIRIT_LISTS_FWD_HPP)
#define BOOST_SPIRIT_LISTS_FWD_HPP
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/core/parser.hpp>
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
struct no_list_endtoken;
template <
@@ -20,7 +23,9 @@
>
struct list_parser;
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif
Modified: trunk/boost/spirit/home/classic/utility/loops.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/utility/loops.hpp (original)
+++ trunk/boost/spirit/home/classic/utility/loops.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -11,12 +11,15 @@
#define BOOST_SPIRIT_LOOPS_HPP
///////////////////////////////////////////////////////////////////////////////
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/core/parser.hpp>
#include <boost/spirit/home/classic/core/composite/composite.hpp>
///////////////////////////////////////////////////////////////////////////////
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////
//
// fixed_loop class
@@ -307,6 +310,8 @@
return nonfixed_loop_gen <MinT, MaxT> (min, max);
}
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif // #if !defined(BOOST_SPIRIT_LOOPS_HPP)
Modified: trunk/boost/spirit/home/classic/utility/regex.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/utility/regex.hpp (original)
+++ trunk/boost/spirit/home/classic/utility/regex.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -43,6 +43,7 @@
#include <boost/static_assert.hpp>
///////////////////////////////////////////////////////////////////////////////
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/meta/as_parser.hpp>
#include <boost/spirit/home/classic/core/parser.hpp>
#include <boost/spirit/home/classic/utility/impl/regex.ipp>
@@ -51,6 +52,8 @@
///////////////////////////////////////////////////////////////////////////////
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////////
// rxstrlit class
template <typename CharT = char>
@@ -102,6 +105,8 @@
{ return rxstrlit<CharT>(first, last); }
///////////////////////////////////////////////////////////////////////////////
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif // BOOST_SPIRIT_REGEX_HPP
Modified: trunk/boost/spirit/home/classic/utility/rule_parser.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/utility/rule_parser.hpp (original)
+++ trunk/boost/spirit/home/classic/utility/rule_parser.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -283,7 +283,8 @@
# include <boost/detail/workaround.hpp>
# include <boost/call_traits.hpp>
# include <boost/typeof/typeof.hpp>
-# include <boost/spirit/core/parser.hpp>
+# include <boost/spirit/home/classic/namespace.hpp>
+# include <boost/spirit/home/classic/core/parser.hpp>
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# include <boost/preprocessor/cat.hpp>
# include <boost/preprocessor/seq/seq.hpp>
@@ -326,15 +327,19 @@
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// Defines an action placeholder. Use at namespace scope.
# define BOOST_SPIRIT_ACTION_PLACEHOLDER(name) \
- BOOST_SPIRIT_RP_AP_IMPL(name,::boost::spirit::type_of)
+ BOOST_SPIRIT_RP_AP_IMPL(name,::BOOST_SPIRIT_CLASSIC_NS::type_of)
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// Utilities to embed parsers by reference.
namespace boost
{
namespace spirit
{
+ BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
template<class P> class parser_reference;
template<class P> parser_reference<P> embed_by_reference(parser<P> const &);
+
+ BOOST_SPIRIT_CLASSIC_NAMESPACE_END
}
}
//==============================================================================
@@ -404,7 +409,7 @@
\
template< BOOST_SPIRIT_RP_TPL_PARAMS(pars,acts,typename __,1) > \
class name_t \
- : public ::boost::spirit::parser< name_t \
+ : public ::BOOST_SPIRIT_CLASSIC_NS::parser< name_t \
< BOOST_SPIRIT_RP_TPL_PARAMS(pars,acts,__,0) > > \
{ \
class __rule \
@@ -414,7 +419,7 @@
BOOST_SPIRIT_RP_EMIT(MV_STATIC,mbrs,BOOST_PP_IDENTITY(typename)) \
public: \
BOOST_TYPEOF_NESTED_TYPEDEF_TPL(__expr, \
- ::boost::spirit::type_of::depend_on_type<__Dummy>(x) ); \
+ ::BOOST_SPIRIT_CLASSIC_NS::type_of::depend_on_type<__Dummy>(x) ); \
}; \
\
public: \
@@ -451,16 +456,16 @@
\
template<typename Scanner> struct result \
{ \
- typedef typename ::boost::spirit::parser_result< \
+ typedef typename ::BOOST_SPIRIT_CLASSIC_NS::parser_result< \
typename __rule::__expr::type, Scanner>::type type; \
}; \
\
template<typename Scanner> \
- typename ::boost::spirit::parser_result<self_t, Scanner>::type \
+ typename ::BOOST_SPIRIT_CLASSIC_NS::parser_result<self_t, Scanner>::type \
parse(Scanner const & s) const { return __parser.parse(s); } \
\
BOOST_SPIRIT_RP_IF(na,SPIRIT_RP_AP_HANDLER,5) \
- (name_t,np,acts,na,::boost::spirit::type_of) \
+ (name_t,np,acts,na,::BOOST_SPIRIT_CLASSIC_NS::type_of) \
}; \
\
BOOST_PP_IF(np,BOOST_SPIRIT_RP_GEN_FUNC,BOOST_SPIRIT_RP_GLOB_VAR) \
@@ -483,7 +488,7 @@
BOOST_SPIRIT_RP_REGISTER_TYPE(name_t) \
\
class name_t \
- : public ::boost::spirit::parser< name_t > \
+ : public ::BOOST_SPIRIT_CLASSIC_NS::parser< name_t > \
{ \
class __rule \
{ \
@@ -519,12 +524,12 @@
\
template<typename Scanner> struct result \
{ \
- typedef typename ::boost::spirit::parser_result< \
+ typedef typename ::BOOST_SPIRIT_CLASSIC_NS::parser_result< \
__rule::__expr::type, Scanner>::type type; \
}; \
\
template<typename Scanner> \
- typename ::boost::spirit::parser_result<self_t, Scanner>::type \
+ typename ::BOOST_SPIRIT_CLASSIC_NS::parser_result<self_t, Scanner>::type \
parse(Scanner const & s) const { return __parser.parse(s); } \
}; \
\
@@ -627,7 +632,7 @@
name( BOOST_PP_ENUM_BINARY_PARAMS(np,T, const & p) ) \
{ return name_t < void BOOST_PP_ENUM_TRAILING_PARAMS(np,T) > \
(BOOST_PP_ENUM_PARAMS(np,p) BOOST_PP_ENUM_TRAILING_PARAMS(na, \
- ::boost::spirit::type_of::nop_functor() BOOST_PP_INTERCEPT) ); \
+ ::BOOST_SPIRIT_CLASSIC_NS::type_of::nop_functor() BOOST_PP_INTERCEPT) ); \
}
// RP_GEN_OPAQUE
//
@@ -642,7 +647,7 @@
// parameters
# define BOOST_SPIRIT_RP_GLOB_VAR(name,name_t,np,na) \
static name_t <void> const name = name_t <void>(BOOST_PP_ENUM_PARAMS(na, \
- ::boost::spirit::type_of::nop_functor() BOOST_PP_INTERCEPT) );
+ ::BOOST_SPIRIT_CLASSIC_NS::type_of::nop_functor() BOOST_PP_INTERCEPT) );
// RP_GLOB_OPAQUE
//
@@ -761,17 +766,17 @@
# define BOOST_SPIRIT_RP__AP_TEMPLATE_PARAMS(r,data,i,elem) \
, BOOST_PP_CAT(BOOST_PP_TUPLE_ELEM(2,0,data),i) \
BOOST_PP_EXPR_IIF(BOOST_PP_TUPLE_ELEM(2,1,data), \
- = ::boost::spirit::type_of::nop_functor)
+ = ::BOOST_SPIRIT_CLASSIC_NS::type_of::nop_functor)
// AP_REBOUND_ARGS
# define BOOST_SPIRIT_RP__AP_REBOUND_ARGS(r,data,i,elem) \
BOOST_PP_COMMA_IF(i) \
- ::boost::spirit::type_of::get_placeholdee< __action_placeholder:: elem > \
+ ::BOOST_SPIRIT_CLASSIC_NS::type_of::get_placeholdee< __action_placeholder:: elem > \
( __a ## i , data )
// AP_REBOUND_TPL_ARGS
# define BOOST_SPIRIT_RP__AP_REBOUND_TPL_ARGS(r,data,i,elem) \
- , typename ::boost::spirit::type_of::placeholdee< \
+ , typename ::BOOST_SPIRIT_CLASSIC_NS::type_of::placeholdee< \
__action_placeholder:: elem , __A ## i, data >::type
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -848,6 +853,8 @@
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
// Wrapper to embed a parser by reference
template<class P> class parser_reference
@@ -874,18 +881,24 @@
};
template<class P> parser_reference<P>
- embed_by_reference(::boost::spirit::parser<P> & p)
+ embed_by_reference(::BOOST_SPIRIT_CLASSIC_NS::parser<P> & p)
{ return p; }
-} } // namespace ::boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+} } // namespace ::BOOST_SPIRIT_CLASSIC_NS
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::parser_reference, 1)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::parser_reference, 1)
//------------------------------------------------------------------------------
// Expression templates for action placeholders.
//------------------------------------------------------------------------------
-namespace boost { namespace spirit { namespace type_of {
+namespace boost { namespace spirit {
+
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
+namespace type_of {
// No-operation functor
@@ -1078,16 +1091,24 @@
{ return concatenate_actions(a,c.action()); }
};
-} } } // namespace ::boost::spirit::type_of
+}
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::type_of::nop_functor)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::type_of::composite_action,2)
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+} } // namespace ::BOOST_SPIRIT_CLASSIC_NS::type_of
+
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::type_of::nop_functor)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::type_of::composite_action,2)
//------------------------------------------------------------------------------
// Misc.utilities
//------------------------------------------------------------------------------
-namespace boost { namespace spirit { namespace type_of {
+namespace boost { namespace spirit {
+
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
+namespace type_of {
// Utility function to create a dependency to a template argument.
@@ -1100,8 +1121,8 @@
// trick.
#define BOOST_SPIRIT_RP_TYPE(x) \
- ::boost::spirit::type_of::remove_special_fptr \
- < ::boost::spirit::type_of::special_result & (*) x >::type
+ ::BOOST_SPIRIT_CLASSIC_NS::type_of::remove_special_fptr \
+ < ::BOOST_SPIRIT_CLASSIC_NS::type_of::special_result & (*) x >::type
struct special_result;
@@ -1109,7 +1130,11 @@
template<typename T> struct remove_special_fptr< special_result & (*)(T) >
{ typedef T type; };
-} } } // namespace ::boost::spirit::type_of
+}
+
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+} } // namespace ::BOOST_SPIRIT_CLASSIC_NS::type_of
//------------------------------------------------------------------------------
#endif
Modified: trunk/boost/spirit/home/classic/utility/scoped_lock.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/utility/scoped_lock.hpp (original)
+++ trunk/boost/spirit/home/classic/utility/scoped_lock.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -9,6 +9,7 @@
#define BOOST_SPIRIT_UTILITY_SCOPED_LOCK_HPP
///////////////////////////////////////////////////////////////////////////////
+#include <boost/spirit/home/classic/namespace.hpp>
#if !defined(BOOST_SPIRIT_COMPOSITE_HPP)
#include <boost/spirit/home/classic/core/composite.hpp>
#endif
@@ -16,6 +17,8 @@
///////////////////////////////////////////////////////////////////////////////
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
///////////////////////////////////////////////////////////////////////////
//
// scoped_lock_parser class
@@ -78,7 +81,7 @@
>
operator[](ParserT const &p) const
{
- typedef ::boost::spirit::as_parser<ParserT> as_parser_t;
+ typedef ::BOOST_SPIRIT_CLASSIC_NS::as_parser<ParserT> as_parser_t;
typedef typename as_parser_t::type parser_t;
return scoped_lock_parser<mutex_t, parser_t>
@@ -103,5 +106,7 @@
return scoped_lock_parser_gen<MutexT>(mutex);
}
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#endif // BOOST_SPIRIT_UTILITY_SCOPED_LOCK_HPP
Modified: trunk/boost/spirit/home/classic/utility/typeof.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/utility/typeof.hpp (original)
+++ trunk/boost/spirit/home/classic/utility/typeof.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -10,6 +10,7 @@
#include <boost/typeof/typeof.hpp>
+#include <boost/spirit/home/classic/namespace.hpp>
#include <boost/spirit/home/classic/core/typeof.hpp>
#include <boost/spirit/home/classic/utility/escape_char_fwd.hpp>
@@ -20,6 +21,8 @@
namespace boost { namespace spirit {
+BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
+
// chset.hpp
template<typename CharT> class chset;
@@ -40,7 +43,9 @@
// scoped_lock.hpp
template<class MutexT, class ParserT> struct scoped_lock_parser;
-}} // namespace boost::spirit
+BOOST_SPIRIT_CLASSIC_NAMESPACE_END
+
+}} // namespace BOOST_SPIRIT_CLASSIC_NS
#include BOOST_TYPEOF_INCREMENT_REGISTRATION_GROUP()
@@ -48,95 +53,95 @@
// chset.hpp
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::chset,1)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::chset,1)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::chset<char>)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::chset<wchar_t>)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::chset<char>)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::chset<wchar_t>)
// escape_char.hpp (has forward header)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::escape_char_parser,(BOOST_TYPEOF_INTEGRAL(unsigned long))(typename))
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::escape_char_action,(class)(typename)(BOOST_TYPEOF_INTEGRAL(unsigned long))(typename))
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::escape_char_parser,(BOOST_TYPEOF_INTEGRAL(unsigned long))(typename))
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::escape_char_action,(class)(typename)(BOOST_TYPEOF_INTEGRAL(unsigned long))(typename))
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::escape_char_parser,(BOOST_TYPEOF_INTEGRAL(unsigned long)))
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::escape_char_action,(class)(typename)(BOOST_TYPEOF_INTEGRAL(unsigned long)))
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::escape_char_parser,(BOOST_TYPEOF_INTEGRAL(unsigned long)))
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::escape_char_action,(class)(typename)(BOOST_TYPEOF_INTEGRAL(unsigned long)))
// functor_parser.hpp
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::functor_parser,1)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::functor_parser,1)
// loops.hpp
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::fixed_loop,2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::finite_loop,3)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::infinite_loop,2)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::fixed_loop,2)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::finite_loop,3)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::infinite_loop,2)
// regex.hpp
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::rxstrlit,1)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::rxstrlit,1)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::rxstrlit<char>)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::rxstrlit<wchar_t>)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::rxstrlit<char>)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::rxstrlit<wchar_t>)
// confix.hpp (has forward header)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::confix_parser, 6)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::confix_parser, 5)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::confix_parser, 4)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::confix_parser, 3)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::comment_nest_parser, 2)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::is_nested)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::non_nested)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::is_lexeme)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::non_lexeme)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::confix_parser, 6)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::confix_parser, 5)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::confix_parser, 4)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::confix_parser, 3)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::comment_nest_parser, 2)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::is_nested)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::non_nested)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::is_lexeme)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::non_lexeme)
// lists.hpp (has forward header)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::list_parser,4)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::list_parser,3)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::list_parser,2)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::no_list_endtoken)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::list_parser,4)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::list_parser,3)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::list_parser,2)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::no_list_endtoken)
// distinct.hpp (has forward header)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::distinct_parser,2)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::distinct_parser,1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::dynamic_distinct_parser,1)
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::distinct_parser<>)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::distinct_parser,2)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::distinct_parser,1)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::dynamic_distinct_parser,1)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::distinct_parser<>)
// flush_multi_pass.hpp
-BOOST_TYPEOF_REGISTER_TYPE(boost::spirit::flush_multi_pass_parser)
+BOOST_TYPEOF_REGISTER_TYPE(BOOST_SPIRIT_CLASSIC_NS::flush_multi_pass_parser)
// scoped_lock.hpp
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::scoped_lock_parser,2)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::scoped_lock_parser,2)
// grammar_gen.hpp (has forward header)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::grammar_def,BOOST_SPIRIT_GRAMMAR_STARTRULE_TYPE_LIMIT)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::grammar_def,BOOST_SPIRIT_GRAMMAR_STARTRULE_TYPE_LIMIT)
#if BOOST_SPIRIT_GRAMMAR_STARTRULE_TYPE_LIMIT > 12
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::grammar_def,12)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::grammar_def,12)
#endif
#if BOOST_SPIRIT_GRAMMAR_STARTRULE_TYPE_LIMIT > 9
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::grammar_def, 9)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::grammar_def, 9)
#endif
#if BOOST_SPIRIT_GRAMMAR_STARTRULE_TYPE_LIMIT > 6
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::grammar_def, 6)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::grammar_def, 6)
#endif
#if BOOST_SPIRIT_GRAMMAR_STARTRULE_TYPE_LIMIT > 3
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::spirit::grammar_def, 3)
+BOOST_TYPEOF_REGISTER_TEMPLATE(BOOST_SPIRIT_CLASSIC_NS::grammar_def, 3)
#endif
Modified: trunk/libs/spirit/classic/change_log.html
==============================================================================
--- trunk/libs/spirit/classic/change_log.html (original)
+++ trunk/libs/spirit/classic/change_log.html 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -8,6 +8,36 @@
<body>
<h2>Spirit Change Log</h2>
+<h2>1.8.7</h2>
+<ul>
+ <li>Integrated the Spirit V1.8.x code base with Spirit V2. Spirit V1.8.x is
+ now called
+ <strong>Spirit Classic.</strong> Even if the directory
+ structure has changed (the
+ <strong>Spirit Classic</strong> headers are now moved to the
+ '$BOOST_ROOT/boost/spirit/home/classic' directory), we created forwarding
+ headers allowing to compile existing applications without any change.
+ These forwarding headers are deprecated, though, which will result in
+ corresponding warnings generated for each of the headers. The forwarding
+ headers are expected to be removed in the future.
+ <br />
+ The recommended way of using Spirit Classic is now to include header
+ files from the directory '$BOOST_ROOT/boost/spirit/include'. All files of
+ <strong>Spirit Classic</strong>
+ have now a 'classic_' prefixed to their name. For example the include
+ <br/>
+ <br><code> #include <boost/spirit/core/core.hpp></code><br/>
+ <br/>
+ now should be written as:
+ <br/>
+ <br/><code> #include <boost/spirit/include/classic_core.hpp></code><br/>
+ <br/>
+ To avoid namespace conflicts with the new Spirit V2 library we moved <strong>Spirit
+ Classic</strong> into the <tt>namespace boost::spirit::classic</tt>. This change will be automatically deactivated whenever the deprecated include files are
+ being used. This ensures full backwards compatibility for existing applications.
+ <br />
+ For more details about this change please consult the documentation.</li>
+</ul>
<h2>1.8.6</h2>
<ul>
<li>Fixed a integer overflow bug preventing to fail parsing on certain large integers. This bug was reported and fixed by Michael Andersen Nexø</li>
Modified: trunk/libs/spirit/classic/example/fundamental/ast_calc.cpp
==============================================================================
--- trunk/libs/spirit/classic/example/fundamental/ast_calc.cpp (original)
+++ trunk/libs/spirit/classic/example/fundamental/ast_calc.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -32,7 +32,7 @@
// This example shows how to use an AST.
////////////////////////////////////////////////////////////////////////////
using namespace std;
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
typedef char const* iterator_t;
typedef tree_match<iterator_t> parse_tree_match_t;
Modified: trunk/libs/spirit/classic/example/fundamental/bind.cpp
==============================================================================
--- trunk/libs/spirit/classic/example/fundamental/bind.cpp (original)
+++ trunk/libs/spirit/classic/example/fundamental/bind.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -22,7 +22,7 @@
///////////////////////////////////////////////////////////////////////////////
using namespace std;
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
using namespace boost;
///////////////////////////////////////////////////////////////////////////////
@@ -39,7 +39,7 @@
bool
parse(char const* str)
{
- return boost::spirit::parse(str,
+ return BOOST_SPIRIT_CLASSIC_NS::parse(str,
// Begin grammar
(
Modified: trunk/libs/spirit/classic/example/fundamental/boiler_plate.cpp
==============================================================================
--- trunk/libs/spirit/classic/example/fundamental/boiler_plate.cpp (original)
+++ trunk/libs/spirit/classic/example/fundamental/boiler_plate.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -19,7 +19,7 @@
///////////////////////////////////////////////////////////////////////////////
using namespace std;
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
///////////////////////////////////////////////////////////////////////////////
//
Modified: trunk/libs/spirit/classic/example/fundamental/calc_debug.cpp
==============================================================================
--- trunk/libs/spirit/classic/example/fundamental/calc_debug.cpp (original)
+++ trunk/libs/spirit/classic/example/fundamental/calc_debug.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -28,7 +28,7 @@
////////////////////////////////////////////////////////////////////////////
using namespace std;
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
////////////////////////////////////////////////////////////////////////////
//
Modified: trunk/libs/spirit/classic/example/fundamental/calc_plain.cpp
==============================================================================
--- trunk/libs/spirit/classic/example/fundamental/calc_plain.cpp (original)
+++ trunk/libs/spirit/classic/example/fundamental/calc_plain.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -21,7 +21,7 @@
////////////////////////////////////////////////////////////////////////////
using namespace std;
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
////////////////////////////////////////////////////////////////////////////
//
Modified: trunk/libs/spirit/classic/example/fundamental/comments.cpp
==============================================================================
--- trunk/libs/spirit/classic/example/fundamental/comments.cpp (original)
+++ trunk/libs/spirit/classic/example/fundamental/comments.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -31,7 +31,7 @@
///////////////////////////////////////////////////////////////////////////////
// used namespaces
using namespace std;
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
///////////////////////////////////////////////////////////////////////////////
// actor called after successfully matching a single character
Modified: trunk/libs/spirit/classic/example/fundamental/complex_number.cpp
==============================================================================
--- trunk/libs/spirit/classic/example/fundamental/complex_number.cpp (original)
+++ trunk/libs/spirit/classic/example/fundamental/complex_number.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -20,7 +20,7 @@
///////////////////////////////////////////////////////////////////////////////
using namespace std;
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
///////////////////////////////////////////////////////////////////////////////
//
Modified: trunk/libs/spirit/classic/example/fundamental/error_handling.cpp
==============================================================================
--- trunk/libs/spirit/classic/example/fundamental/error_handling.cpp (original)
+++ trunk/libs/spirit/classic/example/fundamental/error_handling.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -18,7 +18,7 @@
#include <cassert>
using namespace std;
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
struct handler
{
Modified: trunk/libs/spirit/classic/example/fundamental/error_reporting.cpp
==============================================================================
--- trunk/libs/spirit/classic/example/fundamental/error_reporting.cpp (original)
+++ trunk/libs/spirit/classic/example/fundamental/error_reporting.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -21,7 +21,7 @@
///////////////////////////////////////////////////////////////////////////////
using namespace std;
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
static short errcount = 0;
Modified: trunk/libs/spirit/classic/example/fundamental/file_parser.cpp
==============================================================================
--- trunk/libs/spirit/classic/example/fundamental/file_parser.cpp (original)
+++ trunk/libs/spirit/classic/example/fundamental/file_parser.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -20,7 +20,7 @@
#include <iostream>
///////////////////////////////////////////////////////////////////////////////
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
////////////////////////////////////////////////////////////////////////////
//
Modified: trunk/libs/spirit/classic/example/fundamental/full_calc.cpp
==============================================================================
--- trunk/libs/spirit/classic/example/fundamental/full_calc.cpp (original)
+++ trunk/libs/spirit/classic/example/fundamental/full_calc.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -24,7 +24,7 @@
////////////////////////////////////////////////////////////////////////////
using namespace std;
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
////////////////////////////////////////////////////////////////////////////
//
Modified: trunk/libs/spirit/classic/example/fundamental/functor_parser.cpp
==============================================================================
--- trunk/libs/spirit/classic/example/fundamental/functor_parser.cpp (original)
+++ trunk/libs/spirit/classic/example/fundamental/functor_parser.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -21,7 +21,7 @@
//
///////////////////////////////////////////////////////////////////////////////
using namespace std;
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
///////////////////////////////////////////////////////////////////////////////
//
Modified: trunk/libs/spirit/classic/example/fundamental/list_parser.cpp
==============================================================================
--- trunk/libs/spirit/classic/example/fundamental/list_parser.cpp (original)
+++ trunk/libs/spirit/classic/example/fundamental/list_parser.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -27,7 +27,7 @@
///////////////////////////////////////////////////////////////////////////////
using namespace std;
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
///////////////////////////////////////////////////////////////////////////////
// actor, attached to the list_p parser
Modified: trunk/libs/spirit/classic/example/fundamental/matching_tags.cpp
==============================================================================
--- trunk/libs/spirit/classic/example/fundamental/matching_tags.cpp (original)
+++ trunk/libs/spirit/classic/example/fundamental/matching_tags.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -22,7 +22,7 @@
////////////////////////////////////////////////////////////////////////////
using namespace std;
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
using namespace phoenix;
////////////////////////////////////////////////////////////////////////////
@@ -30,7 +30,7 @@
// HTML/XML like tag matching grammar
//
////////////////////////////////////////////////////////////////////////////
-struct tags_closure : boost::spirit::closure<tags_closure, string>
+struct tags_closure : BOOST_SPIRIT_CLASSIC_NS::closure<tags_closure, string>
{
member1 tag;
};
Modified: trunk/libs/spirit/classic/example/fundamental/more_calculators/ast_calc2.cpp
==============================================================================
--- trunk/libs/spirit/classic/example/fundamental/more_calculators/ast_calc2.cpp (original)
+++ trunk/libs/spirit/classic/example/fundamental/more_calculators/ast_calc2.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -18,7 +18,7 @@
// tree_val_node
////////////////////////////////////////////////////////////////////////////
using namespace std;
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
typedef char const* iterator_t;
typedef tree_match<iterator_t, node_iter_data_factory<> >
Modified: trunk/libs/spirit/classic/example/fundamental/more_calculators/calc_with_variables.cpp
==============================================================================
--- trunk/libs/spirit/classic/example/fundamental/more_calculators/calc_with_variables.cpp (original)
+++ trunk/libs/spirit/classic/example/fundamental/more_calculators/calc_with_variables.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -21,7 +21,7 @@
#include <string>
using namespace std;
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
///////////////////////////////////////////////////////////////////////////////
//
Modified: trunk/libs/spirit/classic/example/fundamental/more_calculators/phoenix_subrule_calc.cpp
==============================================================================
--- trunk/libs/spirit/classic/example/fundamental/more_calculators/phoenix_subrule_calc.cpp (original)
+++ trunk/libs/spirit/classic/example/fundamental/more_calculators/phoenix_subrule_calc.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -24,7 +24,7 @@
///////////////////////////////////////////////////////////////////////////////
using namespace std;
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
using namespace phoenix;
///////////////////////////////////////////////////////////////////////////////
@@ -40,7 +40,7 @@
// driver code that uses the calculator below).
//
///////////////////////////////////////////////////////////////////////////////
-struct calc_closure : boost::spirit::closure<calc_closure, double>
+struct calc_closure : BOOST_SPIRIT_CLASSIC_NS::closure<calc_closure, double>
{
member1 val;
};
Modified: trunk/libs/spirit/classic/example/fundamental/more_calculators/primitive_calc.cpp
==============================================================================
--- trunk/libs/spirit/classic/example/fundamental/more_calculators/primitive_calc.cpp (original)
+++ trunk/libs/spirit/classic/example/fundamental/more_calculators/primitive_calc.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -22,7 +22,7 @@
///////////////////////////////////////////////////////////////////////////////
using namespace std;
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
using namespace phoenix;
///////////////////////////////////////////////////////////////////////////////
Modified: trunk/libs/spirit/classic/example/fundamental/more_calculators/rpn_calc.cpp
==============================================================================
--- trunk/libs/spirit/classic/example/fundamental/more_calculators/rpn_calc.cpp (original)
+++ trunk/libs/spirit/classic/example/fundamental/more_calculators/rpn_calc.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -24,7 +24,7 @@
///////////////////////////////////////////////////////////////////////////////
using namespace std;
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
using namespace phoenix;
///////////////////////////////////////////////////////////////////////////////
@@ -73,7 +73,7 @@
// Notice how power(x, y) is lazily implemented using Phoenix function.
function<pow_> power;
-struct calc_closure : boost::spirit::closure<calc_closure, double, double>
+struct calc_closure : BOOST_SPIRIT_CLASSIC_NS::closure<calc_closure, double, double>
{
member1 x;
member2 y;
Modified: trunk/libs/spirit/classic/example/fundamental/more_calculators/vmachine_calc.cpp
==============================================================================
--- trunk/libs/spirit/classic/example/fundamental/more_calculators/vmachine_calc.cpp (original)
+++ trunk/libs/spirit/classic/example/fundamental/more_calculators/vmachine_calc.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -21,7 +21,7 @@
////////////////////////////////////////////////////////////////////////////
using namespace std;
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
///////////////////////////////////////////////////////////////////////////////
//
Modified: trunk/libs/spirit/classic/example/fundamental/number_list.cpp
==============================================================================
--- trunk/libs/spirit/classic/example/fundamental/number_list.cpp (original)
+++ trunk/libs/spirit/classic/example/fundamental/number_list.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -22,7 +22,7 @@
///////////////////////////////////////////////////////////////////////////////
using namespace std;
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
///////////////////////////////////////////////////////////////////////////////
//
Modified: trunk/libs/spirit/classic/example/fundamental/parse_tree_calc1.cpp
==============================================================================
--- trunk/libs/spirit/classic/example/fundamental/parse_tree_calc1.cpp (original)
+++ trunk/libs/spirit/classic/example/fundamental/parse_tree_calc1.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -30,7 +30,7 @@
////////////////////////////////////////////////////////////////////////////
// This example shows how to use a parse tree
using namespace std;
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
// Here's some typedefs to simplify things
typedef char const* iterator_t;
Modified: trunk/libs/spirit/classic/example/fundamental/phoenix_calc.cpp
==============================================================================
--- trunk/libs/spirit/classic/example/fundamental/phoenix_calc.cpp (original)
+++ trunk/libs/spirit/classic/example/fundamental/phoenix_calc.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -21,7 +21,7 @@
////////////////////////////////////////////////////////////////////////////
using namespace std;
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
using namespace phoenix;
////////////////////////////////////////////////////////////////////////////
@@ -36,7 +36,7 @@
// driver code that uses the calculator below).
//
////////////////////////////////////////////////////////////////////////////
-struct calc_closure : boost::spirit::closure<calc_closure, double>
+struct calc_closure : BOOST_SPIRIT_CLASSIC_NS::closure<calc_closure, double>
{
member1 val;
};
Modified: trunk/libs/spirit/classic/example/fundamental/position_iterator/position_iterator.cpp
==============================================================================
--- trunk/libs/spirit/classic/example/fundamental/position_iterator/position_iterator.cpp (original)
+++ trunk/libs/spirit/classic/example/fundamental/position_iterator/position_iterator.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -24,7 +24,7 @@
///////////////////////////////////////////////////////////////////////////////
using namespace std;
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
///////////////////////////////////////////////////////////////////////////////
//
Modified: trunk/libs/spirit/classic/example/fundamental/refactoring.cpp
==============================================================================
--- trunk/libs/spirit/classic/example/fundamental/refactoring.cpp (original)
+++ trunk/libs/spirit/classic/example/fundamental/refactoring.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -19,7 +19,7 @@
///////////////////////////////////////////////////////////////////////////////
// used namespaces
using namespace std;
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
///////////////////////////////////////////////////////////////////////////////
// actor, used by the refactor_action_p test
Modified: trunk/libs/spirit/classic/example/fundamental/regular_expression.cpp
==============================================================================
--- trunk/libs/spirit/classic/example/fundamental/regular_expression.cpp (original)
+++ trunk/libs/spirit/classic/example/fundamental/regular_expression.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -43,7 +43,7 @@
///////////////////////////////////////////////////////////////////////////////
// used namespaces
using namespace std;
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
///////////////////////////////////////////////////////////////////////////////
// main entry point
Modified: trunk/libs/spirit/classic/example/fundamental/roman_numerals.cpp
==============================================================================
--- trunk/libs/spirit/classic/example/fundamental/roman_numerals.cpp (original)
+++ trunk/libs/spirit/classic/example/fundamental/roman_numerals.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -21,7 +21,7 @@
///////////////////////////////////////////////////////////////////////////////
using namespace std;
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
///////////////////////////////////////////////////////////////////////////////
//
Modified: trunk/libs/spirit/classic/example/fundamental/stuff_vector.cpp
==============================================================================
--- trunk/libs/spirit/classic/example/fundamental/stuff_vector.cpp (original)
+++ trunk/libs/spirit/classic/example/fundamental/stuff_vector.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -24,7 +24,7 @@
///////////////////////////////////////////////////////////////////////////////
using namespace std;
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
using namespace phoenix;
///////////////////////////////////////////////////////////////////////////////
Modified: trunk/libs/spirit/classic/example/fundamental/stuff_vector2.cpp
==============================================================================
--- trunk/libs/spirit/classic/example/fundamental/stuff_vector2.cpp (original)
+++ trunk/libs/spirit/classic/example/fundamental/stuff_vector2.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -25,7 +25,7 @@
///////////////////////////////////////////////////////////////////////////////
using namespace std;
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
using namespace phoenix;
///////////////////////////////////////////////////////////////////////////////
Modified: trunk/libs/spirit/classic/example/fundamental/subrule_calc.cpp
==============================================================================
--- trunk/libs/spirit/classic/example/fundamental/subrule_calc.cpp (original)
+++ trunk/libs/spirit/classic/example/fundamental/subrule_calc.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -22,7 +22,7 @@
#include <string>
using namespace std;
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
///////////////////////////////////////////////////////////////////////////////
//
Modified: trunk/libs/spirit/classic/example/fundamental/sum.cpp
==============================================================================
--- trunk/libs/spirit/classic/example/fundamental/sum.cpp (original)
+++ trunk/libs/spirit/classic/example/fundamental/sum.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -22,7 +22,7 @@
///////////////////////////////////////////////////////////////////////////////
using namespace std;
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
using namespace phoenix;
///////////////////////////////////////////////////////////////////////////////
Modified: trunk/libs/spirit/classic/example/fundamental/thousand_separated.cpp
==============================================================================
--- trunk/libs/spirit/classic/example/fundamental/thousand_separated.cpp (original)
+++ trunk/libs/spirit/classic/example/fundamental/thousand_separated.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -22,7 +22,7 @@
///////////////////////////////////////////////////////////////////////////////
using namespace std;
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
template <typename T>
struct ts_real_parser_policies : public ureal_parser_policies<T>
Modified: trunk/libs/spirit/classic/example/fundamental/tree_calc_grammar.hpp
==============================================================================
--- trunk/libs/spirit/classic/example/fundamental/tree_calc_grammar.hpp (original)
+++ trunk/libs/spirit/classic/example/fundamental/tree_calc_grammar.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -9,7 +9,7 @@
#ifndef BOOST_SPIRIT_TREE_CALC_GRAMMAR_HPP_
#define BOOST_SPIRIT_TREE_CALC_GRAMMAR_HPP_
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
///////////////////////////////////////////////////////////////////////////////
//
Modified: trunk/libs/spirit/classic/example/intermediate/ipv4.cpp
==============================================================================
--- trunk/libs/spirit/classic/example/intermediate/ipv4.cpp (original)
+++ trunk/libs/spirit/classic/example/intermediate/ipv4.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -121,7 +121,7 @@
//
///////////////////////////////////////////////////////////////////////////////
using namespace std;
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
using namespace phoenix;
struct ipv4_prefix_data
Modified: trunk/libs/spirit/classic/example/intermediate/ipv4_opt.cpp
==============================================================================
--- trunk/libs/spirit/classic/example/intermediate/ipv4_opt.cpp (original)
+++ trunk/libs/spirit/classic/example/intermediate/ipv4_opt.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -33,7 +33,7 @@
//
///////////////////////////////////////////////////////////////////////////////
using namespace std;
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
using namespace phoenix;
struct ipv4_prefix_data
Modified: trunk/libs/spirit/classic/example/intermediate/parameters.cpp
==============================================================================
--- trunk/libs/spirit/classic/example/intermediate/parameters.cpp (original)
+++ trunk/libs/spirit/classic/example/intermediate/parameters.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -33,7 +33,7 @@
///////////////////////////////////////////////////////////////////////////////
// used namespaces
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
using namespace phoenix;
using namespace std;
@@ -99,7 +99,7 @@
// used closure type
//
///////////////////////////////////////////////////////////////////////////////
-struct var_decl_closure : boost::spirit::closure<var_decl_closure, declaration_type>
+struct var_decl_closure : BOOST_SPIRIT_CLASSIC_NS::closure<var_decl_closure, declaration_type>
{
member1 val;
};
@@ -116,7 +116,7 @@
{
public:
typedef
- symbol_inserter<T, boost::spirit::impl::tst<T, char> >
+ symbol_inserter<T, BOOST_SPIRIT_CLASSIC_NS::impl::tst<T, char> >
symbol_inserter_t;
symbols_with_data(symbol_inserter_t const &add_, InitT const &data_) :
@@ -140,7 +140,7 @@
template <typename T, typename CharT, typename InitT>
inline
symbols_with_data<T, InitT>
-symbols_gen(symbol_inserter<T, boost::spirit::impl::tst<T, CharT> > const &add_,
+symbols_gen(symbol_inserter<T, BOOST_SPIRIT_CLASSIC_NS::impl::tst<T, CharT> > const &add_,
InitT const &data_)
{
return symbols_with_data<T, InitT>(add_, data_);
Modified: trunk/libs/spirit/classic/example/intermediate/regex_convert.cpp
==============================================================================
--- trunk/libs/spirit/classic/example/intermediate/regex_convert.cpp (original)
+++ trunk/libs/spirit/classic/example/intermediate/regex_convert.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -49,7 +49,7 @@
#define BOOST_SPIRIT_NO_REGEX_LIB
#include <boost/spirit/include/classic_regex.hpp>
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
using namespace std;
namespace {
Modified: trunk/libs/spirit/classic/example/intermediate/simple_xml/xml_g.hpp
==============================================================================
--- trunk/libs/spirit/classic/example/intermediate/simple_xml/xml_g.hpp (original)
+++ trunk/libs/spirit/classic/example/intermediate/simple_xml/xml_g.hpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -40,7 +40,7 @@
#include <string>
#include <utility>
-namespace SP = boost::spirit;
+namespace SP = BOOST_SPIRIT_CLASSIC_NS;
using phoenix::arg1;
using phoenix::arg2;
using phoenix::construct_;
Modified: trunk/libs/spirit/classic/example/techniques/dynamic_rule.cpp
==============================================================================
--- trunk/libs/spirit/classic/example/techniques/dynamic_rule.cpp (original)
+++ trunk/libs/spirit/classic/example/techniques/dynamic_rule.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -24,7 +24,7 @@
int main(int argc, char* argv[])
{
- using namespace boost::spirit;
+ using namespace BOOST_SPIRIT_CLASSIC_NS;
using namespace std;
rule<> a,b,c,next;
Modified: trunk/libs/spirit/classic/example/techniques/multiple_scanners.cpp
==============================================================================
--- trunk/libs/spirit/classic/example/techniques/multiple_scanners.cpp (original)
+++ trunk/libs/spirit/classic/example/techniques/multiple_scanners.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -16,7 +16,7 @@
#include <iostream>
#include <boost/spirit/include/classic_core.hpp>
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
struct my_grammar : grammar<my_grammar>
{
Modified: trunk/libs/spirit/classic/example/techniques/nabialek.cpp
==============================================================================
--- trunk/libs/spirit/classic/example/techniques/nabialek.cpp (original)
+++ trunk/libs/spirit/classic/example/techniques/nabialek.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -17,7 +17,7 @@
#include <boost/spirit/include/classic_symbols.hpp>
#include <boost/spirit/include/classic_utility.hpp>
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
template <typename Rule>
struct SetRest
Modified: trunk/libs/spirit/classic/example/techniques/no_rules/no_rule1.cpp
==============================================================================
--- trunk/libs/spirit/classic/example/techniques/no_rules/no_rule1.cpp (original)
+++ trunk/libs/spirit/classic/example/techniques/no_rules/no_rule1.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -14,7 +14,7 @@
#include <iostream>
#include <boost/spirit/include/classic_core.hpp>
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
struct skip_grammar : grammar<skip_grammar>
{
Modified: trunk/libs/spirit/classic/example/techniques/no_rules/no_rule2.cpp
==============================================================================
--- trunk/libs/spirit/classic/example/techniques/no_rules/no_rule2.cpp (original)
+++ trunk/libs/spirit/classic/example/techniques/no_rules/no_rule2.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -14,7 +14,7 @@
#include <iostream>
#include <boost/spirit/include/classic_core.hpp>
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
struct skip_grammar : grammar<skip_grammar>
{
Modified: trunk/libs/spirit/classic/example/techniques/no_rules/no_rule3.cpp
==============================================================================
--- trunk/libs/spirit/classic/example/techniques/no_rules/no_rule3.cpp (original)
+++ trunk/libs/spirit/classic/example/techniques/no_rules/no_rule3.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -14,7 +14,7 @@
#include <iostream>
#include <boost/spirit/include/classic_core.hpp>
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
namespace boost { namespace spirit
{
Modified: trunk/libs/spirit/classic/example/techniques/no_rules_with_typeof/opaque_rule_parser.cpp
==============================================================================
--- trunk/libs/spirit/classic/example/techniques/no_rules_with_typeof/opaque_rule_parser.cpp (original)
+++ trunk/libs/spirit/classic/example/techniques/no_rules_with_typeof/opaque_rule_parser.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -23,7 +23,7 @@
namespace my_project { namespace my_grammar {
- using namespace boost::spirit;
+ using namespace BOOST_SPIRIT_CLASSIC_NS;
#define BOOST_SPIRIT__NAMESPACE (2,(my_project,my_grammar))
@@ -56,7 +56,7 @@
str += '\n';
- if (boost::spirit::parse(str.c_str(), my_project::my_grammar::main).full)
+ if (BOOST_SPIRIT_CLASSIC_NS::parse(str.c_str(), my_project::my_grammar::main).full)
std::cout << "\nOK." << std::endl;
else
std::cout << "\nERROR." << std::endl;
Modified: trunk/libs/spirit/classic/example/techniques/no_rules_with_typeof/rule_parser_1_1.cpp
==============================================================================
--- trunk/libs/spirit/classic/example/techniques/no_rules_with_typeof/rule_parser_1_1.cpp (original)
+++ trunk/libs/spirit/classic/example/techniques/no_rules_with_typeof/rule_parser_1_1.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -30,7 +30,7 @@
namespace my_project { namespace my_module {
- using namespace boost::spirit;
+ using namespace BOOST_SPIRIT_CLASSIC_NS;
// A semantic action.
@@ -75,7 +75,7 @@
bool parse_line(char const * str)
{
- return boost::spirit::parse(str,line,skipper).full;
+ return BOOST_SPIRIT_CLASSIC_NS::parse(str,line,skipper).full;
}
#undef BOOST_SPIRIT__NAMESPACE
Modified: trunk/libs/spirit/classic/example/techniques/no_rules_with_typeof/rule_parser_1_2.cpp
==============================================================================
--- trunk/libs/spirit/classic/example/techniques/no_rules_with_typeof/rule_parser_1_2.cpp (original)
+++ trunk/libs/spirit/classic/example/techniques/no_rules_with_typeof/rule_parser_1_2.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -27,7 +27,7 @@
// manual Typeof registrations like in this case.
#include BOOST_TYPEOF_INCREMENT_REGISTRATION_GROUP()
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
namespace my_project { namespace my_module {
@@ -72,7 +72,7 @@
bool parse_line(char const * str)
{
- return boost::spirit::parse(str,line,space_p).full;
+ return BOOST_SPIRIT_CLASSIC_NS::parse(str,line,space_p).full;
}
#undef BOOST_SPIRIT__NAMESPACE
Modified: trunk/libs/spirit/classic/example/techniques/no_rules_with_typeof/rule_parser_2_1.cpp
==============================================================================
--- trunk/libs/spirit/classic/example/techniques/no_rules_with_typeof/rule_parser_2_1.cpp (original)
+++ trunk/libs/spirit/classic/example/techniques/no_rules_with_typeof/rule_parser_2_1.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -25,7 +25,7 @@
// Don't forget to
#include BOOST_TYPEOF_INCREMENT_REGISTRATION_GROUP()
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
// Semantic actions
namespace
Modified: trunk/libs/spirit/classic/example/techniques/no_rules_with_typeof/rule_parser_2_2.cpp
==============================================================================
--- trunk/libs/spirit/classic/example/techniques/no_rules_with_typeof/rule_parser_2_2.cpp (original)
+++ trunk/libs/spirit/classic/example/techniques/no_rules_with_typeof/rule_parser_2_2.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -37,7 +37,7 @@
// Don't forget to
#include BOOST_TYPEOF_INCREMENT_REGISTRATION_GROUP()
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
// Semantic actions
namespace
Modified: trunk/libs/spirit/classic/example/techniques/right_recursion.cpp
==============================================================================
--- trunk/libs/spirit/classic/example/techniques/right_recursion.cpp (original)
+++ trunk/libs/spirit/classic/example/techniques/right_recursion.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -11,7 +11,7 @@
#define BOOST_SPIRIT_DEBUG
#include <boost/spirit/include/classic_core.hpp>
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
struct non_greedy_kleene : public grammar<non_greedy_kleene>
{
Modified: trunk/libs/spirit/classic/example/techniques/typeof.cpp
==============================================================================
--- trunk/libs/spirit/classic/example/techniques/typeof.cpp (original)
+++ trunk/libs/spirit/classic/example/techniques/typeof.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -15,7 +15,7 @@
#include <boost/spirit/include/classic_core.hpp>
#include <boost/typeof/typeof.hpp>
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
#define RULE(name, definition) BOOST_TYPEOF(definition) name = definition
Copied: trunk/libs/spirit/classic/test/Jamfile (from r44366, /trunk/libs/spirit/classic/test/Jamfile.v2)
==============================================================================
--- /trunk/libs/spirit/classic/test/Jamfile.v2 (original)
+++ trunk/libs/spirit/classic/test/Jamfile 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -46,17 +46,17 @@
local multi-threading = <library>/boost/thread//boost_thread
<threading>multi <define>BOOST_ALL_NO_LIB=1 ;
- test-suite "spirit.core.kernel"
+ test-suite "spirit.classic.core.kernel"
: [ spirit-run match_tests.cpp ]
[ spirit-run post_skips.cpp ]
;
- test-suite "spirit.core.scanner"
+ test-suite "spirit.classic.core.scanner"
: [ spirit-run scanner_tests.cpp ]
[ spirit-run scanner_value_type_tests.cpp ]
;
- test-suite "spirit.core.primitive"
+ test-suite "spirit.classic.core.primitive"
: [ spirit-run primitives_tests.cpp ]
[ spirit-run char_strings_test.cpp ]
[ compile-fail char_strings_test_fail.cpp ]
@@ -64,7 +64,7 @@
[ spirit-run custom_real_parser.cpp ]
;
- test-suite "spirit.core.composite"
+ test-suite "spirit.classic.core.composite"
: [ spirit-run epsilon_tests.cpp ]
[ spirit-run negated_eps_p_test.cpp ]
[ spirit-run operators_tests.cpp ]
@@ -72,7 +72,7 @@
[ spirit-run shortest_alternative_tests.cpp ]
;
- test-suite "spirit.core.non_terminal"
+ test-suite "spirit.classic.core.non_terminal"
: [ spirit-run rule_tests.cpp ]
[ spirit-run owi_st_tests.cpp ]
[ spirit-run grammar_tests.cpp : : : $(opt-metrowerks) ]
@@ -84,23 +84,23 @@
;
# traverse_tests defines SPIRIT_DEBUG, don't run the tests twice
- test-suite "spirit.meta"
+ test-suite "spirit.classic.meta"
: [ spirit-run fundamental_tests.cpp ]
[ spirit-run parser_traits_tests.cpp ]
[ spirit-run traverse_tests.cpp : : : <toolset>intel:<debug-symbols>off ]
;
- test-suite "spirit.attribute"
+ test-suite "spirit.classic.attribute"
: [ spirit-run closure_tests.cpp : : : $(opt-metrowerks) ]
[ run bug_000008.cpp : : : $(multi-threading) ]
[ spirit-run parametric_tests.cpp ]
;
- test-suite "spirit.error_handling"
+ test-suite "spirit.classic.error_handling"
: [ spirit-run exception_tests.cpp ]
;
- test-suite "spirit.tree"
+ test-suite "spirit.classic.tree"
: [ spirit-run ast_calc_tests.cpp ]
[ spirit-run group_match_bug.cpp ]
[ spirit-run repeat_ast_tests.cpp ]
@@ -111,7 +111,7 @@
# temporarily removed from the test suite. tree_tests are not finished, yet.
# [ spirit-run tree_tests.cpp ]
- test-suite "spirit.dynamic"
+ test-suite "spirit.classic.dynamic"
: [ compile if_p_as_parser_tests.cpp ]
[ compile while_p_as_parser_tests.cpp ]
[ compile for_p_as_parser_tests.cpp ]
@@ -128,7 +128,7 @@
[ spirit-run select_p_with_rule.cpp ]
;
- test-suite "spirit.utility.parsers"
+ test-suite "spirit.classic.utility.parsers"
: [ spirit-run chset_tests.cpp ]
[ spirit-run confix_tests.cpp ]
[ spirit-run loops_tests.cpp ]
@@ -140,12 +140,12 @@
[ spirit-run grammar_def_test.cpp ]
;
- test-suite "spirit.utility.support"
+ test-suite "spirit.classic.utility.support"
# This test doesn't actually use multiple threads
: [ spirit-run scoped_lock_tests.cpp : : : $(multi-threading) ]
;
- test-suite "spirit.iterator"
+ test-suite "spirit.classic.iterator"
: [ spirit-run fixed_size_queue_tests.cpp ]
[ compile-fail fixed_size_queue_fail_tests.cpp ]
[ spirit-run file_iterator_tests.cpp ]
@@ -155,7 +155,7 @@
[ compile multi_pass_compile_tests.cpp ]
;
- test-suite "spirit.small_bug_fixes"
+ test-suite "spirit.classic.small_bug_fixes"
: [ spirit-run bug_fixes.cpp ]
;
@@ -174,11 +174,11 @@
swap_test
;
- test-suite "spirit.utility.actors"
+ test-suite "spirit.classic.utility.actors"
: [ spirit-run actor/$(actor_test_sources).cpp ]
;
- test-suite "spirit.typeof-support"
+ test-suite "spirit.classic.typeof-support"
: [ compile typeof_support/typeof_actor.cpp ]
[ compile typeof_support/typeof_attribute.cpp ]
[ compile typeof_support/typeof_core.cpp ]
Deleted: trunk/libs/spirit/classic/test/Jamfile.v2
==============================================================================
--- trunk/libs/spirit/classic/test/Jamfile.v2 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
+++ (empty file)
@@ -1,194 +0,0 @@
-#==============================================================================
-# Copyright (c) 2002 Joel de Guzman
-# Copyright (c) 2003-2004 Martin Wille
-# http://spirit.sourceforge.net/
-#
-# Use, modification and distribution is subject to 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)
-#==============================================================================
-#
-# Spirit regression test boost-jam file
-# Joel de Guzman [Sept 27, 2002]
-#
-
-
-
-# VP, 2005/04/14: Inside boost, we inherit proper <include>
-# from Jamroot.
-# Not sure about standalone Spirit.
-# SPIRIT_HEADER_INCLUDE ?= ../../.. ;
-# spirit-header-include = <include>$(SPIRIT_HEADER_INCLUDE) ;
-
-rule spirit-run ( sources + : args * : input-files * : requirements * : name ? : default-build * )
-{
- name ?= $(sources[1]:D=:S=) ;
- return
- [ run $(sources) : $(args) : $(input-files) : $(requirements) : $(name)
- : $(default-build) ]
- [ run $(sources) : $(args) : $(input-files) : $(requirements)
- <define>BOOST_SPIRIT_DEBUG=1 : $(name)_debug
- : $(default-build) ]
- ;
-}
-
-############################################################
-
-local opt = <toolset>vc-7.0:<optimization>speed
- <toolset>vc-7.0:<inlining>on
- <toolset>cw:<optimization>speed ;
-
-local opt-metrowerks = <toolset>cw:<optimization>speed ;
-
-
-# VP, 2005/04/14: MT is not available with Como, but this is
-# not handled yet.
-local multi-threading = <library>/boost/thread//boost_thread
- <threading>multi <define>BOOST_ALL_NO_LIB=1 ;
-
- test-suite "spirit.core.kernel"
- : [ spirit-run match_tests.cpp ]
- [ spirit-run post_skips.cpp ]
- ;
-
- test-suite "spirit.core.scanner"
- : [ spirit-run scanner_tests.cpp ]
- [ spirit-run scanner_value_type_tests.cpp ]
- ;
-
- test-suite "spirit.core.primitive"
- : [ spirit-run primitives_tests.cpp ]
- [ spirit-run char_strings_test.cpp ]
- [ compile-fail char_strings_test_fail.cpp ]
- [ spirit-run numerics_tests.cpp : : : $(opt) ]
- [ spirit-run custom_real_parser.cpp ]
- ;
-
- test-suite "spirit.core.composite"
- : [ spirit-run epsilon_tests.cpp ]
- [ spirit-run negated_eps_p_test.cpp ]
- [ spirit-run operators_tests.cpp ]
- [ spirit-run directives_tests.cpp ]
- [ spirit-run shortest_alternative_tests.cpp ]
- ;
-
- test-suite "spirit.core.non_terminal"
- : [ spirit-run rule_tests.cpp ]
- [ spirit-run owi_st_tests.cpp ]
- [ spirit-run grammar_tests.cpp : : : $(opt-metrowerks) ]
- [ spirit-run grammar_multi_instance_tst.cpp : : : $(opt-metrowerks) ]
- [ spirit-run subrule_tests.cpp ]
- [ run owi_mt_tests.cpp : : : $(multi-threading) ]
- [ run grammar_mt_tests.cpp : : : $(multi-threading) ]
- [ spirit-run parser_context_test.cpp ]
- ;
-
- # traverse_tests defines SPIRIT_DEBUG, don't run the tests twice
- test-suite "spirit.meta"
- : [ spirit-run fundamental_tests.cpp ]
- [ spirit-run parser_traits_tests.cpp ]
- [ spirit-run traverse_tests.cpp : : : <toolset>intel:<debug-symbols>off ]
- ;
-
- test-suite "spirit.attribute"
- : [ spirit-run closure_tests.cpp : : : $(opt-metrowerks) ]
- [ run bug_000008.cpp : : : $(multi-threading) ]
- [ spirit-run parametric_tests.cpp ]
- ;
-
- test-suite "spirit.error_handling"
- : [ spirit-run exception_tests.cpp ]
- ;
-
- test-suite "spirit.tree"
- : [ spirit-run ast_calc_tests.cpp ]
- [ spirit-run group_match_bug.cpp ]
- [ spirit-run repeat_ast_tests.cpp ]
- [ spirit-run tree_to_xml.cpp ]
- [ compile mix_and_match_trees.cpp ]
- ;
-
-# temporarily removed from the test suite. tree_tests are not finished, yet.
-# [ spirit-run tree_tests.cpp ]
-
- test-suite "spirit.dynamic"
- : [ compile if_p_as_parser_tests.cpp ]
- [ compile while_p_as_parser_tests.cpp ]
- [ compile for_p_as_parser_tests.cpp ]
- [ spirit-run if_tests.cpp ]
- [ spirit-run if_p_int_as_condition_test.cpp ]
- [ spirit-run for_tests.cpp ]
- [ spirit-run while_tests.cpp ]
- [ spirit-run lazy_tests.cpp ]
- [ spirit-run switch_tests_eps_default.cpp ]
- [ spirit-run switch_tests_general_def.cpp ]
- [ spirit-run switch_tests_wo_default.cpp ]
- [ spirit-run switch_tests_single.cpp ]
- [ spirit-run switch_problem.cpp ]
- [ spirit-run select_p_with_rule.cpp ]
- ;
-
- test-suite "spirit.utility.parsers"
- : [ spirit-run chset_tests.cpp ]
- [ spirit-run confix_tests.cpp ]
- [ spirit-run loops_tests.cpp ]
- [ spirit-run symbols_tests.cpp ]
- [ spirit-run symbols_add_null.cpp ]
- [ spirit-run symbols_find_null.cpp ]
- [ spirit-run escape_char_parser_tests.cpp : : : $(opt) ]
- [ spirit-run distinct_tests.cpp ]
- [ spirit-run grammar_def_test.cpp ]
- ;
-
- test-suite "spirit.utility.support"
- # This test doesn't actually use multiple threads
- : [ spirit-run scoped_lock_tests.cpp : : : $(multi-threading) ]
- ;
-
- test-suite "spirit.iterator"
- : [ spirit-run fixed_size_queue_tests.cpp ]
- [ compile-fail fixed_size_queue_fail_tests.cpp ]
- [ spirit-run file_iterator_tests.cpp ]
- [ spirit-run multi_pass_tests.cpp : : : $(opt-metrowerks) ]
- [ spirit-run sf_bug_720917.cpp : : : $(opt-metrowerks) ]
- [ spirit-run position_iterator_tests.cpp : : : $(opt-metrowerks) ]
- [ compile multi_pass_compile_tests.cpp ]
- ;
-
- test-suite "spirit.small_bug_fixes"
- : [ spirit-run bug_fixes.cpp ]
- ;
-
- actor_test_sources =
- action_tests
- assign_test
- assign_key_test
- clear_test
- decrement_test
- erase_at_test
- increment_test
- insert_key_test
- insert_at_test
- push_back_test
- push_front_test
- swap_test
- ;
-
- test-suite "spirit.utility.actors"
- : [ spirit-run actor/$(actor_test_sources).cpp ]
- ;
-
- test-suite "spirit.typeof-support"
- : [ compile typeof_support/typeof_actor.cpp ]
- [ compile typeof_support/typeof_attribute.cpp ]
- [ compile typeof_support/typeof_core.cpp ]
- [ compile typeof_support/typeof_debug.cpp ]
- [ compile typeof_support/typeof_dynamic.cpp ]
- [ compile typeof_support/typeof_error_handling.cpp ]
- [ compile typeof_support/typeof_iterator.cpp ]
- [ compile typeof_support/typeof_symbols.cpp ]
- [ compile typeof_support/typeof_tree.cpp ]
- [ compile typeof_support/typeof_utility.cpp ]
- ;
-
-
Modified: trunk/libs/spirit/classic/test/actor/assign_key_test.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/actor/assign_key_test.cpp (original)
+++ trunk/libs/spirit/classic/test/actor/assign_key_test.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -23,7 +23,7 @@
void assign_key_single_argument_test()
{
- using namespace boost::spirit;
+ using namespace BOOST_SPIRIT_CLASSIC_NS;
const char* cp = "(one,0),(two,1),(three,2)";
const char* cp_first = cp;
@@ -65,7 +65,7 @@
void assign_key_two_arguments_test()
{
- using namespace boost::spirit;
+ using namespace BOOST_SPIRIT_CLASSIC_NS;
const char* cp = "(0,one),(1,two),(2,three)";
const char* cp_first = cp;
Modified: trunk/libs/spirit/classic/test/actor/assign_test.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/actor/assign_test.cpp (original)
+++ trunk/libs/spirit/classic/test/actor/assign_test.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -17,7 +17,7 @@
void assign_test()
{
- using namespace boost::spirit;
+ using namespace BOOST_SPIRIT_CLASSIC_NS;
const char* cp = "63";
const char* cp_first = cp;
@@ -38,7 +38,7 @@
void assign_test_ref()
{
- using namespace boost::spirit;
+ using namespace BOOST_SPIRIT_CLASSIC_NS;
const char* cp = "63";
Modified: trunk/libs/spirit/classic/test/actor/clear_test.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/actor/clear_test.cpp (original)
+++ trunk/libs/spirit/classic/test/actor/clear_test.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -18,7 +18,7 @@
void clear_action_test()
{
- using namespace boost::spirit;
+ using namespace BOOST_SPIRIT_CLASSIC_NS;
BOOST_MESSAGE("clear_test");
Modified: trunk/libs/spirit/classic/test/actor/decrement_test.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/actor/decrement_test.cpp (original)
+++ trunk/libs/spirit/classic/test/actor/decrement_test.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -17,7 +17,7 @@
void decrement_action_test()
{
- using namespace boost::spirit;
+ using namespace BOOST_SPIRIT_CLASSIC_NS;
BOOST_MESSAGE("decrement_test");
Modified: trunk/libs/spirit/classic/test/actor/erase_at_test.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/actor/erase_at_test.cpp (original)
+++ trunk/libs/spirit/classic/test/actor/erase_at_test.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -18,7 +18,7 @@
void erase_action_test()
{
- using namespace boost::spirit;
+ using namespace BOOST_SPIRIT_CLASSIC_NS;
const char* cp = "one,two,three";
const char* cp_first = cp;
Modified: trunk/libs/spirit/classic/test/actor/increment_test.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/actor/increment_test.cpp (original)
+++ trunk/libs/spirit/classic/test/actor/increment_test.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -17,7 +17,7 @@
void increment_action_test()
{
- using namespace boost::spirit;
+ using namespace BOOST_SPIRIT_CLASSIC_NS;
BOOST_MESSAGE("increment_test");
Modified: trunk/libs/spirit/classic/test/actor/insert_at_test.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/actor/insert_at_test.cpp (original)
+++ trunk/libs/spirit/classic/test/actor/insert_at_test.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -11,15 +11,15 @@
///////////////////////////////////////////////////////////////////////////////
#include "action_tests.hpp"
-#include <boost/spirit.hpp>
#include <map>
#include <cstring>
#include <iostream>
+#include <boost/spirit/include/classic_spirit.hpp>
#include <boost/spirit/include/classic_insert_at_actor.hpp>
void insert_at_single_argument_test()
{
- using namespace boost::spirit;
+ using namespace BOOST_SPIRIT_CLASSIC_NS;
const char* cp = "(one,0),(two,1),(three,2)";
const char* cp_first = cp;
@@ -61,7 +61,7 @@
void insert_at_two_arguments_test()
{
- using namespace boost::spirit;
+ using namespace BOOST_SPIRIT_CLASSIC_NS;
const char* cp = "(0,one),(1,two),(2,three)";
const char* cp_first = cp;
Modified: trunk/libs/spirit/classic/test/actor/insert_key_test.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/actor/insert_key_test.cpp (original)
+++ trunk/libs/spirit/classic/test/actor/insert_key_test.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -23,7 +23,7 @@
void insert_key_single_argument_test()
{
- using namespace boost::spirit;
+ using namespace BOOST_SPIRIT_CLASSIC_NS;
const char* cp = "(one,0),(two,1),(three,2)";
const char* cp_first = cp;
@@ -65,7 +65,7 @@
void insert_key_two_arguments_test()
{
- using namespace boost::spirit;
+ using namespace BOOST_SPIRIT_CLASSIC_NS;
const char* cp = "(0,one),(1,two),(2,three)";
const char* cp_first = cp;
Modified: trunk/libs/spirit/classic/test/actor/push_back_test.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/actor/push_back_test.cpp (original)
+++ trunk/libs/spirit/classic/test/actor/push_back_test.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -26,7 +26,7 @@
template<typename ContainerT>
void push_back_test()
{
- using namespace boost::spirit;
+ using namespace BOOST_SPIRIT_CLASSIC_NS;
const char* cp = "one,two,three";
const char* cp_first = cp;
Modified: trunk/libs/spirit/classic/test/actor/push_front_test.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/actor/push_front_test.cpp (original)
+++ trunk/libs/spirit/classic/test/actor/push_front_test.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -24,7 +24,7 @@
template<typename ContainerT>
void push_front_test()
{
- using namespace boost::spirit;
+ using namespace BOOST_SPIRIT_CLASSIC_NS;
const char* cp = "one,two,three";
const char* cp_first = cp;
Modified: trunk/libs/spirit/classic/test/actor/swap_test.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/actor/swap_test.cpp (original)
+++ trunk/libs/spirit/classic/test/actor/swap_test.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -17,7 +17,7 @@
void swap_action_test()
{
- using namespace boost::spirit;
+ using namespace BOOST_SPIRIT_CLASSIC_NS;
const char* cp = "63";
const char* cp_first = cp;
Modified: trunk/libs/spirit/classic/test/ast_calc_tests.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/ast_calc_tests.cpp (original)
+++ trunk/libs/spirit/classic/test/ast_calc_tests.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -19,7 +19,7 @@
#include <string>
#include <boost/detail/lightweight_test.hpp>
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
////////////////////////////////////////////////////////////////////////////
//
@@ -122,7 +122,7 @@
////////////////////////////////////////////////////////////////////////////
using namespace std;
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
typedef char const* iterator_t;
typedef tree_match<iterator_t> parse_tree_match_t;
Modified: trunk/libs/spirit/classic/test/bug_000008.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/bug_000008.cpp (original)
+++ trunk/libs/spirit/classic/test/bug_000008.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -53,13 +53,13 @@
static const int number_of_calls_to_parse_per_thread=20000;
struct test_closure
- : boost::spirit::closure<test_closure, char const*>
+ : BOOST_SPIRIT_CLASSIC_NS::closure<test_closure, char const*>
{
member1 b;
};
struct test_grammar
- : boost::spirit::grammar<test_grammar, test_closure::context_t>
+ : BOOST_SPIRIT_CLASSIC_NS::grammar<test_grammar, test_closure::context_t>
{
test_grammar() {}
@@ -69,12 +69,12 @@
definition(test_grammar const &self)
{
using namespace phoenix;
- rule = boost::spirit::epsilon_p[self.b = arg1];
+ rule = BOOST_SPIRIT_CLASSIC_NS::epsilon_p[self.b = arg1];
}
- boost::spirit::rule<ScannerT> const &start() const { return rule; }
+ BOOST_SPIRIT_CLASSIC_NS::rule<ScannerT> const &start() const { return rule; }
- boost::spirit::rule<ScannerT> rule;
+ BOOST_SPIRIT_CLASSIC_NS::rule<ScannerT> rule;
};
};
@@ -86,7 +86,7 @@
char const text[]="foo";
for(int i=0; i<number_of_calls_to_parse_per_thread; ++i)
{
- boost::spirit::parse(&text[0], text+sizeof(text), g);
+ BOOST_SPIRIT_CLASSIC_NS::parse(&text[0], text+sizeof(text), g);
}
}
Modified: trunk/libs/spirit/classic/test/bug_fixes.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/bug_fixes.cpp (original)
+++ trunk/libs/spirit/classic/test/bug_fixes.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -13,7 +13,7 @@
#include <boost/spirit/include/classic_assign_actor.hpp>
using namespace boost;
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
using namespace std;
///////////////////////////////////////////////////////////////////////////////
@@ -95,7 +95,7 @@
//
///////////////////////////////////////////////////////////////////////////////
#include <boost/limits.hpp>
-#include <boost/spirit/include/chset.hpp>
+#include <boost/spirit/include/classic_chset.hpp>
void bug_004()
{
Modified: trunk/libs/spirit/classic/test/char_strings_test.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/char_strings_test.cpp (original)
+++ trunk/libs/spirit/classic/test/char_strings_test.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -14,9 +14,9 @@
int main()
{
- using boost::spirit::rule;
- using boost::spirit::str_p;
- using boost::spirit::ch_p;
+ using BOOST_SPIRIT_CLASSIC_NS::rule;
+ using BOOST_SPIRIT_CLASSIC_NS::str_p;
+ using BOOST_SPIRIT_CLASSIC_NS::ch_p;
using std::string;
Modified: trunk/libs/spirit/classic/test/char_strings_test_fail.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/char_strings_test_fail.cpp (original)
+++ trunk/libs/spirit/classic/test/char_strings_test_fail.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -12,8 +12,8 @@
int main()
{
- using boost::spirit::rule;
- using boost::spirit::ch_p;
+ using BOOST_SPIRIT_CLASSIC_NS::rule;
+ using BOOST_SPIRIT_CLASSIC_NS::ch_p;
rule<> chars = ch_p("string");
}
Modified: trunk/libs/spirit/classic/test/chset_tests.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/chset_tests.cpp (original)
+++ trunk/libs/spirit/classic/test/chset_tests.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -16,7 +16,7 @@
#include <boost/spirit/include/classic_chset.hpp>
using namespace std;
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
namespace
{
Modified: trunk/libs/spirit/classic/test/closure_tests.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/closure_tests.cpp (original)
+++ trunk/libs/spirit/classic/test/closure_tests.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -15,7 +15,7 @@
#include <boost/spirit/include/classic_closure.hpp>
#include <boost/spirit/include/classic_parametric.hpp>
#include <boost/spirit/include/phoenix1_binders.hpp>
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
using namespace phoenix;
///////////////////////////////////////////////////////////////////////////////
@@ -23,17 +23,17 @@
// Closure tests
//
///////////////////////////////////////////////////////////////////////////////
-struct my_closure1 : boost::spirit::closure<my_closure1, double>
+struct my_closure1 : BOOST_SPIRIT_CLASSIC_NS::closure<my_closure1, double>
{
member1 val;
};
-struct my_closure2 : boost::spirit::closure<my_closure2, char>
+struct my_closure2 : BOOST_SPIRIT_CLASSIC_NS::closure<my_closure2, char>
{
member1 ch;
};
-struct my_closure3 : boost::spirit::closure<my_closure3, char>
+struct my_closure3 : BOOST_SPIRIT_CLASSIC_NS::closure<my_closure3, char>
{
member1 ch;
};
@@ -51,7 +51,7 @@
}
#endif // defined(BOOST_SPIRIT_DEBUG)
-struct my_closure4 : boost::spirit::closure<my_closure4, X>
+struct my_closure4 : BOOST_SPIRIT_CLASSIC_NS::closure<my_closure4, X>
{
member1 x;
};
@@ -71,12 +71,12 @@
}
#endif // defined(BOOST_SPIRIT_DEBUG)
-struct my_closure5 : boost::spirit::closure<my_closure5, int, Y>
+struct my_closure5 : BOOST_SPIRIT_CLASSIC_NS::closure<my_closure5, int, Y>
{
member1 y;
};
-struct my_closure6 : boost::spirit::closure<my_closure6, int, int, int>
+struct my_closure6 : BOOST_SPIRIT_CLASSIC_NS::closure<my_closure6, int, int, int>
{
member1 x;
member2 y;
Modified: trunk/libs/spirit/classic/test/confix_tests.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/confix_tests.cpp (original)
+++ trunk/libs/spirit/classic/test/confix_tests.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -11,7 +11,7 @@
#include <boost/detail/lightweight_test.hpp>
using namespace boost;
-using namespace spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
typedef
scanner<char const*, scanner_policies<skipper_iteration_policy<> > >
Modified: trunk/libs/spirit/classic/test/custom_real_parser.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/custom_real_parser.cpp (original)
+++ trunk/libs/spirit/classic/test/custom_real_parser.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -12,7 +12,7 @@
#include <boost/spirit/include/classic_actor.hpp>
#include <boost/math/concepts/real_concept.hpp>
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
using boost::math::concepts::real_concept;
int main(int argc, char* argv[])
Modified: trunk/libs/spirit/classic/test/directives_tests.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/directives_tests.cpp (original)
+++ trunk/libs/spirit/classic/test/directives_tests.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -15,7 +15,7 @@
#include "impl/string_length.hpp"
#include <boost/spirit/include/classic_core.hpp>
#include <boost/spirit/include/classic_assign_actor.hpp>
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
///////////////////////////////////////////////////////////////////////////////
//
Modified: trunk/libs/spirit/classic/test/distinct_tests.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/distinct_tests.cpp (original)
+++ trunk/libs/spirit/classic/test/distinct_tests.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -11,7 +11,7 @@
#include <boost/detail/lightweight_test.hpp>
using namespace boost;
-using namespace spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
typedef
scanner<char const*, scanner_policies<skipper_iteration_policy<> > >
Modified: trunk/libs/spirit/classic/test/epsilon_tests.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/epsilon_tests.cpp (original)
+++ trunk/libs/spirit/classic/test/epsilon_tests.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -17,7 +17,7 @@
#include "impl/string_length.hpp"
using namespace test;
-static boost::spirit::parse_info<char const *> pi;
+static BOOST_SPIRIT_CLASSIC_NS::parse_info<char const *> pi;
////////////////////////////////////////////////
// These macros are used with BOOST_TEST
@@ -33,7 +33,7 @@
parse(char const *s, ParserT const &p, bool match)
{
- pi = boost::spirit::parse(s, s + test_impl::string_length(s), p);
+ pi = BOOST_SPIRIT_CLASSIC_NS::parse(s, s + test_impl::string_length(s), p);
if (match)
{
BOOST_TEST(matches);
@@ -58,14 +58,14 @@
// This test case also is a compile time check wether
// both eps_p and epsilon_p are present.
- parse(empty, boost::spirit::epsilon_p, true);
+ parse(empty, BOOST_SPIRIT_CLASSIC_NS::epsilon_p, true);
BOOST_TEST(full_match);
- parse(not_empty, boost::spirit::epsilon_p, true);
+ parse(not_empty, BOOST_SPIRIT_CLASSIC_NS::epsilon_p, true);
BOOST_TEST(partial_match);
- parse(empty, boost::spirit::eps_p, true);
+ parse(empty, BOOST_SPIRIT_CLASSIC_NS::eps_p, true);
BOOST_TEST(full_match);
- parse(not_empty, boost::spirit::eps_p, true);
+ parse(not_empty, BOOST_SPIRIT_CLASSIC_NS::eps_p, true);
BOOST_TEST(partial_match);
}
@@ -77,11 +77,11 @@
epsilon_as_parser_generator_for_functors()
{
bool flag = false;
- parse(empty, boost::spirit::epsilon_p(var(flag)), flag);
+ parse(empty, BOOST_SPIRIT_CLASSIC_NS::epsilon_p(var(flag)), flag);
BOOST_TEST(no_match);
flag = true;
- parse(empty, boost::spirit::epsilon_p(var(flag)), flag);
+ parse(empty, BOOST_SPIRIT_CLASSIC_NS::epsilon_p(var(flag)), flag);
BOOST_TEST(full_match);
}
@@ -96,13 +96,13 @@
// as body-parser for another invokation of epsilon_p
bool flag = false;
- parse(empty, boost::spirit::epsilon_p(
- boost::spirit::epsilon_p(var(flag))), flag);
+ parse(empty, BOOST_SPIRIT_CLASSIC_NS::epsilon_p(
+ BOOST_SPIRIT_CLASSIC_NS::epsilon_p(var(flag))), flag);
BOOST_TEST(no_match);
flag = true;
- parse(empty, boost::spirit::epsilon_p(
- boost::spirit::epsilon_p(var(flag))), flag);
+ parse(empty, BOOST_SPIRIT_CLASSIC_NS::epsilon_p(
+ BOOST_SPIRIT_CLASSIC_NS::epsilon_p(var(flag))), flag);
BOOST_TEST(full_match);
}
@@ -112,15 +112,15 @@
negation_operator_for_epsilon()
{
bool flag = false;
- parse(empty, ~boost::spirit::epsilon_p(var(flag)), !flag);
+ parse(empty, ~BOOST_SPIRIT_CLASSIC_NS::epsilon_p(var(flag)), !flag);
BOOST_TEST(full_match);
- parse(empty, ~~boost::spirit::epsilon_p(var(flag)), flag);
+ parse(empty, ~~BOOST_SPIRIT_CLASSIC_NS::epsilon_p(var(flag)), flag);
BOOST_TEST(no_match);
flag = true;
- parse(empty, ~boost::spirit::epsilon_p(var(flag)), !flag);
+ parse(empty, ~BOOST_SPIRIT_CLASSIC_NS::epsilon_p(var(flag)), !flag);
BOOST_TEST(no_match);
- parse(empty, ~~boost::spirit::epsilon_p(var(flag)), flag);
+ parse(empty, ~~BOOST_SPIRIT_CLASSIC_NS::epsilon_p(var(flag)), flag);
BOOST_TEST(full_match);
}
Modified: trunk/libs/spirit/classic/test/escape_char_parser_tests.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/escape_char_parser_tests.cpp (original)
+++ trunk/libs/spirit/classic/test/escape_char_parser_tests.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -21,7 +21,7 @@
///////////////////////////////////////////////////////////////////////////////
using namespace std;
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
///////////////////////////////////////////////////////////////////////////////
int
Modified: trunk/libs/spirit/classic/test/exception_tests.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/exception_tests.cpp (original)
+++ trunk/libs/spirit/classic/test/exception_tests.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -12,7 +12,7 @@
#include <boost/detail/lightweight_test.hpp>
using namespace std;
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
struct handler
{
Modified: trunk/libs/spirit/classic/test/file_iterator_tests.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/file_iterator_tests.cpp (original)
+++ trunk/libs/spirit/classic/test/file_iterator_tests.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -20,7 +20,7 @@
using namespace std;
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
namespace {
Modified: trunk/libs/spirit/classic/test/fixed_size_queue_fail_tests.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/fixed_size_queue_fail_tests.cpp (original)
+++ trunk/libs/spirit/classic/test/fixed_size_queue_fail_tests.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -14,7 +14,7 @@
#include <boost/detail/lightweight_test.hpp>
#include <iostream>
-typedef boost::spirit::fixed_size_queue<int, 5> queue_t;
+typedef BOOST_SPIRIT_CLASSIC_NS::fixed_size_queue<int, 5> queue_t;
typedef queue_t::iterator iter_t;
typedef queue_t::const_iterator const_iter_t;
BOOST_CLASS_REQUIRE(const_iter_t, boost, RandomAccessIteratorConcept);
Modified: trunk/libs/spirit/classic/test/fixed_size_queue_tests.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/fixed_size_queue_tests.cpp (original)
+++ trunk/libs/spirit/classic/test/fixed_size_queue_tests.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -14,7 +14,7 @@
#include <boost/detail/lightweight_test.hpp>
#include <iostream>
-typedef boost::spirit::fixed_size_queue<int, 5> queue_t;
+typedef BOOST_SPIRIT_CLASSIC_NS::fixed_size_queue<int, 5> queue_t;
typedef queue_t::iterator iter_t;
typedef queue_t::const_iterator const_iter_t;
BOOST_CLASS_REQUIRE(const_iter_t, boost, RandomAccessIteratorConcept);
Modified: trunk/libs/spirit/classic/test/for_p_as_parser_tests.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/for_p_as_parser_tests.cpp (original)
+++ trunk/libs/spirit/classic/test/for_p_as_parser_tests.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -43,10 +43,10 @@
//////////////////////////////////
// compile time check wether as_parser<> works for for_p
- ::boost::spirit::rule<> r;
+ ::BOOST_SPIRIT_CLASSIC_NS::rule<> r;
- r = boost::spirit::for_p(&init_fun, &cmp_fun, &step_fun)['-'];
- r = boost::spirit::for_p(init_ftor(), cmp_ftor(), step_ftor())["-"];
+ r = BOOST_SPIRIT_CLASSIC_NS::for_p(&init_fun, &cmp_fun, &step_fun)['-'];
+ r = BOOST_SPIRIT_CLASSIC_NS::for_p(init_ftor(), cmp_ftor(), step_ftor())["-"];
- r = boost::spirit::for_p(init_ftor(), r, step_ftor())[r];
+ r = BOOST_SPIRIT_CLASSIC_NS::for_p(init_ftor(), r, step_ftor())[r];
}
Modified: trunk/libs/spirit/classic/test/for_tests.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/for_tests.cpp (original)
+++ trunk/libs/spirit/classic/test/for_tests.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -68,7 +68,7 @@
}
}
-typedef ::boost::spirit::rule<> rule_t;
+typedef ::BOOST_SPIRIT_CLASSIC_NS::rule<> rule_t;
unsigned int test_count = 0;
unsigned int error_count = 0;
@@ -99,7 +99,7 @@
iterations_performed = 0;
- ::boost::spirit::parse_info<> m = ::boost::spirit::parse(s, s + test_impl::string_length(s), r);
+ ::BOOST_SPIRIT_CLASSIC_NS::parse_info<> m = ::BOOST_SPIRIT_CLASSIC_NS::parse(s, s + test_impl::string_length(s), r);
bool result = (succeed==m.full)?good:bad;
@@ -148,9 +148,9 @@
{
using namespace std;
- using boost::spirit::uint_p;
- using boost::spirit::for_p;
- using boost::spirit::assign_a;
+ using BOOST_SPIRIT_CLASSIC_NS::uint_p;
+ using BOOST_SPIRIT_CLASSIC_NS::for_p;
+ using BOOST_SPIRIT_CLASSIC_NS::assign_a;
#if qDebug
SPIRIT_DEBUG_RULE(for_rule);
Modified: trunk/libs/spirit/classic/test/fundamental_tests.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/fundamental_tests.cpp (original)
+++ trunk/libs/spirit/classic/test/fundamental_tests.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -20,7 +20,7 @@
#include <boost/spirit/include/classic_assign_actor.hpp>
using namespace std;
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
typedef ref_value_actor<char, assign_action> assign_actor;
Modified: trunk/libs/spirit/classic/test/grammar_def_test.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/grammar_def_test.cpp (original)
+++ trunk/libs/spirit/classic/test/grammar_def_test.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -11,13 +11,13 @@
#include <boost/spirit/include/classic_grammar_def.hpp>
struct my_grammar1
- : boost::spirit::grammar<my_grammar1>
+ : BOOST_SPIRIT_CLASSIC_NS::grammar<my_grammar1>
{
template <typename Scanner>
struct definition
- : boost::spirit::grammar_def<
- boost::spirit::rule<Scanner>,
- boost::spirit::same
+ : BOOST_SPIRIT_CLASSIC_NS::grammar_def<
+ BOOST_SPIRIT_CLASSIC_NS::rule<Scanner>,
+ BOOST_SPIRIT_CLASSIC_NS::same
>
{
definition(my_grammar1 const &)
@@ -25,31 +25,31 @@
BOOST_SPIRIT_DEBUG_NODE(start_rule1);
BOOST_SPIRIT_DEBUG_NODE(start_rule2);
- start_rule1 = boost::spirit::str_p("int");
- start_rule2 = boost::spirit::int_p;
+ start_rule1 = BOOST_SPIRIT_CLASSIC_NS::str_p("int");
+ start_rule2 = BOOST_SPIRIT_CLASSIC_NS::int_p;
this->start_parsers(start_rule1, start_rule2);
}
- boost::spirit::rule<Scanner>
+ BOOST_SPIRIT_CLASSIC_NS::rule<Scanner>
start_rule1,
start_rule2;
};
};
-struct my_closure : boost::spirit::closure<my_closure, int>
+struct my_closure : BOOST_SPIRIT_CLASSIC_NS::closure<my_closure, int>
{
member1 value;
};
struct my_grammar2
- : boost::spirit::grammar<my_grammar2, my_closure::context_t>
+ : BOOST_SPIRIT_CLASSIC_NS::grammar<my_grammar2, my_closure::context_t>
{
template <typename Scanner>
struct definition
- : boost::spirit::grammar_def<
- boost::spirit::rule<Scanner>,
- boost::spirit::same
+ : BOOST_SPIRIT_CLASSIC_NS::grammar_def<
+ BOOST_SPIRIT_CLASSIC_NS::rule<Scanner>,
+ BOOST_SPIRIT_CLASSIC_NS::same
>
{
definition(my_grammar2 const &)
@@ -57,13 +57,13 @@
BOOST_SPIRIT_DEBUG_NODE(start_rule1);
BOOST_SPIRIT_DEBUG_NODE(start_rule2);
- start_rule1 = boost::spirit::str_p("int");
- start_rule2 = boost::spirit::int_p;
+ start_rule1 = BOOST_SPIRIT_CLASSIC_NS::str_p("int");
+ start_rule2 = BOOST_SPIRIT_CLASSIC_NS::int_p;
this->start_parsers(start_rule1, start_rule2);
}
- boost::spirit::rule<Scanner>
+ BOOST_SPIRIT_CLASSIC_NS::rule<Scanner>
start_rule1,
start_rule2;
};
@@ -80,6 +80,6 @@
parse(
"int 5",
g1.use_parser<0>() >> g2.use_parser<1>(),
- boost::spirit::space_p
+ BOOST_SPIRIT_CLASSIC_NS::space_p
);
}
Modified: trunk/libs/spirit/classic/test/grammar_mt_tests.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/grammar_mt_tests.cpp (original)
+++ trunk/libs/spirit/classic/test/grammar_mt_tests.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -40,20 +40,20 @@
static boost::mutex simple_mutex;
static int simple_definition_count = 0;
-struct simple : public boost::spirit::grammar<simple>
+struct simple : public BOOST_SPIRIT_CLASSIC_NS::grammar<simple>
{
template <typename ScannerT>
struct definition
{
definition(simple const& /*self*/)
{
- top = boost::spirit::epsilon_p;
+ top = BOOST_SPIRIT_CLASSIC_NS::epsilon_p;
boost::mutex::scoped_lock lock(simple_mutex);
simple_definition_count++;
}
- boost::spirit::rule<ScannerT> top;
- boost::spirit::rule<ScannerT> const &start() const { return top; }
+ BOOST_SPIRIT_CLASSIC_NS::rule<ScannerT> top;
+ BOOST_SPIRIT_CLASSIC_NS::rule<ScannerT> const &start() const { return top; }
};
};
@@ -94,7 +94,7 @@
make_definition(GrammarT &g)
{
char const *text="blah";
- boost::spirit::scanner<> s(text, text+4);
+ BOOST_SPIRIT_CLASSIC_NS::scanner<> s(text, text+4);
g.parse(s);
}
@@ -104,7 +104,7 @@
make_definition3(GrammarT &g)
{
char const *text="blah";
- boost::spirit::scanner<> s(text, text+4);
+ BOOST_SPIRIT_CLASSIC_NS::scanner<> s(text, text+4);
g.parse(s);
nap();
@@ -306,7 +306,7 @@
////////////////////////////////////////////////////////////////////////////////
-static boost::spirit::parse_info<char const *> pi;
+static BOOST_SPIRIT_CLASSIC_NS::parse_info<char const *> pi;
////////////////////////////////////////////////
// These macros are used with BOOST_TEST
Modified: trunk/libs/spirit/classic/test/grammar_multi_instance_tst.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/grammar_multi_instance_tst.cpp (original)
+++ trunk/libs/spirit/classic/test/grammar_multi_instance_tst.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -10,7 +10,7 @@
#include <boost/detail/lightweight_test.hpp>
#include <boost/spirit/include/classic_core.hpp>
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
using namespace std;
int g_count = 0;
Modified: trunk/libs/spirit/classic/test/grammar_tests.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/grammar_tests.cpp (original)
+++ trunk/libs/spirit/classic/test/grammar_tests.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -16,7 +16,7 @@
#define BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE
#include <boost/spirit/include/classic_core.hpp>
#include <boost/spirit/include/classic_grammar_def.hpp>
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
///////////////////////////////////////////////////////////////////////////////
// This feature is disabled on non compliant compilers (e.g. Borland 5.5.1
Modified: trunk/libs/spirit/classic/test/group_match_bug.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/group_match_bug.cpp (original)
+++ trunk/libs/spirit/classic/test/group_match_bug.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -14,7 +14,7 @@
#include <boost/spirit/include/classic_ast.hpp>
#include <boost/spirit/include/classic_parse_tree.hpp>
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
struct test_closure : public closure<test_closure, int>
{
Modified: trunk/libs/spirit/classic/test/if_p_as_parser_tests.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/if_p_as_parser_tests.cpp (original)
+++ trunk/libs/spirit/classic/test/if_p_as_parser_tests.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -22,18 +22,18 @@
//////////////////////////////////
// compile time check wether as_parser<> works for if_p
- ::boost::spirit::rule<> r;
+ ::BOOST_SPIRIT_CLASSIC_NS::rule<> r;
- r = ::boost::spirit::if_p('-')['-'];
- r = ::boost::spirit::if_p("-")["-"];
- r = ::boost::spirit::if_p('-')['-'].else_p['-'];
- r = ::boost::spirit::if_p("-")["-"].else_p["-"];
+ r = ::BOOST_SPIRIT_CLASSIC_NS::if_p('-')['-'];
+ r = ::BOOST_SPIRIT_CLASSIC_NS::if_p("-")["-"];
+ r = ::BOOST_SPIRIT_CLASSIC_NS::if_p('-')['-'].else_p['-'];
+ r = ::BOOST_SPIRIT_CLASSIC_NS::if_p("-")["-"].else_p["-"];
- r = ::boost::spirit::if_p(&fun)["foo"];
- r = ::boost::spirit::if_p(ftor())["foo"];
- r = ::boost::spirit::if_p(&fun)["foo"].else_p["bar"];
- r = ::boost::spirit::if_p(ftor())["foo"].else_p["bar"];
+ r = ::BOOST_SPIRIT_CLASSIC_NS::if_p(&fun)["foo"];
+ r = ::BOOST_SPIRIT_CLASSIC_NS::if_p(ftor())["foo"];
+ r = ::BOOST_SPIRIT_CLASSIC_NS::if_p(&fun)["foo"].else_p["bar"];
+ r = ::BOOST_SPIRIT_CLASSIC_NS::if_p(ftor())["foo"].else_p["bar"];
- r = ::boost::spirit::if_p(r)[r];
- r = ::boost::spirit::if_p(r)[r].else_p[r];
+ r = ::BOOST_SPIRIT_CLASSIC_NS::if_p(r)[r];
+ r = ::BOOST_SPIRIT_CLASSIC_NS::if_p(r)[r].else_p[r];
}
Modified: trunk/libs/spirit/classic/test/if_p_int_as_condition_test.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/if_p_int_as_condition_test.cpp (original)
+++ trunk/libs/spirit/classic/test/if_p_int_as_condition_test.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -12,7 +12,7 @@
#include <iostream>
#include <boost/detail/lightweight_test.hpp>
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
int the_var_to_be_tested = 0;
namespace local
Modified: trunk/libs/spirit/classic/test/if_tests.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/if_tests.cpp (original)
+++ trunk/libs/spirit/classic/test/if_tests.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -8,7 +8,7 @@
http://www.boost.org/LICENSE_1_0.txt)
=============================================================================*/
// vi:ts=4:sw=4:et
-// Tests for boost::spirit::if_p
+// Tests for BOOST_SPIRIT_CLASSIC_NS::if_p
// [28-Dec-2002]
////////////////////////////////////////////////////////////////////////////////
#define qDebug 0
@@ -44,8 +44,8 @@
}
}
-typedef ::boost::spirit::rule<> rule_t;
-typedef ::boost::spirit::rule<boost::spirit::no_actions_scanner<>::type >
+typedef ::BOOST_SPIRIT_CLASSIC_NS::rule<> rule_t;
+typedef ::BOOST_SPIRIT_CLASSIC_NS::rule<BOOST_SPIRIT_CLASSIC_NS::no_actions_scanner<>::type >
no_actions_rule_t;
unsigned int test_count = 0;
@@ -71,7 +71,7 @@
++test_count;
number_result = wanted-1;
- ::boost::spirit::parse_info<> m = ::boost::spirit::parse(s, s + test_impl::string_length(s), r);
+ ::BOOST_SPIRIT_CLASSIC_NS::parse_info<> m = ::BOOST_SPIRIT_CLASSIC_NS::parse(s, s + test_impl::string_length(s), r);
bool result = wanted == kError?(m.full?bad:good): (number_result==wanted);
@@ -101,20 +101,20 @@
{
using namespace std;
- using ::boost::spirit::if_p;
- using ::boost::spirit::str_p;
- using ::boost::spirit::nothing_p;
+ using ::BOOST_SPIRIT_CLASSIC_NS::if_p;
+ using ::BOOST_SPIRIT_CLASSIC_NS::str_p;
+ using ::BOOST_SPIRIT_CLASSIC_NS::nothing_p;
cout << "\nfail enclosed parser:\n";
const char *p = "abc";
- ::boost::spirit::strlit<const char*> success_p = str_p(p);
- ::boost::spirit::strlit<const char*> fail_p = str_p("xxx");
+ ::BOOST_SPIRIT_CLASSIC_NS::strlit<const char*> success_p = str_p(p);
+ ::BOOST_SPIRIT_CLASSIC_NS::strlit<const char*> fail_p = str_p("xxx");
- ::boost::spirit::rule<> r = if_p(success_p)[nothing_p];
+ ::BOOST_SPIRIT_CLASSIC_NS::rule<> r = if_p(success_p)[nothing_p];
- ::boost::spirit::parse_info<> m = ::boost::spirit::parse(p, r);
+ ::BOOST_SPIRIT_CLASSIC_NS::parse_info<> m = ::BOOST_SPIRIT_CLASSIC_NS::parse(p, r);
if (m.full) {
cout << "FAILED: if --> match" << endl;
@@ -125,7 +125,7 @@
r = if_p(fail_p)[success_p].else_p[nothing_p];
- m = ::boost::spirit::parse(p, r);
+ m = ::BOOST_SPIRIT_CLASSIC_NS::parse(p, r);
if (m.full) {
cout << "FAILED: else --> match" << endl;
@@ -139,13 +139,13 @@
main()
{
using namespace std;
- using ::boost::spirit::if_p;
- using ::boost::spirit::uint_p;
- using ::boost::spirit::oct_p;
- using ::boost::spirit::hex_p;
- using ::boost::spirit::str_p;
- using ::boost::spirit::ch_p;
- using ::boost::spirit::assign_a;
+ using ::BOOST_SPIRIT_CLASSIC_NS::if_p;
+ using ::BOOST_SPIRIT_CLASSIC_NS::uint_p;
+ using ::BOOST_SPIRIT_CLASSIC_NS::oct_p;
+ using ::BOOST_SPIRIT_CLASSIC_NS::hex_p;
+ using ::BOOST_SPIRIT_CLASSIC_NS::str_p;
+ using ::BOOST_SPIRIT_CLASSIC_NS::ch_p;
+ using ::BOOST_SPIRIT_CLASSIC_NS::assign_a;
cout << "/////////////////////////////////////////////////////////\n";
cout << "\n";
@@ -178,7 +178,7 @@
[hex_rule]
.else_p
[
- if_p(::boost::spirit::eps_p(oct_prefix))
+ if_p(::BOOST_SPIRIT_CLASSIC_NS::eps_p(oct_prefix))
[oct_rule]
.else_p
[dec_rule]
@@ -213,12 +213,12 @@
//////////////////////////////////
// tests for if_p without else-parser
cout << "\nno-else:\n";
- rule_t r = if_p(::boost::spirit::eps_p('0'))[oct_rule];
+ rule_t r = if_p(::BOOST_SPIRIT_CLASSIC_NS::eps_p('0'))[oct_rule];
test_number("0", 0, r);
++test_count;
- ::boost::spirit::parse_info<> m = ::boost::spirit::parse("", r);
+ ::BOOST_SPIRIT_CLASSIC_NS::parse_info<> m = ::BOOST_SPIRIT_CLASSIC_NS::parse("", r);
if (!m.hit || !m.full || m.length!=0)
{
std::cout << "FAILED: \"\" ==> <error>\n";
@@ -228,7 +228,7 @@
std::cout << "PASSED: \"\" ==> <empty match>\n";
++test_count;
- m = ::boost::spirit::parse("junk", r);
+ m = ::BOOST_SPIRIT_CLASSIC_NS::parse("junk", r);
if (!m.hit || m.full || m.length!=0)
{
std::cout << "FAILED: \"junk\" ==> <error>\n";
Modified: trunk/libs/spirit/classic/test/lazy_tests.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/lazy_tests.cpp (original)
+++ trunk/libs/spirit/classic/test/lazy_tests.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -14,7 +14,7 @@
#include <boost/detail/lightweight_test.hpp>
using namespace boost;
-using namespace spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
using namespace phoenix;
int main()
Modified: trunk/libs/spirit/classic/test/loops_tests.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/loops_tests.cpp (original)
+++ trunk/libs/spirit/classic/test/loops_tests.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -14,7 +14,7 @@
//#define BOOST_SPIRIT_DEBUG
#include <boost/spirit/include/classic_core.hpp>
#include <boost/spirit/include/classic_loops.hpp>
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
///////////////////////////////////////////////////////////////////////////////
//
Modified: trunk/libs/spirit/classic/test/match_tests.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/match_tests.cpp (original)
+++ trunk/libs/spirit/classic/test/match_tests.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -13,7 +13,7 @@
using namespace std;
#include <boost/spirit/include/classic_core.hpp>
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
///////////////////////////////////////////////////////////////////////////////
//
Modified: trunk/libs/spirit/classic/test/mix_and_match_trees.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/mix_and_match_trees.cpp (original)
+++ trunk/libs/spirit/classic/test/mix_and_match_trees.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -19,7 +19,7 @@
#include <boost/spirit/include/classic_ast.hpp>
#include <boost/spirit/include/classic_parse_tree.hpp>
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
struct my_grammar : grammar<my_grammar>
{
Modified: trunk/libs/spirit/classic/test/multi_pass_compile_tests.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/multi_pass_compile_tests.cpp (original)
+++ trunk/libs/spirit/classic/test/multi_pass_compile_tests.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -26,7 +26,7 @@
#include <io.h> // unlink()
#endif
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
using namespace std;
int main ()
Modified: trunk/libs/spirit/classic/test/multi_pass_tests.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/multi_pass_tests.cpp (original)
+++ trunk/libs/spirit/classic/test/multi_pass_tests.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -14,7 +14,7 @@
#include "impl/sstream.hpp"
using namespace std;
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
sstream_t res;
@@ -255,7 +255,7 @@
res << **mp3; // this should throw illegal_backtracking
BOOST_TEST(0);
}
- catch (const boost::spirit::multi_pass_policies::illegal_backtracking& /*e*/)
+ catch (const BOOST_SPIRIT_CLASSIC_NS::multi_pass_policies::illegal_backtracking& /*e*/)
{
}
res << endl;
@@ -618,7 +618,7 @@
res << **mp3; // this should throw illegal_backtracking
BOOST_TEST(0);
}
- catch (const boost::spirit::multi_pass_policies::illegal_backtracking& /*e*/)
+ catch (const BOOST_SPIRIT_CLASSIC_NS::multi_pass_policies::illegal_backtracking& /*e*/)
{
}
res << endl;
Modified: trunk/libs/spirit/classic/test/negated_eps_p_test.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/negated_eps_p_test.cpp (original)
+++ trunk/libs/spirit/classic/test/negated_eps_p_test.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -14,7 +14,7 @@
#include <iostream>
#include <string>
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
using namespace phoenix;
int main()
Modified: trunk/libs/spirit/classic/test/numerics_tests.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/numerics_tests.cpp (original)
+++ trunk/libs/spirit/classic/test/numerics_tests.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -13,7 +13,7 @@
#include <boost/detail/lightweight_test.hpp>
using namespace std;
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
template <typename T>
struct ts_real_parser_policies : public ureal_parser_policies<T>
Modified: trunk/libs/spirit/classic/test/operators_tests.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/operators_tests.cpp (original)
+++ trunk/libs/spirit/classic/test/operators_tests.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -13,7 +13,7 @@
//#define BOOST_SPIRIT_DEBUG
#include <boost/spirit/include/classic_core.hpp>
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
///////////////////////////////////////////////////////////////////////////////
//
Modified: trunk/libs/spirit/classic/test/owi_mt_tests.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/owi_mt_tests.cpp (original)
+++ trunk/libs/spirit/classic/test/owi_mt_tests.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -50,7 +50,7 @@
#include <algorithm>
#include <boost/detail/lightweight_test.hpp>
-using boost::spirit::impl::object_with_id;
+using BOOST_SPIRIT_CLASSIC_NS::impl::object_with_id;
struct tag1 {};
typedef object_with_id<tag1> class1;
Modified: trunk/libs/spirit/classic/test/owi_st_tests.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/owi_st_tests.cpp (original)
+++ trunk/libs/spirit/classic/test/owi_st_tests.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -13,7 +13,7 @@
#include <boost/detail/lightweight_test.hpp>
#include <iostream>
-using boost::spirit::impl::object_with_id;
+using BOOST_SPIRIT_CLASSIC_NS::impl::object_with_id;
struct tag1 {};
struct tag2 {};
Modified: trunk/libs/spirit/classic/test/parametric_tests.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/parametric_tests.cpp (original)
+++ trunk/libs/spirit/classic/test/parametric_tests.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -17,7 +17,7 @@
#include <boost/spirit/include/classic_parametric.hpp>
#include <boost/spirit/include/phoenix1_primitives.hpp>
#include <boost/spirit/include/phoenix1_operators.hpp>
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
using namespace phoenix;
#include <boost/detail/lightweight_test.hpp>
Modified: trunk/libs/spirit/classic/test/parser_context_test.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/parser_context_test.cpp (original)
+++ trunk/libs/spirit/classic/test/parser_context_test.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -11,7 +11,7 @@
#include <boost/spirit/include/classic_assign_actor.hpp>
using namespace boost;
-using namespace spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
int main()
{
Modified: trunk/libs/spirit/classic/test/parser_traits_tests.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/parser_traits_tests.cpp (original)
+++ trunk/libs/spirit/classic/test/parser_traits_tests.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -18,7 +18,7 @@
#include <boost/spirit/include/classic_assign_actor.hpp>
using namespace std;
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
typedef ref_value_actor<char, assign_action> assign_actor;
Modified: trunk/libs/spirit/classic/test/position_iterator_tests.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/position_iterator_tests.cpp (original)
+++ trunk/libs/spirit/classic/test/position_iterator_tests.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -21,7 +21,7 @@
#include <boost/spirit/include/classic_position_iterator.hpp>
using namespace std;
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
namespace mpl = boost::mpl;
///////////////////////////////////////////////////////////////////////////////
Modified: trunk/libs/spirit/classic/test/post_skips.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/post_skips.cpp (original)
+++ trunk/libs/spirit/classic/test/post_skips.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -17,7 +17,7 @@
#include <boost/detail/lightweight_test.hpp>
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
char const * test1 = " 12345 ";
char const * test2 = " 12345 x";
Modified: trunk/libs/spirit/classic/test/primitives_tests.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/primitives_tests.cpp (original)
+++ trunk/libs/spirit/classic/test/primitives_tests.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -13,7 +13,7 @@
#include <boost/spirit/include/classic_core.hpp>
#include <boost/detail/lightweight_test.hpp>
#include "impl/string_length.hpp"
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
///////////////////////////////////////////////////////////////////////////////
//
Modified: trunk/libs/spirit/classic/test/repeat_ast_tests.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/repeat_ast_tests.cpp (original)
+++ trunk/libs/spirit/classic/test/repeat_ast_tests.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -19,7 +19,7 @@
# include <boost/spirit/include/classic_ast.hpp>
# include <boost/spirit/include/classic_tree_to_xml.hpp>
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
static const int numID = 1;
static const int funcID = 2;
Modified: trunk/libs/spirit/classic/test/rule_tests.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/rule_tests.cpp (original)
+++ trunk/libs/spirit/classic/test/rule_tests.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -16,7 +16,7 @@
#include <boost/spirit/include/classic_core.hpp>
#include <boost/spirit/include/classic_stored_rule.hpp>
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
///////////////////////////////////////////////////////////////////////////////
//
Modified: trunk/libs/spirit/classic/test/scanner_tests.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/scanner_tests.cpp (original)
+++ trunk/libs/spirit/classic/test/scanner_tests.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -14,7 +14,7 @@
#include <boost/spirit/include/classic_core.hpp>
#include "impl/string_length.hpp"
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
///////////////////////////////////////////////////////////////////////////////
//
Modified: trunk/libs/spirit/classic/test/scanner_value_type_tests.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/scanner_value_type_tests.cpp (original)
+++ trunk/libs/spirit/classic/test/scanner_value_type_tests.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -19,7 +19,7 @@
#include <deque>
#include <iostream>
-namespace sp = boost::spirit;
+namespace sp = BOOST_SPIRIT_CLASSIC_NS;
namespace {
Modified: trunk/libs/spirit/classic/test/scoped_lock_tests.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/scoped_lock_tests.cpp (original)
+++ trunk/libs/spirit/classic/test/scoped_lock_tests.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -43,10 +43,10 @@
{
banner();
- using boost::spirit::rule;
- using boost::spirit::scoped_lock_d;
- using boost::spirit::parse_info;
- using boost::spirit::parse;
+ using BOOST_SPIRIT_CLASSIC_NS::rule;
+ using BOOST_SPIRIT_CLASSIC_NS::scoped_lock_d;
+ using BOOST_SPIRIT_CLASSIC_NS::parse_info;
+ using BOOST_SPIRIT_CLASSIC_NS::parse;
using boost::mutex;
mutex m;
Modified: trunk/libs/spirit/classic/test/select_p_with_rule.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/select_p_with_rule.cpp (original)
+++ trunk/libs/spirit/classic/test/select_p_with_rule.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -16,7 +16,7 @@
#include <boost/spirit/include/classic_lists.hpp>
#include <boost/spirit/include/classic_select.hpp>
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
using namespace std;
struct format_grammar : public grammar<format_grammar>
Modified: trunk/libs/spirit/classic/test/sf_bug_720917.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/sf_bug_720917.cpp (original)
+++ trunk/libs/spirit/classic/test/sf_bug_720917.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -13,7 +13,7 @@
#include <boost/detail/lightweight_test.hpp>
using namespace std;
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
// Test for bug #720917
// http://sf.net/tracker/index.php?func=detail&aid=720917&group_id=28447&atid=393386
Modified: trunk/libs/spirit/classic/test/shortest_alternative_tests.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/shortest_alternative_tests.cpp (original)
+++ trunk/libs/spirit/classic/test/shortest_alternative_tests.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -9,7 +9,7 @@
#include <boost/spirit/include/classic_core.hpp>
#include <boost/detail/lightweight_test.hpp>
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
void shortest_alternative_parser_test()
{
Modified: trunk/libs/spirit/classic/test/subrule_tests.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/subrule_tests.cpp (original)
+++ trunk/libs/spirit/classic/test/subrule_tests.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -12,7 +12,7 @@
using namespace std;
#include <boost/spirit/include/classic_core.hpp>
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
///////////////////////////////////////////////////////////////////////////////
//
Modified: trunk/libs/spirit/classic/test/switch_problem.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/switch_problem.cpp (original)
+++ trunk/libs/spirit/classic/test/switch_problem.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -26,7 +26,7 @@
#include <iostream>
#include <string>
-namespace spirit = boost::spirit;
+namespace spirit = BOOST_SPIRIT_CLASSIC_NS;
typedef unsigned int uint;
Modified: trunk/libs/spirit/classic/test/switch_tests_eps_default.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/switch_tests_eps_default.cpp (original)
+++ trunk/libs/spirit/classic/test/switch_tests_eps_default.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -29,7 +29,7 @@
#include <boost/spirit/include/classic_select.hpp>
#include <boost/spirit/include/classic_closure.hpp>
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
namespace test_grammars {
@@ -165,7 +165,7 @@
///////////////////////////////////////////////////////////////////////////////
// Test the switch_p usage given an actor as the switch condition
- struct select_result : public boost::spirit::closure<select_result, int>
+ struct select_result : public BOOST_SPIRIT_CLASSIC_NS::closure<select_result, int>
{
member1 val;
};
Modified: trunk/libs/spirit/classic/test/switch_tests_general_def.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/switch_tests_general_def.cpp (original)
+++ trunk/libs/spirit/classic/test/switch_tests_general_def.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -29,7 +29,7 @@
#include <boost/spirit/include/classic_select.hpp>
#include <boost/spirit/include/classic_closure.hpp>
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
namespace test_grammars {
@@ -165,7 +165,7 @@
///////////////////////////////////////////////////////////////////////////////
// Test the switch_p usage given an actor as the switch condition
- struct select_result : public boost::spirit::closure<select_result, int>
+ struct select_result : public BOOST_SPIRIT_CLASSIC_NS::closure<select_result, int>
{
member1 val;
};
Modified: trunk/libs/spirit/classic/test/switch_tests_single.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/switch_tests_single.cpp (original)
+++ trunk/libs/spirit/classic/test/switch_tests_single.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -29,7 +29,7 @@
#include <boost/spirit/include/classic_select.hpp>
#include <boost/spirit/include/classic_closure.hpp>
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
namespace test_grammars {
@@ -147,7 +147,7 @@
///////////////////////////////////////////////////////////////////////////////
// Test the switch_p usage given an actor as the switch condition
- struct select_result : public boost::spirit::closure<select_result, int>
+ struct select_result : public BOOST_SPIRIT_CLASSIC_NS::closure<select_result, int>
{
member1 val;
};
Modified: trunk/libs/spirit/classic/test/switch_tests_wo_default.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/switch_tests_wo_default.cpp (original)
+++ trunk/libs/spirit/classic/test/switch_tests_wo_default.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -29,7 +29,7 @@
#include <boost/spirit/include/classic_select.hpp>
#include <boost/spirit/include/classic_closure.hpp>
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
namespace test_grammars {
@@ -79,7 +79,7 @@
///////////////////////////////////////////////////////////////////////////////
// Test the switch_p usage given an actor as the switch condition
- struct select_result : public boost::spirit::closure<select_result, int>
+ struct select_result : public BOOST_SPIRIT_CLASSIC_NS::closure<select_result, int>
{
member1 val;
};
Modified: trunk/libs/spirit/classic/test/symbols_add_null.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/symbols_add_null.cpp (original)
+++ trunk/libs/spirit/classic/test/symbols_add_null.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -40,8 +40,8 @@
int main()
{
- typedef boost::spirit::scanner<> scanner;
- typedef boost::spirit::impl::tst<void *, char_type> symbols;
+ typedef BOOST_SPIRIT_CLASSIC_NS::scanner<> scanner;
+ typedef BOOST_SPIRIT_CLASSIC_NS::impl::tst<void *, char_type> symbols;
symbols symbols_;
Modified: trunk/libs/spirit/classic/test/symbols_find_null.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/symbols_find_null.cpp (original)
+++ trunk/libs/spirit/classic/test/symbols_find_null.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -22,8 +22,8 @@
int main()
{
- typedef boost::spirit::scanner<> scanner;
- typedef boost::spirit::impl::tst<void *, char_type> symbols;
+ typedef BOOST_SPIRIT_CLASSIC_NS::scanner<> scanner;
+ typedef BOOST_SPIRIT_CLASSIC_NS::impl::tst<void *, char_type> symbols;
symbols symbols_;
Modified: trunk/libs/spirit/classic/test/symbols_tests.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/symbols_tests.cpp (original)
+++ trunk/libs/spirit/classic/test/symbols_tests.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -16,7 +16,7 @@
///////////////////////////////////////////////////////////////////////////////
using namespace std;
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
///////////////////////////////////////////////////////////////////////////////
Modified: trunk/libs/spirit/classic/test/traverse_tests.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/traverse_tests.cpp (original)
+++ trunk/libs/spirit/classic/test/traverse_tests.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -45,7 +45,7 @@
#include <boost/spirit/include/classic_meta.hpp>
using namespace std;
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
typedef ref_value_actor<char, assign_action> assign_actor;
@@ -385,6 +385,9 @@
}
}
+#if defined(_countof)
+#undef _countof
+#endif
#define _countof(x) (sizeof(x)/sizeof(x[0]))
void
Modified: trunk/libs/spirit/classic/test/tree_tests.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/tree_tests.cpp (original)
+++ trunk/libs/spirit/classic/test/tree_tests.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -63,7 +63,7 @@
// Framework setup
namespace mpl = boost::mpl;
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
using namespace std;
Modified: trunk/libs/spirit/classic/test/tree_to_xml.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/tree_to_xml.cpp (original)
+++ trunk/libs/spirit/classic/test/tree_to_xml.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -18,7 +18,7 @@
#include <fstream>
#include <string>
-using namespace boost::spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
///////////////////////////////////////////////////////////////////////////////
struct calculator : public grammar<calculator>
Modified: trunk/libs/spirit/classic/test/while_p_as_parser_tests.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/while_p_as_parser_tests.cpp (original)
+++ trunk/libs/spirit/classic/test/while_p_as_parser_tests.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -22,21 +22,21 @@
//////////////////////////////////
// compile time check wether as_parser<> works for while_p
- ::boost::spirit::rule<> r;
+ ::BOOST_SPIRIT_CLASSIC_NS::rule<> r;
- r = ::boost::spirit::while_p('-')['-'];
- r = ::boost::spirit::while_p("-")["-"];
+ r = ::BOOST_SPIRIT_CLASSIC_NS::while_p('-')['-'];
+ r = ::BOOST_SPIRIT_CLASSIC_NS::while_p("-")["-"];
- r = ::boost::spirit::while_p(&fun)["foo"];
- r = ::boost::spirit::while_p(ftor())["foo"];
+ r = ::BOOST_SPIRIT_CLASSIC_NS::while_p(&fun)["foo"];
+ r = ::BOOST_SPIRIT_CLASSIC_NS::while_p(ftor())["foo"];
- r = ::boost::spirit::while_p(r)[r];
+ r = ::BOOST_SPIRIT_CLASSIC_NS::while_p(r)[r];
- r = ::boost::spirit::do_p['-'].while_p('-');
- r = ::boost::spirit::do_p["-"].while_p("-");
+ r = ::BOOST_SPIRIT_CLASSIC_NS::do_p['-'].while_p('-');
+ r = ::BOOST_SPIRIT_CLASSIC_NS::do_p["-"].while_p("-");
- r = ::boost::spirit::do_p["foo"].while_p(&fun);
- r = ::boost::spirit::do_p["foo"].while_p(ftor());
+ r = ::BOOST_SPIRIT_CLASSIC_NS::do_p["foo"].while_p(&fun);
+ r = ::BOOST_SPIRIT_CLASSIC_NS::do_p["foo"].while_p(ftor());
- r = ::boost::spirit::do_p[r].while_p(r);
+ r = ::BOOST_SPIRIT_CLASSIC_NS::do_p[r].while_p(r);
}
Modified: trunk/libs/spirit/classic/test/while_tests.cpp
==============================================================================
--- trunk/libs/spirit/classic/test/while_tests.cpp (original)
+++ trunk/libs/spirit/classic/test/while_tests.cpp 2008-04-13 12:28:27 EDT (Sun, 13 Apr 2008)
@@ -7,7 +7,7 @@
http://www.boost.org/LICENSE_1_0.txt)
==============================================================================*/
// vi:ts=4:sw=4:et
-// Tests for boost::spirit::while_p
+// Tests for BOOST_SPIRIT_CLASSIC_NS::while_p
// [28-Dec-2002]
////////////////////////////////////////////////////////////////////////////////
#define qDebug 0
@@ -68,7 +68,7 @@
}
}
-typedef boost::spirit::rule<> rule_t;
+typedef BOOST_SPIRIT_CLASSIC_NS::rule<> rule_t;
unsigned int test_count = 0;
unsigned int error_count = 0;
@@ -96,7 +96,7 @@
number_result = 0;
iterations_performed = 0;
- boost::spirit::parse_info<> m = boost::spirit::parse(s, s+ test_impl::string_length(s), r);
+ BOOST_SPIRIT_CLASSIC_NS::parse_info<> m = BOOST_SPIRIT_CLASSIC_NS::parse(s, s+ test_impl::string_length(s), r);
bool result = wanted == kError?(m.full?bad:good): (number_result==wanted);
@@ -150,10 +150,10 @@
main()
{
using namespace std;
- using ::boost::spirit::uint_p;
- using ::boost::spirit::while_p;
- using ::boost::spirit::do_p;
- using ::boost::spirit::assign_a;
+ using ::BOOST_SPIRIT_CLASSIC_NS::uint_p;
+ using ::BOOST_SPIRIT_CLASSIC_NS::while_p;
+ using ::BOOST_SPIRIT_CLASSIC_NS::do_p;
+ using ::BOOST_SPIRIT_CLASSIC_NS::assign_a;
#if qDebug
BOOST_SPIRIT_DEBUG_RULE(while_rule);
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