From 5115faf51ebd96a7fd9749eca4ff4a0677f0ff7d Mon Sep 17 00:00:00 2001
From: Hartmut Kaiser <hartmut.kaiser@gmail.com>
Date: Sat, 24 Dec 2005 19:50:47 +0000
Subject: [PATCH] Updated the Wave copyright notice to include the year 2006.

[SVN r32154]
---
 ChangeLog                                     | 12 ++-
 build/Jamfile                                 |  2 +-
 build/Jamfile.v2                              |  2 +-
 doc/acknowledgements.html                     |  2 +-
 doc/class_reference_context.html              |  2 +-
 doc/class_reference_ctxpolicy.html            |  2 +-
 doc/class_reference_filepos.html              |  2 +-
 doc/class_reference_inptpolcy.html            |  2 +-
 doc/class_reference_lexer.html                |  2 +-
 doc/class_reference_tokentype.html            |  2 +-
 doc/compiletime_config.html                   |  2 +-
 doc/introduction.html                         |  2 +-
 doc/macro_expansion_process.html              |  2 +-
 doc/predefined_macros.html                    |  2 +-
 doc/preface.html                              |  2 +-
 doc/quickstart.html                           |  2 +-
 doc/references.html                           |  2 +-
 doc/samples.html                              |  2 +-
 doc/supported_pragmas.html                    |  2 +-
 doc/token_ids.html                            |  2 +-
 doc/tracing_facility.html                     |  2 +-
 doc/wave_driver.html                          |  2 +-
 include/boost/wave.hpp                        |  2 +-
 include/boost/wave/cpp_context.hpp            |  9 ++-
 include/boost/wave/cpp_exceptions.hpp         | 79 +++++++++++++++++--
 include/boost/wave/cpp_iteration_context.hpp  |  2 +-
 .../boost/wave/cpplexer/convert_trigraphs.hpp |  2 +-
 .../boost/wave/cpplexer/cpp_lex_interface.hpp |  2 +-
 .../boost/wave/cpplexer/cpp_lex_iterator.hpp  |  2 +-
 include/boost/wave/cpplexer/cpp_lex_token.hpp |  2 +-
 .../wave/cpplexer/cpplexer_exceptions.hpp     |  2 +-
 include/boost/wave/cpplexer/re2clex/aq.hpp    |  2 +-
 .../boost/wave/cpplexer/re2clex/cpp_re.hpp    |  2 +-
 .../wave/cpplexer/re2clex/cpp_re2c_lexer.hpp  |  2 +-
 .../boost/wave/cpplexer/re2clex/scanner.hpp   |  2 +-
 include/boost/wave/cpplexer/token_cache.hpp   |  2 +-
 .../wave/cpplexer/validate_universal_char.hpp |  2 +-
 .../boost/wave/grammars/cpp_chlit_grammar.hpp |  2 +-
 .../wave/grammars/cpp_defined_grammar.hpp     |  2 +-
 .../wave/grammars/cpp_defined_grammar_gen.hpp |  2 +-
 .../wave/grammars/cpp_expression_grammar.hpp  |  2 +-
 .../grammars/cpp_expression_grammar_gen.hpp   |  2 +-
 .../wave/grammars/cpp_expression_value.hpp    |  2 +-
 include/boost/wave/grammars/cpp_grammar.hpp   |  2 +-
 .../boost/wave/grammars/cpp_grammar_gen.hpp   |  2 +-
 .../wave/grammars/cpp_intlit_grammar.hpp      |  2 +-
 .../wave/grammars/cpp_literal_grammar_gen.hpp |  2 +-
 .../wave/grammars/cpp_predef_macros_gen.hpp   |  2 +-
 .../grammars/cpp_predef_macros_grammar.hpp    |  2 +-
 include/boost/wave/language_support.hpp       |  2 +-
 include/boost/wave/preprocessing_hooks.hpp    |  2 +-
 include/boost/wave/token_ids.hpp              |  2 +-
 include/boost/wave/util/cpp_ifblock.hpp       |  2 +-
 include/boost/wave/util/cpp_include_paths.hpp |  2 +-
 include/boost/wave/util/cpp_iterator.hpp      |  2 +-
 include/boost/wave/util/cpp_macromap.hpp      | 56 ++++++++++---
 .../boost/wave/util/cpp_macromap_predef.hpp   |  2 +-
 .../boost/wave/util/cpp_macromap_utils.hpp    |  2 +-
 include/boost/wave/util/file_position.hpp     |  2 +-
 include/boost/wave/util/functor_input.hpp     |  2 +-
 .../wave/util/insert_whitespace_detection.hpp |  2 +-
 include/boost/wave/util/interpret_pragma.hpp  |  2 +-
 include/boost/wave/util/iteration_context.hpp |  2 +-
 include/boost/wave/util/macro_definition.hpp  |  2 +-
 include/boost/wave/util/macro_helpers.hpp     |  2 +-
 include/boost/wave/util/pattern_parser.hpp    |  2 +-
 include/boost/wave/util/symbol_table.hpp      |  2 +-
 .../wave/util/time_conversion_helper.hpp      |  2 +-
 .../boost/wave/util/transform_iterator.hpp    |  2 +-
 .../boost/wave/util/unput_queue_iterator.hpp  |  2 +-
 include/boost/wave/wave_config.hpp            |  2 +-
 include/boost/wave/wave_version.hpp           |  2 +-
 include/boost/wave/whitespace_handling.hpp    |  2 +-
 index.html                                    |  4 +-
 samples/advanced_hooks/advanced_hooks.cpp     |  2 +-
 .../advanced_preprocessing_hooks.hpp          |  2 +-
 samples/advanced_hooks/build/Jamfile          |  2 +-
 samples/advanced_hooks/build/Jamfile.v2       |  2 +-
 samples/cpp_tokens/build/Jamfile              |  2 +-
 samples/cpp_tokens/build/Jamfile.v2           |  2 +-
 samples/cpp_tokens/cpp_tokens.cpp             |  2 +-
 samples/cpp_tokens/cpp_tokens.hpp             |  2 +-
 samples/cpp_tokens/cpp_tokens_config.hpp      |  2 +-
 .../instantiate_cpp_exprgrammar.cpp           |  2 +-
 .../cpp_tokens/instantiate_cpp_grammar.cpp    |  2 +-
 .../cpp_tokens/instantiate_cpp_literalgrs.cpp |  2 +-
 .../instantiate_defined_grammar.cpp           |  2 +-
 samples/cpp_tokens/instantiate_slex_lexer.cpp |  2 +-
 samples/cpp_tokens/slex/cpp_slex_lexer.hpp    |  2 +-
 samples/cpp_tokens/slex/lexer.hpp             |  2 +-
 samples/cpp_tokens/slex_interface.hpp         |  2 +-
 samples/cpp_tokens/slex_iterator.hpp          |  2 +-
 samples/cpp_tokens/slex_token.hpp             |  2 +-
 samples/lexed_tokens/build/Jamfile            |  2 +-
 samples/lexed_tokens/build/Jamfile.v2         |  2 +-
 samples/lexed_tokens/lexed_tokens.cpp         |  2 +-
 samples/list_includes/build/Jamfile           |  2 +-
 samples/list_includes/build/Jamfile.v2        |  2 +-
 samples/list_includes/list_includes.cpp       |  2 +-
 samples/list_includes/list_includes.hpp       |  2 +-
 .../list_includes/list_includes_config.hpp    |  2 +-
 .../list_includes/list_includes_version.hpp   |  2 +-
 samples/quick_start/build/Jamfile             |  2 +-
 samples/quick_start/build/Jamfile.v2          |  2 +-
 samples/quick_start/quick_start.cpp           |  2 +-
 samples/waveidl/build/Jamfile                 |  2 +-
 samples/waveidl/build/Jamfile.v2              |  2 +-
 samples/waveidl/idl.cpp                       |  4 +-
 samples/waveidl/idl.hpp                       |  2 +-
 samples/waveidl/idl_config.hpp                |  2 +-
 samples/waveidl/idl_version.hpp               |  2 +-
 samples/waveidl/idllexer/idl.re               |  2 +-
 .../waveidl/idllexer/idl_lex_interface.hpp    |  2 +-
 samples/waveidl/idllexer/idl_lex_iterator.hpp |  2 +-
 samples/waveidl/idllexer/idl_re.cpp           |  2 +-
 samples/waveidl/idllexer/idl_re.hpp           |  2 +-
 samples/waveidl/idllexer/idl_re2c_lexer.hpp   |  2 +-
 samples/waveidl/instantiate_cpp_grammar.cpp   |  2 +-
 .../waveidl/instantiate_defined_grammar.cpp   |  2 +-
 samples/waveidl/instantiate_predef_macros.cpp |  2 +-
 samples/waveidl/instantiate_re2c_lexer.cpp    |  2 +-
 .../waveidl/instantiate_re2c_lexer_str.cpp    |  2 +-
 src/cpplexer/re2clex/aq.cpp                   |  2 +-
 src/cpplexer/re2clex/cpp.re                   |  2 +-
 src/cpplexer/re2clex/cpp_re.cpp               |  2 +-
 src/cpplexer/re2clex/cpp_re.inc               |  2 +-
 src/cpplexer/re2clex/strict_cpp.re            |  2 +-
 src/cpplexer/re2clex/strict_cpp_re.inc        |  2 +-
 src/instantiate_cpp_exprgrammar.cpp           |  2 +-
 src/instantiate_cpp_grammar.cpp               |  2 +-
 src/instantiate_cpp_literalgrs.cpp            |  2 +-
 src/instantiate_defined_grammar.cpp           |  2 +-
 src/instantiate_predef_macros.cpp             |  2 +-
 src/instantiate_re2c_lexer.cpp                |  2 +-
 src/instantiate_re2c_lexer_str.cpp            |  2 +-
 test/build/Jamfile                            |  2 +-
 test/testlexers/cpp_tokens.hpp                |  2 +-
 test/testlexers/test_re2c_lexer.cpp           |  2 +-
 test/testlexers/test_slex_lexer.cpp           |  2 +-
 test/testwave/cmd_line_utils.hpp              |  2 +-
 test/testwave/testfiles/t_1_001.cpp           |  2 +-
 test/testwave/testfiles/t_1_002.cpp           |  2 +-
 test/testwave/testfiles/t_1_003.cpp           |  2 +-
 test/testwave/testfiles/t_1_004.cpp           |  2 +-
 test/testwave/testfiles/t_1_005.cpp           |  2 +-
 test/testwave/testfiles/t_1_006.cpp           |  2 +-
 test/testwave/testfiles/t_1_007.cpp           |  2 +-
 test/testwave/testfiles/t_1_008.cpp           |  2 +-
 test/testwave/testfiles/t_1_009.cpp           |  2 +-
 test/testwave/testfiles/t_1_010.cpp           |  2 +-
 test/testwave/testfiles/t_1_011.cpp           |  2 +-
 test/testwave/testfiles/t_1_012.cpp           |  2 +-
 test/testwave/testfiles/t_1_013.cpp           |  2 +-
 test/testwave/testfiles/t_1_014.cpp           |  2 +-
 test/testwave/testfiles/t_1_015.cpp           |  2 +-
 test/testwave/testfiles/t_1_016.cpp           |  2 +-
 test/testwave/testfiles/t_1_017.cpp           |  2 +-
 test/testwave/testfiles/t_1_018.cpp           |  2 +-
 test/testwave/testfiles/t_1_019.cpp           |  2 +-
 test/testwave/testfiles/t_1_020.cpp           |  2 +-
 test/testwave/testfiles/t_1_021.cpp           |  2 +-
 test/testwave/testfiles/t_1_022.cpp           |  2 +-
 test/testwave/testfiles/t_1_023.cpp           |  2 +-
 test/testwave/testfiles/t_1_024.cpp           |  2 +-
 test/testwave/testfiles/t_1_025.cpp           |  2 +-
 test/testwave/testfiles/t_1_026.cpp           |  2 +-
 test/testwave/testfiles/t_1_027.cpp           |  2 +-
 test/testwave/testfiles/t_1_028.cpp           |  2 +-
 test/testwave/testfiles/t_1_029.cpp           |  2 +-
 test/testwave/testfiles/t_1_030.cpp           |  2 +-
 test/testwave/testfiles/t_1_031.cpp           |  2 +-
 test/testwave/testfiles/t_1_032.cpp           |  2 +-
 test/testwave/testfiles/t_1_033.cpp           |  2 +-
 test/testwave/testfiles/t_1_034.cpp           |  2 +-
 test/testwave/testfiles/t_1_035.cpp           |  2 +-
 test/testwave/testfiles/t_1_036.cpp           |  2 +-
 test/testwave/testfiles/t_1_037.cpp           |  2 +-
 test/testwave/testfiles/t_2_001.cpp           |  2 +-
 test/testwave/testfiles/t_2_002.cpp           |  2 +-
 test/testwave/testfiles/t_2_003.cpp           |  2 +-
 test/testwave/testfiles/t_2_004.cpp           |  2 +-
 test/testwave/testfiles/t_2_005.cpp           |  2 +-
 test/testwave/testfiles/t_2_006.cpp           |  2 +-
 test/testwave/testfiles/t_2_007.cpp           |  2 +-
 test/testwave/testfiles/t_2_008.cpp           |  2 +-
 test/testwave/testfiles/t_2_009.cpp           |  2 +-
 test/testwave/testfiles/t_2_010.cpp           |  2 +-
 test/testwave/testfiles/t_2_011.cpp           |  2 +-
 test/testwave/testfiles/t_2_012.cpp           |  2 +-
 test/testwave/testfiles/t_2_013.cpp           |  2 +-
 test/testwave/testfiles/t_2_014.cpp           |  2 +-
 test/testwave/testfiles/t_2_015.cpp           |  2 +-
 test/testwave/testfiles/t_2_016.cpp           |  2 +-
 test/testwave/testfiles/t_3_001.cpp           |  2 +-
 test/testwave/testfiles/t_3_002.cpp           |  2 +-
 test/testwave/testfiles/t_3_003.cpp           |  2 +-
 test/testwave/testfiles/t_3_004.cpp           |  2 +-
 test/testwave/testfiles/t_4_001.cpp           |  2 +-
 test/testwave/testfiles/t_4_002.cpp           |  2 +-
 test/testwave/testfiles/t_4_003.cpp           |  2 +-
 test/testwave/testfiles/t_5_001.cpp           |  2 +-
 test/testwave/testfiles/t_5_002.cpp           |  2 +-
 test/testwave/testfiles/t_5_003.cpp           |  2 +-
 test/testwave/testfiles/t_5_004.cpp           |  2 +-
 test/testwave/testfiles/t_5_005.cpp           |  2 +-
 test/testwave/testfiles/t_5_006.cpp           |  2 +-
 test/testwave/testfiles/t_5_007.cpp           |  2 +-
 test/testwave/testfiles/t_5_007.hpp           |  2 +-
 test/testwave/testfiles/t_5_008.cpp           |  2 +-
 test/testwave/testfiles/t_5_009.cpp           |  2 +-
 test/testwave/testfiles/t_5_010.cpp           |  2 +-
 test/testwave/testfiles/t_5_011.cpp           |  2 +-
 test/testwave/testfiles/t_5_012.cpp           |  2 +-
 test/testwave/testfiles/t_5_013.cpp           |  2 +-
 test/testwave/testfiles/t_5_014.cpp           |  2 +-
 test/testwave/testfiles/t_5_015.cpp           |  2 +-
 test/testwave/testfiles/t_5_016.cpp           |  2 +-
 test/testwave/testfiles/t_5_017.cpp           |  2 +-
 test/testwave/testfiles/t_5_018.cpp           |  2 +-
 test/testwave/testfiles/t_5_019.cpp           |  2 +-
 test/testwave/testfiles/t_5_020.cpp           |  2 +-
 test/testwave/testfiles/t_5_021.cpp           |  2 +-
 test/testwave/testfiles/t_5_022.cpp           |  2 +-
 test/testwave/testfiles/t_5_023.cpp           |  2 +-
 test/testwave/testfiles/t_5_024.cpp           |  2 +-
 test/testwave/testfiles/t_5_025.cpp           |  2 +-
 test/testwave/testfiles/t_5_026.cpp           |  2 +-
 test/testwave/testfiles/t_5_027.cpp           |  2 +-
 test/testwave/testfiles/t_5_028.cpp           |  2 +-
 test/testwave/testfiles/t_5_029.cpp           |  2 +-
 test/testwave/testfiles/t_5_030.cpp           |  2 +-
 test/testwave/testfiles/t_5_031.cpp           |  2 +-
 test/testwave/testfiles/t_5_031.hpp           |  2 +-
 test/testwave/testfiles/t_5_032.cpp           |  2 +-
 test/testwave/testfiles/t_5_033.cpp           |  2 +-
 test/testwave/testfiles/t_5_034.cpp           |  2 +-
 test/testwave/testfiles/t_5_035.cpp           |  2 +-
 test/testwave/testfiles/t_5_035.hpp           |  2 +-
 test/testwave/testfiles/t_5_035_01.hpp        |  2 +-
 test/testwave/testfiles/t_5_035_02.hpp        |  2 +-
 test/testwave/testfiles/t_5_035_03.hpp        |  2 +-
 test/testwave/testfiles/t_5_035_04.hpp        |  2 +-
 test/testwave/testfiles/t_5_035_05.hpp        |  2 +-
 test/testwave/testfiles/t_5_035_06.hpp        |  2 +-
 test/testwave/testfiles/t_5_035_07.hpp        |  2 +-
 test/testwave/testfiles/t_5_035_08.hpp        |  2 +-
 test/testwave/testfiles/t_5_035_09.hpp        |  2 +-
 test/testwave/testfiles/t_5_035_10.hpp        |  2 +-
 test/testwave/testfiles/t_5_035_11.hpp        |  2 +-
 test/testwave/testfiles/t_5_035_12.hpp        |  2 +-
 test/testwave/testfiles/t_5_035_13.hpp        |  2 +-
 test/testwave/testfiles/t_5_035_14.hpp        |  2 +-
 test/testwave/testfiles/t_5_035_15.hpp        |  2 +-
 test/testwave/testfiles/t_6_001.cpp           |  2 +-
 test/testwave/testfiles/t_6_002.cpp           |  2 +-
 test/testwave/testfiles/t_6_003.cpp           |  2 +-
 test/testwave/testfiles/t_6_004.cpp           |  2 +-
 test/testwave/testfiles/t_6_005.cpp           |  2 +-
 test/testwave/testfiles/t_6_006.cpp           |  2 +-
 test/testwave/testfiles/t_6_007.cpp           |  2 +-
 test/testwave/testfiles/t_6_008.cpp           |  2 +-
 test/testwave/testfiles/t_6_009.cpp           |  2 +-
 test/testwave/testfiles/t_6_010.cpp           |  2 +-
 test/testwave/testfiles/t_6_011.cpp           |  2 +-
 test/testwave/testfiles/t_6_012.cpp           |  2 +-
 test/testwave/testfiles/t_6_013.cpp           |  2 +-
 test/testwave/testfiles/t_6_014.cpp           |  2 +-
 test/testwave/testfiles/t_6_015.cpp           |  2 +-
 test/testwave/testfiles/t_6_016.cpp           |  2 +-
 test/testwave/testfiles/t_6_017.cpp           |  2 +-
 test/testwave/testfiles/t_6_018.cpp           |  2 +-
 test/testwave/testfiles/t_6_019.cpp           |  2 +-
 test/testwave/testfiles/t_6_020.cpp           |  2 +-
 test/testwave/testfiles/t_6_021.cpp           |  2 +-
 test/testwave/testfiles/t_6_022.cpp           |  2 +-
 test/testwave/testfiles/t_6_023.cpp           |  2 +-
 test/testwave/testfiles/t_6_024.cpp           |  2 +-
 test/testwave/testfiles/t_6_025.cpp           |  2 +-
 test/testwave/testfiles/t_6_026.cpp           |  2 +-
 test/testwave/testfiles/t_6_027.cpp           |  2 +-
 test/testwave/testfiles/t_6_028.cpp           |  2 +-
 test/testwave/testfiles/t_6_029.cpp           |  2 +-
 test/testwave/testfiles/t_6_029.hpp           |  2 +-
 test/testwave/testfiles/t_6_030.cpp           |  2 +-
 test/testwave/testfiles/t_6_030.hpp           |  2 +-
 test/testwave/testfiles/t_6_031.cpp           |  2 +-
 test/testwave/testfiles/t_6_032.cpp           |  2 +-
 test/testwave/testfiles/t_6_033.cpp           |  2 +-
 test/testwave/testfiles/t_6_034.cpp           |  2 +-
 test/testwave/testfiles/t_6_035.cpp           |  2 +-
 test/testwave/testfiles/t_6_036.cpp           |  2 +-
 test/testwave/testfiles/t_6_037.cpp           |  2 +-
 test/testwave/testfiles/t_6_038.cpp           |  2 +-
 test/testwave/testfiles/t_6_039.cpp           |  2 +-
 test/testwave/testfiles/t_6_040.cpp           |  2 +-
 test/testwave/testfiles/t_6_041.cpp           |  2 +-
 test/testwave/testfiles/t_6_042.cpp           |  2 +-
 test/testwave/testfiles/t_6_043.cpp           |  2 +-
 test/testwave/testfiles/t_6_044.cpp           |  2 +-
 test/testwave/testfiles/t_6_045.cpp           |  2 +-
 test/testwave/testfiles/t_6_046.cpp           |  2 +-
 test/testwave/testfiles/t_6_047.cpp           |  2 +-
 test/testwave/testfiles/t_6_048.cpp           |  2 +-
 test/testwave/testfiles/t_6_049.cpp           |  2 +-
 test/testwave/testfiles/t_6_050.cpp           |  2 +-
 test/testwave/testfiles/t_6_051.cpp           |  2 +-
 test/testwave/testfiles/t_6_052.cpp           |  2 +-
 test/testwave/testfiles/t_6_053.cpp           |  2 +-
 test/testwave/testfiles/t_6_054.cpp           |  2 +-
 test/testwave/testfiles/t_6_055.cpp           |  2 +-
 test/testwave/testfiles/t_6_056.cpp           |  2 +-
 test/testwave/testfiles/t_6_057.cpp           |  2 +-
 test/testwave/testfiles/t_6_058.cpp           |  2 +-
 test/testwave/testfiles/t_6_059.cpp           |  2 +-
 test/testwave/testfiles/t_6_060.cpp           |  2 +-
 test/testwave/testfiles/t_6_061.cpp           |  2 +-
 test/testwave/testfiles/t_6_062.cpp           |  2 +-
 test/testwave/testfiles/t_9_001.cpp           |  2 +-
 test/testwave/testfiles/t_9_002.cpp           |  2 +-
 test/testwave/testfiles/t_9_003.cpp           |  2 +-
 test/testwave/testfiles/t_9_004.cpp           |  2 +-
 test/testwave/testfiles/t_9_005.cpp           |  2 +-
 test/testwave/testfiles/t_9_006.cpp           |  2 +-
 test/testwave/testfiles/t_9_007.cpp           |  2 +-
 test/testwave/testfiles/t_9_008.cpp           |  2 +-
 test/testwave/testfiles/t_9_009.cpp           |  2 +-
 test/testwave/testfiles/t_9_010.cpp           |  2 +-
 test/testwave/testfiles/t_9_011.cpp           |  2 +-
 test/testwave/testfiles/t_9_012.cpp           |  2 +-
 test/testwave/testfiles/t_9_013.cpp           |  2 +-
 test/testwave/testfiles/t_9_014.cpp           |  2 +-
 test/testwave/testfiles/t_9_015.cpp           |  2 +-
 test/testwave/testfiles/test.cfg              |  2 +-
 test/testwave/testwave.cpp                    |  2 +-
 test/testwave/testwave_app.cpp                |  4 +-
 test/testwave/testwave_app.hpp                |  2 +-
 tool/build/Jamfile                            |  2 +-
 tool/build/Jamfile.v2                         |  2 +-
 tool/cpp.cpp                                  | 65 +++++++++++++--
 tool/cpp.hpp                                  |  2 +-
 tool/cpp_config.hpp                           |  2 +-
 tool/cpp_version.hpp                          |  2 +-
 tool/optional_whitespace_eater.hpp            |  2 +-
 tool/stop_watch.hpp                           |  2 +-
 tool/trace_macro_expansion.hpp                |  2 +-
 345 files changed, 537 insertions(+), 370 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 185415e..ca8064b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 Boost.Wave: A Standard compliant C++ preprocessor library
 http://www.boost.org/
 
-Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 -------------------------------------------------------------------------------
@@ -22,13 +22,13 @@ TODO (known issues):
 
 CHANGELOG
 
+Sat Dec 24 13:33:53 CST 2005
 - Version 1.2.2
 - Added three new preprocessing hooks: 'found_directive', 'skipped_token' and 
   'evaluated_conditional_expression' (thanks to Andreas Sæbjørnsen for the 
   suggestions).
 - Removed hook forwarding functions in the context_type.
 - Added missing include_next case branches for get_directivename() function.
-- Switched to Re2C V0.9.10
 - Added new sample: advanced_hooks.
 - Fixed a possible buffer overflow in the cpplexer and cpp exception classes.
 - Made the cpp_grammar thread safe.
@@ -84,6 +84,14 @@ CHANGELOG
   sample.
 - Fixed a (Windows specific) bug which triggered a boost::file_system exception
   under certain conditions.
+- Switched to Re2C V0.9.11
+- Fixed a problem with the new '-E' (--autooutput) option.
+- Added better error reporting for duplicate macro definitions to the Wave 
+  tool. Added the macro_handling_exception type containing the corresponding 
+  macro name via the new (virtual) get_related_name() function.
+- Added the get_severity() function to the exceptions thrown by the Wave
+  library.
+- Extended the copyright notice to 2006.
 
 Mon Dec  5 22:05:22 CST 2005
 Boost V1.33.1
diff --git a/build/Jamfile b/build/Jamfile
index 42ab1e7..df5471d 100644
--- a/build/Jamfile
+++ b/build/Jamfile
@@ -4,7 +4,7 @@
 #
 # http://www.boost.org/
 #
-# Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost 
+# Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/build/Jamfile.v2 b/build/Jamfile.v2
index b42f9d5..11dc262 100644
--- a/build/Jamfile.v2
+++ b/build/Jamfile.v2
@@ -4,7 +4,7 @@
 #
 # http://www.boost.org/
 #
-# Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost 
+# Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/doc/acknowledgements.html b/doc/acknowledgements.html
index bab3df9..ce71c10 100644
--- a/doc/acknowledgements.html
+++ b/doc/acknowledgements.html
@@ -79,7 +79,7 @@ a policy based std::basic_string&lt;&gt; compatible string implementation.</p>
   </tr>
 </table>
 <hr size="1">
-<p class="copyright">Copyright &copy; 2003-2005 Hartmut Kaiser<br>
+<p class="copyright">Copyright &copy; 2003-2006 Hartmut Kaiser<br>
   <br>
   <font size="2">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) 
diff --git a/doc/class_reference_context.html b/doc/class_reference_context.html
index 84461d4..ccc2309 100644
--- a/doc/class_reference_context.html
+++ b/doc/class_reference_context.html
@@ -441,7 +441,7 @@
   </tr>
 </table>
 <hr size="1">
-<p class="copyright">Copyright &copy; 2003-2005 Hartmut Kaiser<br>
+<p class="copyright">Copyright &copy; 2003-2006 Hartmut Kaiser<br>
   <br>
   <font size="2">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) </font> </p>
 <span class="updated"></span>
diff --git a/doc/class_reference_ctxpolicy.html b/doc/class_reference_ctxpolicy.html
index eca014a..f571367 100644
--- a/doc/class_reference_ctxpolicy.html
+++ b/doc/class_reference_ctxpolicy.html
@@ -324,7 +324,7 @@
   </tr>
 </table>
 <hr size="1">
-<p class="copyright">Copyright &copy; 2003-2005 Hartmut Kaiser<br>
+<p class="copyright">Copyright &copy; 2003-2006 Hartmut Kaiser<br>
   <br>
 <font size="2">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) </font> </p>
 <p class="copyright"><span class="updated">Last updated: 
diff --git a/doc/class_reference_filepos.html b/doc/class_reference_filepos.html
index fad7301..7f2bf92 100644
--- a/doc/class_reference_filepos.html
+++ b/doc/class_reference_filepos.html
@@ -109,7 +109,7 @@
   </tr>
 </table>
 <hr size="1">
-<p class="copyright">Copyright &copy; 2003-2005 Hartmut Kaiser<br>
+<p class="copyright">Copyright &copy; 2003-2006 Hartmut Kaiser<br>
   <br>
 <font size="2">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) </font> </p>
 <p class="copyright"><span class="updated">Last updated: 
diff --git a/doc/class_reference_inptpolcy.html b/doc/class_reference_inptpolcy.html
index f0c62ae..5f80619 100644
--- a/doc/class_reference_inptpolcy.html
+++ b/doc/class_reference_inptpolcy.html
@@ -121,7 +121,7 @@
   </tr>
 </table>
 <hr size="1">
-<p class="copyright">Copyright &copy; 2003-2005 Hartmut Kaiser<br>
+<p class="copyright">Copyright &copy; 2003-2006 Hartmut Kaiser<br>
   <br>
   <font size="2">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) </font> </p>
 <span class="updated"></span>
diff --git a/doc/class_reference_lexer.html b/doc/class_reference_lexer.html
index 95d5464..5738ad2 100644
--- a/doc/class_reference_lexer.html
+++ b/doc/class_reference_lexer.html
@@ -93,7 +93,7 @@
   </tr>
 </table>
 <hr size="1">
-<p class="copyright">Copyright &copy; 2003-2005 Hartmut Kaiser<br>
+<p class="copyright">Copyright &copy; 2003-2006 Hartmut Kaiser<br>
   <br>
 <font size="2">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) </font> </p>
 <p class="copyright"><span class="updated">Last updated: 
diff --git a/doc/class_reference_tokentype.html b/doc/class_reference_tokentype.html
index d46d907..1e2f0fb 100644
--- a/doc/class_reference_tokentype.html
+++ b/doc/class_reference_tokentype.html
@@ -165,7 +165,7 @@
   </tr>
 </table>
 <hr size="1">
-<p class="copyright">Copyright &copy; 2003-2005 Hartmut Kaiser<br>
+<p class="copyright">Copyright &copy; 2003-2006 Hartmut Kaiser<br>
   <br>
   <font size="2">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) </font> </p>
 <span class="updated"></span>
diff --git a/doc/compiletime_config.html b/doc/compiletime_config.html
index e0704d2..55e4a4b 100644
--- a/doc/compiletime_config.html
+++ b/doc/compiletime_config.html
@@ -204,7 +204,7 @@
   </tr>
 </table>
 <hr size="1">
-<p class="copyright">Copyright &copy; 2003-2005 Hartmut Kaiser<br>
+<p class="copyright">Copyright &copy; 2003-2006 Hartmut Kaiser<br>
   <br>
 <font size="2">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) </font> </p>
 <span class="updated"></span>
diff --git a/doc/introduction.html b/doc/introduction.html
index fee182b..509c713 100644
--- a/doc/introduction.html
+++ b/doc/introduction.html
@@ -82,7 +82,7 @@ preprocessing, but allows to use Wave for all of the IDL derivatives. </P>
   </tr>
 </table>
 <hr size="1">
-<p class="copyright">Copyright &copy; 2003-2005 Hartmut Kaiser<br>
+<p class="copyright">Copyright &copy; 2003-2006 Hartmut Kaiser<br>
   <br>
 <font size="2">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) </font> </p>
 <span class="updated"></span>
diff --git a/doc/macro_expansion_process.html b/doc/macro_expansion_process.html
index 26347f9..9415c53 100644
--- a/doc/macro_expansion_process.html
+++ b/doc/macro_expansion_process.html
@@ -88,7 +88,7 @@
   </tr>
 </table>
 <hr size="1">
-<p class="copyright">Copyright &copy; 2003-2005 Hartmut Kaiser<br>
+<p class="copyright">Copyright &copy; 2003-2006 Hartmut Kaiser<br>
   <br>
 <font size="2">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) </font> </p>
 <span class="updated"></span>
diff --git a/doc/predefined_macros.html b/doc/predefined_macros.html
index fe2a8c9..73a4e60 100644
--- a/doc/predefined_macros.html
+++ b/doc/predefined_macros.html
@@ -147,7 +147,7 @@
   </tr>
 </table>
 <hr size="1">
-<p class="copyright">Copyright &copy; 2003-2005 Hartmut Kaiser<br>
+<p class="copyright">Copyright &copy; 2003-2006 Hartmut Kaiser<br>
   <br>
   <font size="2">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) </font> </p>
 <span class="updated"></span>
diff --git a/doc/preface.html b/doc/preface.html
index aaef36c..13775d1 100644
--- a/doc/preface.html
+++ b/doc/preface.html
@@ -99,7 +99,7 @@ today is the preprocessor of the gcc C/C++ compiler.</p>
   </tr>
 </table>
 <hr size="1">
-<p class="copyright">Copyright &copy; 2003-2005 Hartmut Kaiser<br>
+<p class="copyright">Copyright &copy; 2003-2006 Hartmut Kaiser<br>
   <br>
 <font size="2">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) </font> </p>
 <span class="updated"></span>
diff --git a/doc/quickstart.html b/doc/quickstart.html
index 01841cf..25cfdc0 100644
--- a/doc/quickstart.html
+++ b/doc/quickstart.html
@@ -110,7 +110,7 @@ Note though, that this filename is used
   </tr>
 </table>
 <hr size="1">
-<p class="copyright">Copyright &copy; 2003-2005 Hartmut Kaiser<br>
+<p class="copyright">Copyright &copy; 2003-2006 Hartmut Kaiser<br>
   <br>
 <font size="2">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) </font> </p>
 <span class="updated"></span>
diff --git a/doc/references.html b/doc/references.html
index 8a54b70..1f37507 100644
--- a/doc/references.html
+++ b/doc/references.html
@@ -89,7 +89,7 @@
   </tr>
 </table>
 <hr size="1">
-<p class="copyright">Copyright &copy; 2003-2005 Hartmut Kaiser<br>
+<p class="copyright">Copyright &copy; 2003-2006 Hartmut Kaiser<br>
   <br>
   <font size="2">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) </font> </p>
 <span class="updated"></span>
diff --git a/doc/samples.html b/doc/samples.html
index e47405c..348994f 100644
--- a/doc/samples.html
+++ b/doc/samples.html
@@ -99,7 +99,7 @@ preprocessed tokens generated from a given input file. It is described in more d
   </tr>
 </table>
 <hr size="1">
-<p class="copyright">Copyright &copy; 2003-2005 Hartmut Kaiser<br>
+<p class="copyright">Copyright &copy; 2003-2006 Hartmut Kaiser<br>
     <br>
 <font size="2">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) </font> </p>
 <span class="updated"></span>
diff --git a/doc/supported_pragmas.html b/doc/supported_pragmas.html
index f0a9211..7eff5c4 100644
--- a/doc/supported_pragmas.html
+++ b/doc/supported_pragmas.html
@@ -115,7 +115,7 @@
   </tr>
 </table>
 <hr size="1">
-<p class="copyright">Copyright &copy; 2003-2005 Hartmut Kaiser<br>
+<p class="copyright">Copyright &copy; 2003-2006 Hartmut Kaiser<br>
   <br>
 <font size="2">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) </font> </p>
 <span class="updated"></span>
diff --git a/doc/token_ids.html b/doc/token_ids.html
index 6f59007..9c84bbd 100644
--- a/doc/token_ids.html
+++ b/doc/token_ids.html
@@ -970,7 +970,7 @@
   </tr>
 </table>
 <hr size="1">
-<p class="copyright">Copyright &copy; 2003-2005 Hartmut Kaiser<br>
+<p class="copyright">Copyright &copy; 2003-2006 Hartmut Kaiser<br>
   <br>
   <font size="2">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) </font> </p>
 <span class="updated"></span>
diff --git a/doc/tracing_facility.html b/doc/tracing_facility.html
index a6d5d84..29c939c 100644
--- a/doc/tracing_facility.html
+++ b/doc/tracing_facility.html
@@ -149,7 +149,7 @@
   </tr>
 </table>
 <hr size="1">
-<p class="copyright">Copyright &copy; 2003-2005 Hartmut Kaiser<br>
+<p class="copyright">Copyright &copy; 2003-2006 Hartmut Kaiser<br>
   <br>
 <font size="2">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) </font> </p>
 <p class="copyright"><span class="updated">Last updated: 
diff --git a/doc/wave_driver.html b/doc/wave_driver.html
index bfeb40a..194100c 100644
--- a/doc/wave_driver.html
+++ b/doc/wave_driver.html
@@ -231,7 +231,7 @@
   </tr>
 </table>
 <hr size="1">
-<p class="copyright">Copyright &copy; 2003-2005 Hartmut Kaiser<br>
+<p class="copyright">Copyright &copy; 2003-2006 Hartmut Kaiser<br>
   <br>
 <font size="2">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) </font> </p>
 <span class="updated"></span>
diff --git a/include/boost/wave.hpp b/include/boost/wave.hpp
index 34889ef..0001f7d 100644
--- a/include/boost/wave.hpp
+++ b/include/boost/wave.hpp
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/include/boost/wave/cpp_context.hpp b/include/boost/wave/cpp_context.hpp
index 523e018..1d5b66f 100644
--- a/include/boost/wave/cpp_context.hpp
+++ b/include/boost/wave/cpp_context.hpp
@@ -4,7 +4,7 @@
     
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
@@ -164,6 +164,13 @@ public:
     template <typename IteratorT2>
     bool is_defined_macro(IteratorT2 const &begin, IteratorT2 const &end) 
         { return macros.is_defined(begin, end); }
+    bool get_macro_definition(typename token_type::string_type const &name, 
+            bool &has_params, bool &is_predefined, position_type &pos,
+            std::vector<token_type> &parameters, token_sequence_type &definition)
+        { 
+            return macros.get_macro(name, has_params, is_predefined, pos,
+                parameters, definition); 
+        }
     bool remove_macro_definition(typename token_type::string_type const &name, 
             bool even_predefined = false)
         { 
diff --git a/include/boost/wave/cpp_exceptions.hpp b/include/boost/wave/cpp_exceptions.hpp
index 8763ad4..f4017ee 100644
--- a/include/boost/wave/cpp_exceptions.hpp
+++ b/include/boost/wave/cpp_exceptions.hpp
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
@@ -62,6 +62,41 @@
 #endif // BOOST_NO_STRINGSTREAM
 #endif // BOOST_WAVE_THROW
 
+#if !defined(BOOST_WAVE_THROW_NAME)
+#ifdef BOOST_NO_STRINGSTREAM
+#include <strstream>
+#define BOOST_WAVE_THROW_NAME(cls, code, msg, act_pos, name)                  \
+    {                                                                         \
+        using namespace boost::wave;                                          \
+        std::strstream stream;                                                \
+            stream << cls::severity_text(cls::code) << ": "                   \
+            << cls::error_text(cls::code);                                    \
+        if ((msg)[0] != 0) stream << ": " << (msg);                           \
+        stream << std::ends;                                                  \
+        std::string throwmsg = stream.str(); stream.freeze(false);            \
+        boost::throw_exception(cls(throwmsg.c_str(), cls::code,               \
+            (act_pos).get_line(), (act_pos).get_column(),                     \
+            (act_pos).get_file().c_str(), (name)));                           \
+    }                                                                         \
+    /**/
+#else
+#include <sstream>
+#define BOOST_WAVE_THROW_NAME(cls, code, msg, act_pos, name)                  \
+    {                                                                         \
+        using namespace boost::wave;                                          \
+        std::stringstream stream;                                             \
+            stream << cls::severity_text(cls::code) << ": "                   \
+            << cls::error_text(cls::code);                                    \
+        if ((msg)[0] != 0) stream << ": " << (msg);                           \
+        stream << std::ends;                                                  \
+        boost::throw_exception(cls(stream.str().c_str(), cls::code,           \
+            (act_pos).get_line(), (act_pos).get_column(),                     \
+            (act_pos).get_file().c_str(), (name)));                           \
+    }                                                                         \
+    /**/
+#endif // BOOST_NO_STRINGSTREAM
+#endif // BOOST_WAVE_THROW
+
 ///////////////////////////////////////////////////////////////////////////////
 namespace boost {
 namespace wave {
@@ -79,7 +114,7 @@ namespace util {
     };
     
     inline char const *
-    get_severity(severity level) 
+    get_severity(int level) 
     {
         static char const *severity_text[] = 
         {
@@ -111,9 +146,11 @@ public:
     }
     ~cpp_exception() throw() {}
     
-    virtual char const *what() const throw() = 0;   // to be overloaded
+    virtual char const *what() const throw() = 0;           // to be overloaded
     virtual char const *description() const throw() = 0;
-    virtual int get_errorcode() const = 0;
+    virtual int get_errorcode() const throw() = 0;
+    virtual int get_severity() const throw() = 0;
+    virtual char const* get_related_name() const throw() = 0;
     
     int line_no() const throw() { return line; }
     int column_no() const throw() { return column; }
@@ -192,14 +229,18 @@ public:
     {
         return buffer;
     }
-    util::severity get_severity() const
+    virtual int get_severity() const throw()
     {
         return level;
     }
-    int get_errorcode() const
+    virtual int get_errorcode() const throw()
     {
         return code;
     }
+    virtual char const* get_related_name() const throw()
+    {
+        return "<unknown>";
+    }
     
     static char const *error_text(int code)
     {
@@ -312,6 +353,32 @@ private:
     error_code code;
 };
 
+///////////////////////////////////////////////////////////////////////////////
+//  Error during macro handling, this exception contains the related macro name
+class macro_handling_exception :
+    public preprocess_exception
+{
+public:
+    macro_handling_exception(char const *what_, error_code code, int line_, 
+        int column_, char const *filename_, char const *macroname) throw() 
+    :   preprocess_exception(what_, code, line_, column_, filename_)
+    {
+        unsigned int off = 0;
+        while (off < sizeof(name) && *macroname)
+            name[off++] = *macroname++;
+        name[off] = 0;
+    }
+    ~macro_handling_exception() throw() {}
+    
+    char const* get_related_name() const 
+    {
+        return name;
+    }
+
+private:
+    char name[512];
+};
+
 ///////////////////////////////////////////////////////////////////////////////
 //
 //  The is_recoverable() function allows to decide, whether it is possible 
diff --git a/include/boost/wave/cpp_iteration_context.hpp b/include/boost/wave/cpp_iteration_context.hpp
index a8ebc16..312ab10 100644
--- a/include/boost/wave/cpp_iteration_context.hpp
+++ b/include/boost/wave/cpp_iteration_context.hpp
@@ -4,7 +4,7 @@
     
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/include/boost/wave/cpplexer/convert_trigraphs.hpp b/include/boost/wave/cpplexer/convert_trigraphs.hpp
index e52623e..40937f2 100644
--- a/include/boost/wave/cpplexer/convert_trigraphs.hpp
+++ b/include/boost/wave/cpplexer/convert_trigraphs.hpp
@@ -5,7 +5,7 @@
     
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/include/boost/wave/cpplexer/cpp_lex_interface.hpp b/include/boost/wave/cpplexer/cpp_lex_interface.hpp
index 67fdd21..4a6b1e0 100644
--- a/include/boost/wave/cpplexer/cpp_lex_interface.hpp
+++ b/include/boost/wave/cpplexer/cpp_lex_interface.hpp
@@ -5,7 +5,7 @@
     
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/include/boost/wave/cpplexer/cpp_lex_iterator.hpp b/include/boost/wave/cpplexer/cpp_lex_iterator.hpp
index 6edcb21..fd6c4a4 100644
--- a/include/boost/wave/cpplexer/cpp_lex_iterator.hpp
+++ b/include/boost/wave/cpplexer/cpp_lex_iterator.hpp
@@ -5,7 +5,7 @@
     
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/include/boost/wave/cpplexer/cpp_lex_token.hpp b/include/boost/wave/cpplexer/cpp_lex_token.hpp
index 398f214..15d54c9 100644
--- a/include/boost/wave/cpplexer/cpp_lex_token.hpp
+++ b/include/boost/wave/cpplexer/cpp_lex_token.hpp
@@ -5,7 +5,7 @@
     
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/include/boost/wave/cpplexer/cpplexer_exceptions.hpp b/include/boost/wave/cpplexer/cpplexer_exceptions.hpp
index bfe75df..cd787f6 100644
--- a/include/boost/wave/cpplexer/cpplexer_exceptions.hpp
+++ b/include/boost/wave/cpplexer/cpplexer_exceptions.hpp
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/include/boost/wave/cpplexer/re2clex/aq.hpp b/include/boost/wave/cpplexer/re2clex/aq.hpp
index ee59d31..8828253 100644
--- a/include/boost/wave/cpplexer/re2clex/aq.hpp
+++ b/include/boost/wave/cpplexer/re2clex/aq.hpp
@@ -4,7 +4,7 @@
     http://www.boost.org/
     
     Copyright (c) 2001 Daniel C. Nuffer.
-    Copyright (c) 2001-2005 Hartmut Kaiser. 
+    Copyright (c) 2001-2006 Hartmut Kaiser. 
     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)
 =============================================================================*/
diff --git a/include/boost/wave/cpplexer/re2clex/cpp_re.hpp b/include/boost/wave/cpplexer/re2clex/cpp_re.hpp
index 677e943..c37392d 100644
--- a/include/boost/wave/cpplexer/re2clex/cpp_re.hpp
+++ b/include/boost/wave/cpplexer/re2clex/cpp_re.hpp
@@ -5,7 +5,7 @@
     
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/include/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp b/include/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp
index 3df35d3..251adad 100644
--- a/include/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp
+++ b/include/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp
@@ -5,7 +5,7 @@
     
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/include/boost/wave/cpplexer/re2clex/scanner.hpp b/include/boost/wave/cpplexer/re2clex/scanner.hpp
index 1a43463..bf17182 100644
--- a/include/boost/wave/cpplexer/re2clex/scanner.hpp
+++ b/include/boost/wave/cpplexer/re2clex/scanner.hpp
@@ -4,7 +4,7 @@
     http://www.boost.org/
     
     Copyright (c) 2001 Daniel C. Nuffer.
-    Copyright (c) 2001-2005 Hartmut Kaiser. 
+    Copyright (c) 2001-2006 Hartmut Kaiser. 
     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)
 =============================================================================*/
diff --git a/include/boost/wave/cpplexer/token_cache.hpp b/include/boost/wave/cpplexer/token_cache.hpp
index b869680..18ff791 100644
--- a/include/boost/wave/cpplexer/token_cache.hpp
+++ b/include/boost/wave/cpplexer/token_cache.hpp
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/include/boost/wave/cpplexer/validate_universal_char.hpp b/include/boost/wave/cpplexer/validate_universal_char.hpp
index 564bfdf..f27d967 100644
--- a/include/boost/wave/cpplexer/validate_universal_char.hpp
+++ b/include/boost/wave/cpplexer/validate_universal_char.hpp
@@ -5,7 +5,7 @@
     
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/include/boost/wave/grammars/cpp_chlit_grammar.hpp b/include/boost/wave/grammars/cpp_chlit_grammar.hpp
index d479180..27fd9b0 100644
--- a/include/boost/wave/grammars/cpp_chlit_grammar.hpp
+++ b/include/boost/wave/grammars/cpp_chlit_grammar.hpp
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/include/boost/wave/grammars/cpp_defined_grammar.hpp b/include/boost/wave/grammars/cpp_defined_grammar.hpp
index 6c25f4c..74a2dd8 100644
--- a/include/boost/wave/grammars/cpp_defined_grammar.hpp
+++ b/include/boost/wave/grammars/cpp_defined_grammar.hpp
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/include/boost/wave/grammars/cpp_defined_grammar_gen.hpp b/include/boost/wave/grammars/cpp_defined_grammar_gen.hpp
index a23312f..4a8bf7c 100644
--- a/include/boost/wave/grammars/cpp_defined_grammar_gen.hpp
+++ b/include/boost/wave/grammars/cpp_defined_grammar_gen.hpp
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/include/boost/wave/grammars/cpp_expression_grammar.hpp b/include/boost/wave/grammars/cpp_expression_grammar.hpp
index 5f02d96..bd5ee0d 100644
--- a/include/boost/wave/grammars/cpp_expression_grammar.hpp
+++ b/include/boost/wave/grammars/cpp_expression_grammar.hpp
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/include/boost/wave/grammars/cpp_expression_grammar_gen.hpp b/include/boost/wave/grammars/cpp_expression_grammar_gen.hpp
index ee06824..7491b4d 100644
--- a/include/boost/wave/grammars/cpp_expression_grammar_gen.hpp
+++ b/include/boost/wave/grammars/cpp_expression_grammar_gen.hpp
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/include/boost/wave/grammars/cpp_expression_value.hpp b/include/boost/wave/grammars/cpp_expression_value.hpp
index b5713e1..e39d0b1 100644
--- a/include/boost/wave/grammars/cpp_expression_value.hpp
+++ b/include/boost/wave/grammars/cpp_expression_value.hpp
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/include/boost/wave/grammars/cpp_grammar.hpp b/include/boost/wave/grammars/cpp_grammar.hpp
index 809456e..b7f9c22 100644
--- a/include/boost/wave/grammars/cpp_grammar.hpp
+++ b/include/boost/wave/grammars/cpp_grammar.hpp
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/include/boost/wave/grammars/cpp_grammar_gen.hpp b/include/boost/wave/grammars/cpp_grammar_gen.hpp
index 4258de3..4394f3f 100644
--- a/include/boost/wave/grammars/cpp_grammar_gen.hpp
+++ b/include/boost/wave/grammars/cpp_grammar_gen.hpp
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/include/boost/wave/grammars/cpp_intlit_grammar.hpp b/include/boost/wave/grammars/cpp_intlit_grammar.hpp
index 6f5b14b..38650c9 100644
--- a/include/boost/wave/grammars/cpp_intlit_grammar.hpp
+++ b/include/boost/wave/grammars/cpp_intlit_grammar.hpp
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/include/boost/wave/grammars/cpp_literal_grammar_gen.hpp b/include/boost/wave/grammars/cpp_literal_grammar_gen.hpp
index f7be153..034de05 100644
--- a/include/boost/wave/grammars/cpp_literal_grammar_gen.hpp
+++ b/include/boost/wave/grammars/cpp_literal_grammar_gen.hpp
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/include/boost/wave/grammars/cpp_predef_macros_gen.hpp b/include/boost/wave/grammars/cpp_predef_macros_gen.hpp
index a7b6dae..24ded36 100644
--- a/include/boost/wave/grammars/cpp_predef_macros_gen.hpp
+++ b/include/boost/wave/grammars/cpp_predef_macros_gen.hpp
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/include/boost/wave/grammars/cpp_predef_macros_grammar.hpp b/include/boost/wave/grammars/cpp_predef_macros_grammar.hpp
index 25c0cb1..5070877 100644
--- a/include/boost/wave/grammars/cpp_predef_macros_grammar.hpp
+++ b/include/boost/wave/grammars/cpp_predef_macros_grammar.hpp
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/include/boost/wave/language_support.hpp b/include/boost/wave/language_support.hpp
index 8b02d9f..e1919f3 100644
--- a/include/boost/wave/language_support.hpp
+++ b/include/boost/wave/language_support.hpp
@@ -4,7 +4,7 @@
     
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/include/boost/wave/preprocessing_hooks.hpp b/include/boost/wave/preprocessing_hooks.hpp
index d7dd4ea..d36dfe0 100644
--- a/include/boost/wave/preprocessing_hooks.hpp
+++ b/include/boost/wave/preprocessing_hooks.hpp
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/include/boost/wave/token_ids.hpp b/include/boost/wave/token_ids.hpp
index bad2fc6..3786d0d 100644
--- a/include/boost/wave/token_ids.hpp
+++ b/include/boost/wave/token_ids.hpp
@@ -5,7 +5,7 @@
     
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/include/boost/wave/util/cpp_ifblock.hpp b/include/boost/wave/util/cpp_ifblock.hpp
index f31c650..6dd14c8 100644
--- a/include/boost/wave/util/cpp_ifblock.hpp
+++ b/include/boost/wave/util/cpp_ifblock.hpp
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/include/boost/wave/util/cpp_include_paths.hpp b/include/boost/wave/util/cpp_include_paths.hpp
index 4463c08..7917597 100644
--- a/include/boost/wave/util/cpp_include_paths.hpp
+++ b/include/boost/wave/util/cpp_include_paths.hpp
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/include/boost/wave/util/cpp_iterator.hpp b/include/boost/wave/util/cpp_iterator.hpp
index de6dec5..3d1c1b2 100644
--- a/include/boost/wave/util/cpp_iterator.hpp
+++ b/include/boost/wave/util/cpp_iterator.hpp
@@ -5,7 +5,7 @@
     
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/include/boost/wave/util/cpp_macromap.hpp b/include/boost/wave/util/cpp_macromap.hpp
index cf18344..9d0fbc7 100644
--- a/include/boost/wave/util/cpp_macromap.hpp
+++ b/include/boost/wave/util/cpp_macromap.hpp
@@ -5,7 +5,7 @@
     
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
@@ -100,6 +100,11 @@ public:
     template <typename IteratorT>
     bool is_defined(IteratorT const &begin, IteratorT const &end);
 
+//  Get the macro definition for the given macro scope
+    bool get_macro(string_type const &name, bool &has_parameters, 
+        bool &is_predefined, position_type &pos, parameter_container_type &parameters, 
+        definition_container_type &definition, defined_macros_type *scope = 0);
+        
 //  Remove a macro name from the given macro scope
     bool remove_macro(token_type const &token, bool even_predefined = false);
     
@@ -216,13 +221,14 @@ macromap<ContextT>::add_macro(token_type const &name, bool has_parameters,
 {
     if (!is_predefined && impl::is_special_macroname (name.get_value())) {
     // exclude special macro names
-        BOOST_WAVE_THROW(preprocess_exception, illegal_redefinition, 
-            name.get_value().c_str(), main_pos);
+        BOOST_WAVE_THROW_NAME(macro_handling_exception, illegal_redefinition, 
+            name.get_value().c_str(), main_pos, name.get_value().c_str());
     }
     if (AltExtTokenType == (token_id(name) & ExtTokenOnlyMask)) {
     // exclude special operator names
-        BOOST_WAVE_THROW(preprocess_exception, illegal_operator_redefinition, 
-            name.get_value().c_str(), main_pos);
+        BOOST_WAVE_THROW_NAME(macro_handling_exception, 
+            illegal_operator_redefinition, name.get_value().c_str(), main_pos,
+            name.get_value().c_str());
     }
     
 // try to define the new macro
@@ -235,8 +241,8 @@ typename defined_macros_type::iterator it = current_scope->find(name.get_value()
             !impl::parameters_equal((*it).second->macroparameters, parameters) ||
             !impl::definition_equals((*it).second->macrodefinition, definition))
         {
-            BOOST_WAVE_THROW(preprocess_exception, macro_redefinition, 
-                name.get_value().c_str(), main_pos);
+            BOOST_WAVE_THROW_NAME(macro_handling_exception, macro_redefinition, 
+                name.get_value().c_str(), main_pos, name.get_value().c_str());
         }
         return false;
     }
@@ -257,8 +263,9 @@ typename defined_macros_type::iterator it = current_scope->find(name.get_value()
         
             if (pit != names.end()) {
             // duplicate parameter name
-                BOOST_WAVE_THROW(preprocess_exception, duplicate_parameter_name, 
-                    (*pit).c_str(), main_pos);
+                BOOST_WAVE_THROW_NAME(macro_handling_exception, 
+                    duplicate_parameter_name, (*pit).c_str(), main_pos, 
+                    name.get_value().c_str());
             }
             names.insert((*itp).get_value());
         }
@@ -276,8 +283,8 @@ typename defined_macros_type::iterator it = current_scope->find(name.get_value()
         );
 
     if (!p.second) {
-        BOOST_WAVE_THROW(preprocess_exception, macro_insertion_error, 
-            name.get_value().c_str(), main_pos);
+        BOOST_WAVE_THROW_NAME(macro_handling_exception, macro_insertion_error, 
+            name.get_value().c_str(), main_pos, name.get_value().c_str());
     }
 
 // add the parameters and the definition
@@ -345,6 +352,33 @@ typename defined_macros_type::iterator cit(current_macros -> find(name));
     return cit != current_macros -> end();
 }
 
+///////////////////////////////////////////////////////////////////////////////
+// 
+//  Get the macro definition for the given macro scope
+//
+///////////////////////////////////////////////////////////////////////////////
+template <typename ContextT>
+inline bool 
+macromap<ContextT>::get_macro(string_type const &name, bool &has_parameters, 
+    bool &is_predefined, position_type &pos, 
+    parameter_container_type &parameters, 
+    definition_container_type &definition, 
+    defined_macros_type *scope)
+{
+    typename defined_macros_type::iterator it;
+    if (!is_defined(name, it, scope))
+        return false;
+        
+macro_definition_type &macro_def = *(*it).second.get();
+
+    has_parameters = macro_def.is_functionlike;
+    is_predefined = macro_def.is_predefined;
+    pos = macro_def.macroname.get_position();
+    parameters = macro_def.macroparameters;
+    definition = macro_def.macrodefinition;
+    return true;
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // 
 //  remove_macro(): remove a macro from the macromap
diff --git a/include/boost/wave/util/cpp_macromap_predef.hpp b/include/boost/wave/util/cpp_macromap_predef.hpp
index 3cfc95b..6274d87 100644
--- a/include/boost/wave/util/cpp_macromap_predef.hpp
+++ b/include/boost/wave/util/cpp_macromap_predef.hpp
@@ -5,7 +5,7 @@
     
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/include/boost/wave/util/cpp_macromap_utils.hpp b/include/boost/wave/util/cpp_macromap_utils.hpp
index d2d5bc6..0c94ccb 100644
--- a/include/boost/wave/util/cpp_macromap_utils.hpp
+++ b/include/boost/wave/util/cpp_macromap_utils.hpp
@@ -5,7 +5,7 @@
     
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/include/boost/wave/util/file_position.hpp b/include/boost/wave/util/file_position.hpp
index 6cca39c..bf7c3dd 100644
--- a/include/boost/wave/util/file_position.hpp
+++ b/include/boost/wave/util/file_position.hpp
@@ -5,7 +5,7 @@
     
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/include/boost/wave/util/functor_input.hpp b/include/boost/wave/util/functor_input.hpp
index a0afa51..91e66bc 100644
--- a/include/boost/wave/util/functor_input.hpp
+++ b/include/boost/wave/util/functor_input.hpp
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/include/boost/wave/util/insert_whitespace_detection.hpp b/include/boost/wave/util/insert_whitespace_detection.hpp
index de7ef25..2af3a2d 100644
--- a/include/boost/wave/util/insert_whitespace_detection.hpp
+++ b/include/boost/wave/util/insert_whitespace_detection.hpp
@@ -5,7 +5,7 @@
     
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/include/boost/wave/util/interpret_pragma.hpp b/include/boost/wave/util/interpret_pragma.hpp
index a178b99..22dc3ff 100644
--- a/include/boost/wave/util/interpret_pragma.hpp
+++ b/include/boost/wave/util/interpret_pragma.hpp
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/include/boost/wave/util/iteration_context.hpp b/include/boost/wave/util/iteration_context.hpp
index f3bc417..3e44ff5 100644
--- a/include/boost/wave/util/iteration_context.hpp
+++ b/include/boost/wave/util/iteration_context.hpp
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/include/boost/wave/util/macro_definition.hpp b/include/boost/wave/util/macro_definition.hpp
index 0b3b1ca..81b1ad9 100644
--- a/include/boost/wave/util/macro_definition.hpp
+++ b/include/boost/wave/util/macro_definition.hpp
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/include/boost/wave/util/macro_helpers.hpp b/include/boost/wave/util/macro_helpers.hpp
index d36a3e9..ef5a66a 100644
--- a/include/boost/wave/util/macro_helpers.hpp
+++ b/include/boost/wave/util/macro_helpers.hpp
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/include/boost/wave/util/pattern_parser.hpp b/include/boost/wave/util/pattern_parser.hpp
index 52eed86..19516a6 100644
--- a/include/boost/wave/util/pattern_parser.hpp
+++ b/include/boost/wave/util/pattern_parser.hpp
@@ -5,7 +5,7 @@
     
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/include/boost/wave/util/symbol_table.hpp b/include/boost/wave/util/symbol_table.hpp
index 85b787f..5e563d6 100644
--- a/include/boost/wave/util/symbol_table.hpp
+++ b/include/boost/wave/util/symbol_table.hpp
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/include/boost/wave/util/time_conversion_helper.hpp b/include/boost/wave/util/time_conversion_helper.hpp
index 4a92495..d856eeb 100644
--- a/include/boost/wave/util/time_conversion_helper.hpp
+++ b/include/boost/wave/util/time_conversion_helper.hpp
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/include/boost/wave/util/transform_iterator.hpp b/include/boost/wave/util/transform_iterator.hpp
index 8f1c646..90fcf45 100644
--- a/include/boost/wave/util/transform_iterator.hpp
+++ b/include/boost/wave/util/transform_iterator.hpp
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/include/boost/wave/util/unput_queue_iterator.hpp b/include/boost/wave/util/unput_queue_iterator.hpp
index cbaaf25..dd3ead2 100644
--- a/include/boost/wave/util/unput_queue_iterator.hpp
+++ b/include/boost/wave/util/unput_queue_iterator.hpp
@@ -5,7 +5,7 @@
     
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/include/boost/wave/wave_config.hpp b/include/boost/wave/wave_config.hpp
index 08b0836..c7e2236 100644
--- a/include/boost/wave/wave_config.hpp
+++ b/include/boost/wave/wave_config.hpp
@@ -5,7 +5,7 @@
     
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/include/boost/wave/wave_version.hpp b/include/boost/wave/wave_version.hpp
index e512d4d..8aafb77 100644
--- a/include/boost/wave/wave_version.hpp
+++ b/include/boost/wave/wave_version.hpp
@@ -5,7 +5,7 @@
     
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/include/boost/wave/whitespace_handling.hpp b/include/boost/wave/whitespace_handling.hpp
index 4e911fb..2bf2761 100644
--- a/include/boost/wave/whitespace_handling.hpp
+++ b/include/boost/wave/whitespace_handling.hpp
@@ -5,7 +5,7 @@
     http://www.boost.org/
 
     Copyright (c) 2003 Paul Mensonides
-    Copyright (c) 2001-2005 Hartmut Kaiser. 
+    Copyright (c) 2001-2006 Hartmut Kaiser. 
     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)
 =============================================================================*/
diff --git a/index.html b/index.html
index cd7fa57..55909b0 100644
--- a/index.html
+++ b/index.html
@@ -95,12 +95,12 @@
 </table>
 <br>
 <hr size="1">
-<p class="copyright">Copyright &copy; 2003-2005 Hartmut Kaiser<br>
+<p class="copyright">Copyright &copy; 2003-2006 Hartmut Kaiser<br>
   <br>
 <font size="2">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) </font> </p>
 <span class="updated"></span>
 <p class="copyright"><span class="updated">Last updated: 
-  <!-- #BeginDate format:fcAm1m -->Saturday, December 10, 2005  18:02<!-- #EndDate -->
+  <!-- #BeginDate format:fcAm1m -->Saturday, December 24, 2005  13:29<!-- #EndDate -->
 </span></p>
 </body>
 </html>
diff --git a/samples/advanced_hooks/advanced_hooks.cpp b/samples/advanced_hooks/advanced_hooks.cpp
index 48098c2..6e51579 100644
--- a/samples/advanced_hooks/advanced_hooks.cpp
+++ b/samples/advanced_hooks/advanced_hooks.cpp
@@ -4,7 +4,7 @@
     
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost 
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/samples/advanced_hooks/advanced_preprocessing_hooks.hpp b/samples/advanced_hooks/advanced_preprocessing_hooks.hpp
index e630249..eb0b72b 100644
--- a/samples/advanced_hooks/advanced_preprocessing_hooks.hpp
+++ b/samples/advanced_hooks/advanced_preprocessing_hooks.hpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/samples/advanced_hooks/build/Jamfile b/samples/advanced_hooks/build/Jamfile
index d8e09df..1236b52 100644
--- a/samples/advanced_hooks/build/Jamfile
+++ b/samples/advanced_hooks/build/Jamfile
@@ -4,7 +4,7 @@
 #
 # http://www.boost.org/
 #
-# Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost 
+# Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/samples/advanced_hooks/build/Jamfile.v2 b/samples/advanced_hooks/build/Jamfile.v2
index e442d55..fa0b0a5 100644
--- a/samples/advanced_hooks/build/Jamfile.v2
+++ b/samples/advanced_hooks/build/Jamfile.v2
@@ -4,7 +4,7 @@
 #
 # http://www.boost.org/
 #
-# Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost 
+# Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/samples/cpp_tokens/build/Jamfile b/samples/cpp_tokens/build/Jamfile
index a0e8e5a..8cd384b 100644
--- a/samples/cpp_tokens/build/Jamfile
+++ b/samples/cpp_tokens/build/Jamfile
@@ -4,7 +4,7 @@
 #
 # http://www.boost.org/
 #
-# Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost 
+# Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/samples/cpp_tokens/build/Jamfile.v2 b/samples/cpp_tokens/build/Jamfile.v2
index 4972cda..f481434 100644
--- a/samples/cpp_tokens/build/Jamfile.v2
+++ b/samples/cpp_tokens/build/Jamfile.v2
@@ -4,7 +4,7 @@
 #
 # http://www.boost.org/
 #
-# Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost 
+# Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/samples/cpp_tokens/cpp_tokens.cpp b/samples/cpp_tokens/cpp_tokens.cpp
index 893900e..09afa3e 100644
--- a/samples/cpp_tokens/cpp_tokens.cpp
+++ b/samples/cpp_tokens/cpp_tokens.cpp
@@ -8,7 +8,7 @@
     
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost 
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/samples/cpp_tokens/cpp_tokens.hpp b/samples/cpp_tokens/cpp_tokens.hpp
index 4d1bae4..aa943f5 100644
--- a/samples/cpp_tokens/cpp_tokens.hpp
+++ b/samples/cpp_tokens/cpp_tokens.hpp
@@ -8,7 +8,7 @@
     
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost 
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/samples/cpp_tokens/cpp_tokens_config.hpp b/samples/cpp_tokens/cpp_tokens_config.hpp
index f155b68..2f41069 100644
--- a/samples/cpp_tokens/cpp_tokens_config.hpp
+++ b/samples/cpp_tokens/cpp_tokens_config.hpp
@@ -6,7 +6,7 @@
         
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost 
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/samples/cpp_tokens/instantiate_cpp_exprgrammar.cpp b/samples/cpp_tokens/instantiate_cpp_exprgrammar.cpp
index 83d463a..c3aa7fa 100644
--- a/samples/cpp_tokens/instantiate_cpp_exprgrammar.cpp
+++ b/samples/cpp_tokens/instantiate_cpp_exprgrammar.cpp
@@ -7,7 +7,7 @@
 
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost 
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/samples/cpp_tokens/instantiate_cpp_grammar.cpp b/samples/cpp_tokens/instantiate_cpp_grammar.cpp
index 90f1278..a89a4aa 100644
--- a/samples/cpp_tokens/instantiate_cpp_grammar.cpp
+++ b/samples/cpp_tokens/instantiate_cpp_grammar.cpp
@@ -6,7 +6,7 @@
 
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost 
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/samples/cpp_tokens/instantiate_cpp_literalgrs.cpp b/samples/cpp_tokens/instantiate_cpp_literalgrs.cpp
index a63b3e8..d46dfeb 100644
--- a/samples/cpp_tokens/instantiate_cpp_literalgrs.cpp
+++ b/samples/cpp_tokens/instantiate_cpp_literalgrs.cpp
@@ -5,7 +5,7 @@
 
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost 
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/samples/cpp_tokens/instantiate_defined_grammar.cpp b/samples/cpp_tokens/instantiate_defined_grammar.cpp
index 50b18dc..dec606e 100644
--- a/samples/cpp_tokens/instantiate_defined_grammar.cpp
+++ b/samples/cpp_tokens/instantiate_defined_grammar.cpp
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost 
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/samples/cpp_tokens/instantiate_slex_lexer.cpp b/samples/cpp_tokens/instantiate_slex_lexer.cpp
index a88af6d..1fcec9e 100644
--- a/samples/cpp_tokens/instantiate_slex_lexer.cpp
+++ b/samples/cpp_tokens/instantiate_slex_lexer.cpp
@@ -6,7 +6,7 @@
     
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost 
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/samples/cpp_tokens/slex/cpp_slex_lexer.hpp b/samples/cpp_tokens/slex/cpp_slex_lexer.hpp
index 4e1f2fc..6a5d637 100644
--- a/samples/cpp_tokens/slex/cpp_slex_lexer.hpp
+++ b/samples/cpp_tokens/slex/cpp_slex_lexer.hpp
@@ -5,7 +5,7 @@
     
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost 
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/samples/cpp_tokens/slex/lexer.hpp b/samples/cpp_tokens/slex/lexer.hpp
index 1c0d200..53773e5 100644
--- a/samples/cpp_tokens/slex/lexer.hpp
+++ b/samples/cpp_tokens/slex/lexer.hpp
@@ -6,7 +6,7 @@
     http://www.boost.org/
 
     Copyright (c) 2001, Daniel C. Nuffer.
-    Copyright (c) 2001-2005 Hartmut Kaiser. 
+    Copyright (c) 2001-2006 Hartmut Kaiser. 
     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)
 
diff --git a/samples/cpp_tokens/slex_interface.hpp b/samples/cpp_tokens/slex_interface.hpp
index 9efd66d..b4834b5 100644
--- a/samples/cpp_tokens/slex_interface.hpp
+++ b/samples/cpp_tokens/slex_interface.hpp
@@ -5,7 +5,7 @@
     
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost 
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/samples/cpp_tokens/slex_iterator.hpp b/samples/cpp_tokens/slex_iterator.hpp
index a551d37..7e16ad9 100644
--- a/samples/cpp_tokens/slex_iterator.hpp
+++ b/samples/cpp_tokens/slex_iterator.hpp
@@ -5,7 +5,7 @@
     
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost 
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/samples/cpp_tokens/slex_token.hpp b/samples/cpp_tokens/slex_token.hpp
index 66355c4..13eca43 100644
--- a/samples/cpp_tokens/slex_token.hpp
+++ b/samples/cpp_tokens/slex_token.hpp
@@ -5,7 +5,7 @@
     
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost 
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/samples/lexed_tokens/build/Jamfile b/samples/lexed_tokens/build/Jamfile
index 6233774..c991f25 100644
--- a/samples/lexed_tokens/build/Jamfile
+++ b/samples/lexed_tokens/build/Jamfile
@@ -4,7 +4,7 @@
 #
 # http://www.boost.org/
 #
-# Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost 
+# Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/samples/lexed_tokens/build/Jamfile.v2 b/samples/lexed_tokens/build/Jamfile.v2
index 3c87775..bf4d2e2 100644
--- a/samples/lexed_tokens/build/Jamfile.v2
+++ b/samples/lexed_tokens/build/Jamfile.v2
@@ -4,7 +4,7 @@
 #
 # http://www.boost.org/
 #
-# Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost 
+# Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/samples/lexed_tokens/lexed_tokens.cpp b/samples/lexed_tokens/lexed_tokens.cpp
index dedfdb9..6658b2d 100644
--- a/samples/lexed_tokens/lexed_tokens.cpp
+++ b/samples/lexed_tokens/lexed_tokens.cpp
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost 
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/samples/list_includes/build/Jamfile b/samples/list_includes/build/Jamfile
index 624ccc5..be97ad5 100644
--- a/samples/list_includes/build/Jamfile
+++ b/samples/list_includes/build/Jamfile
@@ -4,7 +4,7 @@
 #
 # http://www.boost.org/
 #
-# Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost 
+# Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/samples/list_includes/build/Jamfile.v2 b/samples/list_includes/build/Jamfile.v2
index a79b009..9dc16ef 100644
--- a/samples/list_includes/build/Jamfile.v2
+++ b/samples/list_includes/build/Jamfile.v2
@@ -4,7 +4,7 @@
 #
 # http://www.boost.org/
 #
-# Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost 
+# Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/samples/list_includes/list_includes.cpp b/samples/list_includes/list_includes.cpp
index a097c70..661ec96 100644
--- a/samples/list_includes/list_includes.cpp
+++ b/samples/list_includes/list_includes.cpp
@@ -11,7 +11,7 @@
 
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost 
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/samples/list_includes/list_includes.hpp b/samples/list_includes/list_includes.hpp
index 1271119..85c6b48 100644
--- a/samples/list_includes/list_includes.hpp
+++ b/samples/list_includes/list_includes.hpp
@@ -6,7 +6,7 @@
         
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost 
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/samples/list_includes/list_includes_config.hpp b/samples/list_includes/list_includes_config.hpp
index f3115dd..4bdf884 100644
--- a/samples/list_includes/list_includes_config.hpp
+++ b/samples/list_includes/list_includes_config.hpp
@@ -5,7 +5,7 @@
     
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost 
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/samples/list_includes/list_includes_version.hpp b/samples/list_includes/list_includes_version.hpp
index 2300713..6cda99e 100644
--- a/samples/list_includes/list_includes_version.hpp
+++ b/samples/list_includes/list_includes_version.hpp
@@ -5,7 +5,7 @@
             
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost 
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/samples/quick_start/build/Jamfile b/samples/quick_start/build/Jamfile
index 7ab7f8c..5591534 100644
--- a/samples/quick_start/build/Jamfile
+++ b/samples/quick_start/build/Jamfile
@@ -4,7 +4,7 @@
 #
 # http://www.boost.org/
 #
-# Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost 
+# Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/samples/quick_start/build/Jamfile.v2 b/samples/quick_start/build/Jamfile.v2
index dadacee..47aaa5d 100644
--- a/samples/quick_start/build/Jamfile.v2
+++ b/samples/quick_start/build/Jamfile.v2
@@ -4,7 +4,7 @@
 #
 # http://www.boost.org/
 #
-# Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost 
+# Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/samples/quick_start/quick_start.cpp b/samples/quick_start/quick_start.cpp
index 764659b..b7ef77e 100644
--- a/samples/quick_start/quick_start.cpp
+++ b/samples/quick_start/quick_start.cpp
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost 
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/samples/waveidl/build/Jamfile b/samples/waveidl/build/Jamfile
index 356e8d8..1112f88 100644
--- a/samples/waveidl/build/Jamfile
+++ b/samples/waveidl/build/Jamfile
@@ -4,7 +4,7 @@
 #
 # http://www.boost.org/
 #
-# Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost 
+# Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/samples/waveidl/build/Jamfile.v2 b/samples/waveidl/build/Jamfile.v2
index e235ec4..6882556 100644
--- a/samples/waveidl/build/Jamfile.v2
+++ b/samples/waveidl/build/Jamfile.v2
@@ -4,7 +4,7 @@
 #
 # http://www.boost.org/
 #
-# Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost 
+# Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/samples/waveidl/idl.cpp b/samples/waveidl/idl.cpp
index 56b3a52..66d28e8 100644
--- a/samples/waveidl/idl.cpp
+++ b/samples/waveidl/idl.cpp
@@ -5,7 +5,7 @@
     
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost 
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
@@ -91,7 +91,7 @@ int print_copyright()
         "Based on: Wave, A Standard conformant C++ preprocessor library",
         "It is hosted by http://www.boost.org/.", 
         "",
-        "Copyright (c) 2001-2005 Hartmut Kaiser, Distributed under the Boost",
+        "Copyright (c) 2001-2006 Hartmut Kaiser, 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)",
         0
diff --git a/samples/waveidl/idl.hpp b/samples/waveidl/idl.hpp
index 5b7575c..ccd646d 100644
--- a/samples/waveidl/idl.hpp
+++ b/samples/waveidl/idl.hpp
@@ -5,7 +5,7 @@
     
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/samples/waveidl/idl_config.hpp b/samples/waveidl/idl_config.hpp
index a16d96a..f66d35b 100644
--- a/samples/waveidl/idl_config.hpp
+++ b/samples/waveidl/idl_config.hpp
@@ -6,7 +6,7 @@
     
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/samples/waveidl/idl_version.hpp b/samples/waveidl/idl_version.hpp
index 1164c19..7af2f63 100644
--- a/samples/waveidl/idl_version.hpp
+++ b/samples/waveidl/idl_version.hpp
@@ -5,7 +5,7 @@
     
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/samples/waveidl/idllexer/idl.re b/samples/waveidl/idllexer/idl.re
index bb30288..6ad5671 100644
--- a/samples/waveidl/idllexer/idl.re
+++ b/samples/waveidl/idllexer/idl.re
@@ -5,7 +5,7 @@
 
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/samples/waveidl/idllexer/idl_lex_interface.hpp b/samples/waveidl/idllexer/idl_lex_interface.hpp
index fe540e8..668f4ef 100644
--- a/samples/waveidl/idllexer/idl_lex_interface.hpp
+++ b/samples/waveidl/idllexer/idl_lex_interface.hpp
@@ -5,7 +5,7 @@
     
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost 
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/samples/waveidl/idllexer/idl_lex_iterator.hpp b/samples/waveidl/idllexer/idl_lex_iterator.hpp
index 532f358..15c8bed 100644
--- a/samples/waveidl/idllexer/idl_lex_iterator.hpp
+++ b/samples/waveidl/idllexer/idl_lex_iterator.hpp
@@ -6,7 +6,7 @@
     
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/samples/waveidl/idllexer/idl_re.cpp b/samples/waveidl/idllexer/idl_re.cpp
index df53012..d7466af 100644
--- a/samples/waveidl/idllexer/idl_re.cpp
+++ b/samples/waveidl/idllexer/idl_re.cpp
@@ -7,7 +7,7 @@
 
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/samples/waveidl/idllexer/idl_re.hpp b/samples/waveidl/idllexer/idl_re.hpp
index b81dfe4..7a1bf8e 100644
--- a/samples/waveidl/idllexer/idl_re.hpp
+++ b/samples/waveidl/idllexer/idl_re.hpp
@@ -5,7 +5,7 @@
     
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost 
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/samples/waveidl/idllexer/idl_re2c_lexer.hpp b/samples/waveidl/idllexer/idl_re2c_lexer.hpp
index 1585b9e..4b9ad90 100644
--- a/samples/waveidl/idllexer/idl_re2c_lexer.hpp
+++ b/samples/waveidl/idllexer/idl_re2c_lexer.hpp
@@ -5,7 +5,7 @@
     
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/samples/waveidl/instantiate_cpp_grammar.cpp b/samples/waveidl/instantiate_cpp_grammar.cpp
index 5fa9a49..1f1bd33 100644
--- a/samples/waveidl/instantiate_cpp_grammar.cpp
+++ b/samples/waveidl/instantiate_cpp_grammar.cpp
@@ -6,7 +6,7 @@
             
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/samples/waveidl/instantiate_defined_grammar.cpp b/samples/waveidl/instantiate_defined_grammar.cpp
index 01e12e2..b352fa2 100644
--- a/samples/waveidl/instantiate_defined_grammar.cpp
+++ b/samples/waveidl/instantiate_defined_grammar.cpp
@@ -6,7 +6,7 @@
 
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/samples/waveidl/instantiate_predef_macros.cpp b/samples/waveidl/instantiate_predef_macros.cpp
index a0526bf..f0dd943 100644
--- a/samples/waveidl/instantiate_predef_macros.cpp
+++ b/samples/waveidl/instantiate_predef_macros.cpp
@@ -6,7 +6,7 @@
 
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/samples/waveidl/instantiate_re2c_lexer.cpp b/samples/waveidl/instantiate_re2c_lexer.cpp
index f7cecd4..fe9fee1 100644
--- a/samples/waveidl/instantiate_re2c_lexer.cpp
+++ b/samples/waveidl/instantiate_re2c_lexer.cpp
@@ -6,7 +6,7 @@
     
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/samples/waveidl/instantiate_re2c_lexer_str.cpp b/samples/waveidl/instantiate_re2c_lexer_str.cpp
index 829b627..38da8c1 100644
--- a/samples/waveidl/instantiate_re2c_lexer_str.cpp
+++ b/samples/waveidl/instantiate_re2c_lexer_str.cpp
@@ -6,7 +6,7 @@
     
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/src/cpplexer/re2clex/aq.cpp b/src/cpplexer/re2clex/aq.cpp
index 6fc26b2..8059ee4 100644
--- a/src/cpplexer/re2clex/aq.cpp
+++ b/src/cpplexer/re2clex/aq.cpp
@@ -3,7 +3,7 @@
     http://www.boost.org/
 
     Copyright (c) 2001 Daniel C. Nuffer.
-    Copyright (c) 2001-2005 Hartmut Kaiser. 
+    Copyright (c) 2001-2006 Hartmut Kaiser. 
     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)
 =============================================================================*/
diff --git a/src/cpplexer/re2clex/cpp.re b/src/cpplexer/re2clex/cpp.re
index 7cc7c2c..9d650e4 100644
--- a/src/cpplexer/re2clex/cpp.re
+++ b/src/cpplexer/re2clex/cpp.re
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
 
     Copyright (c) 2001 Daniel C. Nuffer
-    Copyright (c) 2001-2005 Hartmut Kaiser. 
+    Copyright (c) 2001-2006 Hartmut Kaiser. 
     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)
 
diff --git a/src/cpplexer/re2clex/cpp_re.cpp b/src/cpplexer/re2clex/cpp_re.cpp
index 3555ab8..0e91ad0 100644
--- a/src/cpplexer/re2clex/cpp_re.cpp
+++ b/src/cpplexer/re2clex/cpp_re.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
 
     Copyright (c) 2001 Daniel C. Nuffer
-    Copyright (c) 2001-2005 Hartmut Kaiser. 
+    Copyright (c) 2001-2006 Hartmut Kaiser. 
     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)
 
diff --git a/src/cpplexer/re2clex/cpp_re.inc b/src/cpplexer/re2clex/cpp_re.inc
index 10be3ed..65b877a 100644
--- a/src/cpplexer/re2clex/cpp_re.inc
+++ b/src/cpplexer/re2clex/cpp_re.inc
@@ -4,7 +4,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
 
     Copyright (c) 2001 Daniel C. Nuffer
-    Copyright (c) 2001-2005 Hartmut Kaiser. 
+    Copyright (c) 2001-2006 Hartmut Kaiser. 
     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)
 
diff --git a/src/cpplexer/re2clex/strict_cpp.re b/src/cpplexer/re2clex/strict_cpp.re
index 7d80b5d..a6ede5e 100644
--- a/src/cpplexer/re2clex/strict_cpp.re
+++ b/src/cpplexer/re2clex/strict_cpp.re
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
 
     Copyright (c) 2001 Daniel C. Nuffer
-    Copyright (c) 2001-2005 Hartmut Kaiser. 
+    Copyright (c) 2001-2006 Hartmut Kaiser. 
     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)
 
diff --git a/src/cpplexer/re2clex/strict_cpp_re.inc b/src/cpplexer/re2clex/strict_cpp_re.inc
index 6744cde..d3dad12 100644
--- a/src/cpplexer/re2clex/strict_cpp_re.inc
+++ b/src/cpplexer/re2clex/strict_cpp_re.inc
@@ -4,7 +4,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
 
     Copyright (c) 2001 Daniel C. Nuffer
-    Copyright (c) 2001-2005 Hartmut Kaiser. 
+    Copyright (c) 2001-2006 Hartmut Kaiser. 
     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)
 
diff --git a/src/instantiate_cpp_exprgrammar.cpp b/src/instantiate_cpp_exprgrammar.cpp
index 76a677e..48f6d0e 100644
--- a/src/instantiate_cpp_exprgrammar.cpp
+++ b/src/instantiate_cpp_exprgrammar.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/src/instantiate_cpp_grammar.cpp b/src/instantiate_cpp_grammar.cpp
index 85a1542..dc0d443 100644
--- a/src/instantiate_cpp_grammar.cpp
+++ b/src/instantiate_cpp_grammar.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/src/instantiate_cpp_literalgrs.cpp b/src/instantiate_cpp_literalgrs.cpp
index 4669643..8df94b2 100644
--- a/src/instantiate_cpp_literalgrs.cpp
+++ b/src/instantiate_cpp_literalgrs.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/src/instantiate_defined_grammar.cpp b/src/instantiate_defined_grammar.cpp
index 4dbc7d8..cb1ab7e 100644
--- a/src/instantiate_defined_grammar.cpp
+++ b/src/instantiate_defined_grammar.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/src/instantiate_predef_macros.cpp b/src/instantiate_predef_macros.cpp
index 0165581..d638c2a 100644
--- a/src/instantiate_predef_macros.cpp
+++ b/src/instantiate_predef_macros.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/src/instantiate_re2c_lexer.cpp b/src/instantiate_re2c_lexer.cpp
index 6302d4d..9ed23bf 100644
--- a/src/instantiate_re2c_lexer.cpp
+++ b/src/instantiate_re2c_lexer.cpp
@@ -4,7 +4,7 @@
 
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/src/instantiate_re2c_lexer_str.cpp b/src/instantiate_re2c_lexer_str.cpp
index fdb3f6c..e38efa1 100644
--- a/src/instantiate_re2c_lexer_str.cpp
+++ b/src/instantiate_re2c_lexer_str.cpp
@@ -4,7 +4,7 @@
     
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/build/Jamfile b/test/build/Jamfile
index 124fc15..46b69ca 100644
--- a/test/build/Jamfile
+++ b/test/build/Jamfile
@@ -4,7 +4,7 @@
 #
 # http://www.boost.org/
 #
-# Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost 
+# Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testlexers/cpp_tokens.hpp b/test/testlexers/cpp_tokens.hpp
index c51b659..6a62af5 100644
--- a/test/testlexers/cpp_tokens.hpp
+++ b/test/testlexers/cpp_tokens.hpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testlexers/test_re2c_lexer.cpp b/test/testlexers/test_re2c_lexer.cpp
index f8dd9e5..0aaf26d 100644
--- a/test/testlexers/test_re2c_lexer.cpp
+++ b/test/testlexers/test_re2c_lexer.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testlexers/test_slex_lexer.cpp b/test/testlexers/test_slex_lexer.cpp
index 76e6f26..ac34213 100644
--- a/test/testlexers/test_slex_lexer.cpp
+++ b/test/testlexers/test_slex_lexer.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/cmd_line_utils.hpp b/test/testwave/cmd_line_utils.hpp
index 7556bca..225d2fc 100644
--- a/test/testwave/cmd_line_utils.hpp
+++ b/test/testwave/cmd_line_utils.hpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_1_001.cpp b/test/testwave/testfiles/t_1_001.cpp
index 0b5374d..8c23309 100644
--- a/test/testwave/testfiles/t_1_001.cpp
+++ b/test/testwave/testfiles/t_1_001.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_1_002.cpp b/test/testwave/testfiles/t_1_002.cpp
index 2346524..4c803e7 100644
--- a/test/testwave/testfiles/t_1_002.cpp
+++ b/test/testwave/testfiles/t_1_002.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_1_003.cpp b/test/testwave/testfiles/t_1_003.cpp
index 513d176..e7701c3 100644
--- a/test/testwave/testfiles/t_1_003.cpp
+++ b/test/testwave/testfiles/t_1_003.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_1_004.cpp b/test/testwave/testfiles/t_1_004.cpp
index d3201cb..28747e5 100644
--- a/test/testwave/testfiles/t_1_004.cpp
+++ b/test/testwave/testfiles/t_1_004.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_1_005.cpp b/test/testwave/testfiles/t_1_005.cpp
index ecf144e..ccdedc8 100644
--- a/test/testwave/testfiles/t_1_005.cpp
+++ b/test/testwave/testfiles/t_1_005.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_1_006.cpp b/test/testwave/testfiles/t_1_006.cpp
index fb89b0c..7739c6c 100644
--- a/test/testwave/testfiles/t_1_006.cpp
+++ b/test/testwave/testfiles/t_1_006.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_1_007.cpp b/test/testwave/testfiles/t_1_007.cpp
index 3298242..8955301 100644
--- a/test/testwave/testfiles/t_1_007.cpp
+++ b/test/testwave/testfiles/t_1_007.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_1_008.cpp b/test/testwave/testfiles/t_1_008.cpp
index 7d1beeb..5cc404a 100644
--- a/test/testwave/testfiles/t_1_008.cpp
+++ b/test/testwave/testfiles/t_1_008.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_1_009.cpp b/test/testwave/testfiles/t_1_009.cpp
index 1ca5583..3753bac 100644
--- a/test/testwave/testfiles/t_1_009.cpp
+++ b/test/testwave/testfiles/t_1_009.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_1_010.cpp b/test/testwave/testfiles/t_1_010.cpp
index 9864a10..5f89a70 100644
--- a/test/testwave/testfiles/t_1_010.cpp
+++ b/test/testwave/testfiles/t_1_010.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_1_011.cpp b/test/testwave/testfiles/t_1_011.cpp
index 7cf3316..42b48c9 100644
--- a/test/testwave/testfiles/t_1_011.cpp
+++ b/test/testwave/testfiles/t_1_011.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_1_012.cpp b/test/testwave/testfiles/t_1_012.cpp
index 9b44cde..5d32cf9 100644
--- a/test/testwave/testfiles/t_1_012.cpp
+++ b/test/testwave/testfiles/t_1_012.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_1_013.cpp b/test/testwave/testfiles/t_1_013.cpp
index a494c19..c215e6b 100644
--- a/test/testwave/testfiles/t_1_013.cpp
+++ b/test/testwave/testfiles/t_1_013.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_1_014.cpp b/test/testwave/testfiles/t_1_014.cpp
index c0dac1f..34b2b89 100644
--- a/test/testwave/testfiles/t_1_014.cpp
+++ b/test/testwave/testfiles/t_1_014.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_1_015.cpp b/test/testwave/testfiles/t_1_015.cpp
index 69049a6..fe4e8ff 100644
--- a/test/testwave/testfiles/t_1_015.cpp
+++ b/test/testwave/testfiles/t_1_015.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_1_016.cpp b/test/testwave/testfiles/t_1_016.cpp
index 23c6ac9..ae79440 100644
--- a/test/testwave/testfiles/t_1_016.cpp
+++ b/test/testwave/testfiles/t_1_016.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_1_017.cpp b/test/testwave/testfiles/t_1_017.cpp
index 01cb179..fb5e9f3 100644
--- a/test/testwave/testfiles/t_1_017.cpp
+++ b/test/testwave/testfiles/t_1_017.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_1_018.cpp b/test/testwave/testfiles/t_1_018.cpp
index c92e363..2929ff7 100644
--- a/test/testwave/testfiles/t_1_018.cpp
+++ b/test/testwave/testfiles/t_1_018.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_1_019.cpp b/test/testwave/testfiles/t_1_019.cpp
index 5c7cd7a..8208eeb 100644
--- a/test/testwave/testfiles/t_1_019.cpp
+++ b/test/testwave/testfiles/t_1_019.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_1_020.cpp b/test/testwave/testfiles/t_1_020.cpp
index 68929d2..c774bb2 100644
--- a/test/testwave/testfiles/t_1_020.cpp
+++ b/test/testwave/testfiles/t_1_020.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_1_021.cpp b/test/testwave/testfiles/t_1_021.cpp
index 56d560e..f9b25b6 100644
--- a/test/testwave/testfiles/t_1_021.cpp
+++ b/test/testwave/testfiles/t_1_021.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_1_022.cpp b/test/testwave/testfiles/t_1_022.cpp
index 0e486b6..1c00128 100644
--- a/test/testwave/testfiles/t_1_022.cpp
+++ b/test/testwave/testfiles/t_1_022.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_1_023.cpp b/test/testwave/testfiles/t_1_023.cpp
index 4824f99..d9617a7 100644
--- a/test/testwave/testfiles/t_1_023.cpp
+++ b/test/testwave/testfiles/t_1_023.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_1_024.cpp b/test/testwave/testfiles/t_1_024.cpp
index 73d0ff7..833ea49 100644
--- a/test/testwave/testfiles/t_1_024.cpp
+++ b/test/testwave/testfiles/t_1_024.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_1_025.cpp b/test/testwave/testfiles/t_1_025.cpp
index 2b4bc4e..3f2d51d 100644
--- a/test/testwave/testfiles/t_1_025.cpp
+++ b/test/testwave/testfiles/t_1_025.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_1_026.cpp b/test/testwave/testfiles/t_1_026.cpp
index bc8bf37..f1b5174 100644
--- a/test/testwave/testfiles/t_1_026.cpp
+++ b/test/testwave/testfiles/t_1_026.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_1_027.cpp b/test/testwave/testfiles/t_1_027.cpp
index 50118de..53ddea1 100644
--- a/test/testwave/testfiles/t_1_027.cpp
+++ b/test/testwave/testfiles/t_1_027.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_1_028.cpp b/test/testwave/testfiles/t_1_028.cpp
index abb227d..1a6ea43 100644
--- a/test/testwave/testfiles/t_1_028.cpp
+++ b/test/testwave/testfiles/t_1_028.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_1_029.cpp b/test/testwave/testfiles/t_1_029.cpp
index 59011fd..d51c9a9 100644
--- a/test/testwave/testfiles/t_1_029.cpp
+++ b/test/testwave/testfiles/t_1_029.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_1_030.cpp b/test/testwave/testfiles/t_1_030.cpp
index d4f37fd..7533626 100644
--- a/test/testwave/testfiles/t_1_030.cpp
+++ b/test/testwave/testfiles/t_1_030.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_1_031.cpp b/test/testwave/testfiles/t_1_031.cpp
index 1bcba48..56c2e4e 100644
--- a/test/testwave/testfiles/t_1_031.cpp
+++ b/test/testwave/testfiles/t_1_031.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_1_032.cpp b/test/testwave/testfiles/t_1_032.cpp
index 4c1b8b1..d36051f 100644
--- a/test/testwave/testfiles/t_1_032.cpp
+++ b/test/testwave/testfiles/t_1_032.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_1_033.cpp b/test/testwave/testfiles/t_1_033.cpp
index 9e852ae..c2819b4 100644
--- a/test/testwave/testfiles/t_1_033.cpp
+++ b/test/testwave/testfiles/t_1_033.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_1_034.cpp b/test/testwave/testfiles/t_1_034.cpp
index c6a1e64..e04b081 100644
--- a/test/testwave/testfiles/t_1_034.cpp
+++ b/test/testwave/testfiles/t_1_034.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_1_035.cpp b/test/testwave/testfiles/t_1_035.cpp
index 7c3187e..9cb7a8d 100644
--- a/test/testwave/testfiles/t_1_035.cpp
+++ b/test/testwave/testfiles/t_1_035.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_1_036.cpp b/test/testwave/testfiles/t_1_036.cpp
index e4b6684..0f9193a 100644
--- a/test/testwave/testfiles/t_1_036.cpp
+++ b/test/testwave/testfiles/t_1_036.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_1_037.cpp b/test/testwave/testfiles/t_1_037.cpp
index d72edb9..fb5e34e 100644
--- a/test/testwave/testfiles/t_1_037.cpp
+++ b/test/testwave/testfiles/t_1_037.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_2_001.cpp b/test/testwave/testfiles/t_2_001.cpp
index 186ace1..42342ee 100644
--- a/test/testwave/testfiles/t_2_001.cpp
+++ b/test/testwave/testfiles/t_2_001.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_2_002.cpp b/test/testwave/testfiles/t_2_002.cpp
index f8063a0..db69c00 100644
--- a/test/testwave/testfiles/t_2_002.cpp
+++ b/test/testwave/testfiles/t_2_002.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_2_003.cpp b/test/testwave/testfiles/t_2_003.cpp
index 53b89af..29dbccb 100644
--- a/test/testwave/testfiles/t_2_003.cpp
+++ b/test/testwave/testfiles/t_2_003.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_2_004.cpp b/test/testwave/testfiles/t_2_004.cpp
index 74aeacc..bddc52d 100644
--- a/test/testwave/testfiles/t_2_004.cpp
+++ b/test/testwave/testfiles/t_2_004.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_2_005.cpp b/test/testwave/testfiles/t_2_005.cpp
index 15850ec..fd30fba 100644
--- a/test/testwave/testfiles/t_2_005.cpp
+++ b/test/testwave/testfiles/t_2_005.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_2_006.cpp b/test/testwave/testfiles/t_2_006.cpp
index 5dbf82e..04796c0 100644
--- a/test/testwave/testfiles/t_2_006.cpp
+++ b/test/testwave/testfiles/t_2_006.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_2_007.cpp b/test/testwave/testfiles/t_2_007.cpp
index a2896b5..933e592 100644
--- a/test/testwave/testfiles/t_2_007.cpp
+++ b/test/testwave/testfiles/t_2_007.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_2_008.cpp b/test/testwave/testfiles/t_2_008.cpp
index 7329a29..eba7e27 100644
--- a/test/testwave/testfiles/t_2_008.cpp
+++ b/test/testwave/testfiles/t_2_008.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_2_009.cpp b/test/testwave/testfiles/t_2_009.cpp
index 004e407..cdbc5cd 100644
--- a/test/testwave/testfiles/t_2_009.cpp
+++ b/test/testwave/testfiles/t_2_009.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_2_010.cpp b/test/testwave/testfiles/t_2_010.cpp
index 76d9378..d30424e 100644
--- a/test/testwave/testfiles/t_2_010.cpp
+++ b/test/testwave/testfiles/t_2_010.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_2_011.cpp b/test/testwave/testfiles/t_2_011.cpp
index e59ce16..4ce9cf5 100644
--- a/test/testwave/testfiles/t_2_011.cpp
+++ b/test/testwave/testfiles/t_2_011.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_2_012.cpp b/test/testwave/testfiles/t_2_012.cpp
index 4bed9e9..4292950 100644
--- a/test/testwave/testfiles/t_2_012.cpp
+++ b/test/testwave/testfiles/t_2_012.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_2_013.cpp b/test/testwave/testfiles/t_2_013.cpp
index db58d64..706e2fb 100644
--- a/test/testwave/testfiles/t_2_013.cpp
+++ b/test/testwave/testfiles/t_2_013.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_2_014.cpp b/test/testwave/testfiles/t_2_014.cpp
index c01b3eb..d6c4fbb 100644
--- a/test/testwave/testfiles/t_2_014.cpp
+++ b/test/testwave/testfiles/t_2_014.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_2_015.cpp b/test/testwave/testfiles/t_2_015.cpp
index c78bf49..8462176 100644
--- a/test/testwave/testfiles/t_2_015.cpp
+++ b/test/testwave/testfiles/t_2_015.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_2_016.cpp b/test/testwave/testfiles/t_2_016.cpp
index 496ffd6..c91e3da 100644
--- a/test/testwave/testfiles/t_2_016.cpp
+++ b/test/testwave/testfiles/t_2_016.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_3_001.cpp b/test/testwave/testfiles/t_3_001.cpp
index f8ef41f..dd4ce1a 100644
--- a/test/testwave/testfiles/t_3_001.cpp
+++ b/test/testwave/testfiles/t_3_001.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_3_002.cpp b/test/testwave/testfiles/t_3_002.cpp
index 407bcc2..fb026b4 100644
--- a/test/testwave/testfiles/t_3_002.cpp
+++ b/test/testwave/testfiles/t_3_002.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_3_003.cpp b/test/testwave/testfiles/t_3_003.cpp
index 43223b1..b70ae29 100644
--- a/test/testwave/testfiles/t_3_003.cpp
+++ b/test/testwave/testfiles/t_3_003.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_3_004.cpp b/test/testwave/testfiles/t_3_004.cpp
index efa5d2c..61921b3 100644
--- a/test/testwave/testfiles/t_3_004.cpp
+++ b/test/testwave/testfiles/t_3_004.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_4_001.cpp b/test/testwave/testfiles/t_4_001.cpp
index fbba793..f1d10ce 100644
--- a/test/testwave/testfiles/t_4_001.cpp
+++ b/test/testwave/testfiles/t_4_001.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_4_002.cpp b/test/testwave/testfiles/t_4_002.cpp
index defe817..78e56e6 100644
--- a/test/testwave/testfiles/t_4_002.cpp
+++ b/test/testwave/testfiles/t_4_002.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_4_003.cpp b/test/testwave/testfiles/t_4_003.cpp
index 2de9e77..fcb0f52 100644
--- a/test/testwave/testfiles/t_4_003.cpp
+++ b/test/testwave/testfiles/t_4_003.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_5_001.cpp b/test/testwave/testfiles/t_5_001.cpp
index 462d9b9..94353f3 100644
--- a/test/testwave/testfiles/t_5_001.cpp
+++ b/test/testwave/testfiles/t_5_001.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_5_002.cpp b/test/testwave/testfiles/t_5_002.cpp
index cbf4093..2662bda 100644
--- a/test/testwave/testfiles/t_5_002.cpp
+++ b/test/testwave/testfiles/t_5_002.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_5_003.cpp b/test/testwave/testfiles/t_5_003.cpp
index 253ae8e..ef58629 100644
--- a/test/testwave/testfiles/t_5_003.cpp
+++ b/test/testwave/testfiles/t_5_003.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_5_004.cpp b/test/testwave/testfiles/t_5_004.cpp
index f157879..dbbe6b9 100644
--- a/test/testwave/testfiles/t_5_004.cpp
+++ b/test/testwave/testfiles/t_5_004.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_5_005.cpp b/test/testwave/testfiles/t_5_005.cpp
index 0dea3bc..d1f1c50 100644
--- a/test/testwave/testfiles/t_5_005.cpp
+++ b/test/testwave/testfiles/t_5_005.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_5_006.cpp b/test/testwave/testfiles/t_5_006.cpp
index a37e416..5f71c53 100644
--- a/test/testwave/testfiles/t_5_006.cpp
+++ b/test/testwave/testfiles/t_5_006.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_5_007.cpp b/test/testwave/testfiles/t_5_007.cpp
index f819795..de14c31 100644
--- a/test/testwave/testfiles/t_5_007.cpp
+++ b/test/testwave/testfiles/t_5_007.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_5_007.hpp b/test/testwave/testfiles/t_5_007.hpp
index 47ef57f..3ddc6e5 100644
--- a/test/testwave/testfiles/t_5_007.hpp
+++ b/test/testwave/testfiles/t_5_007.hpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_5_008.cpp b/test/testwave/testfiles/t_5_008.cpp
index c84c54e..868decc 100644
--- a/test/testwave/testfiles/t_5_008.cpp
+++ b/test/testwave/testfiles/t_5_008.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_5_009.cpp b/test/testwave/testfiles/t_5_009.cpp
index b0832c0..7431d65 100644
--- a/test/testwave/testfiles/t_5_009.cpp
+++ b/test/testwave/testfiles/t_5_009.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_5_010.cpp b/test/testwave/testfiles/t_5_010.cpp
index 7d0a361..995d186 100644
--- a/test/testwave/testfiles/t_5_010.cpp
+++ b/test/testwave/testfiles/t_5_010.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_5_011.cpp b/test/testwave/testfiles/t_5_011.cpp
index bb3312d..29abf73 100644
--- a/test/testwave/testfiles/t_5_011.cpp
+++ b/test/testwave/testfiles/t_5_011.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_5_012.cpp b/test/testwave/testfiles/t_5_012.cpp
index 0a910e2..82c4ae9 100644
--- a/test/testwave/testfiles/t_5_012.cpp
+++ b/test/testwave/testfiles/t_5_012.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_5_013.cpp b/test/testwave/testfiles/t_5_013.cpp
index d1d6f22..38b78f1 100644
--- a/test/testwave/testfiles/t_5_013.cpp
+++ b/test/testwave/testfiles/t_5_013.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_5_014.cpp b/test/testwave/testfiles/t_5_014.cpp
index 27ca99f..1a35af9 100644
--- a/test/testwave/testfiles/t_5_014.cpp
+++ b/test/testwave/testfiles/t_5_014.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_5_015.cpp b/test/testwave/testfiles/t_5_015.cpp
index 3e92736..14adae0 100644
--- a/test/testwave/testfiles/t_5_015.cpp
+++ b/test/testwave/testfiles/t_5_015.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_5_016.cpp b/test/testwave/testfiles/t_5_016.cpp
index aa39b4c..d296ea9 100644
--- a/test/testwave/testfiles/t_5_016.cpp
+++ b/test/testwave/testfiles/t_5_016.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_5_017.cpp b/test/testwave/testfiles/t_5_017.cpp
index 8b13fe4..d979d34 100644
--- a/test/testwave/testfiles/t_5_017.cpp
+++ b/test/testwave/testfiles/t_5_017.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_5_018.cpp b/test/testwave/testfiles/t_5_018.cpp
index f1caee1..d32da9c 100644
--- a/test/testwave/testfiles/t_5_018.cpp
+++ b/test/testwave/testfiles/t_5_018.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_5_019.cpp b/test/testwave/testfiles/t_5_019.cpp
index 780a009..e1bd0f2 100644
--- a/test/testwave/testfiles/t_5_019.cpp
+++ b/test/testwave/testfiles/t_5_019.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_5_020.cpp b/test/testwave/testfiles/t_5_020.cpp
index 514b58a..1246756 100644
--- a/test/testwave/testfiles/t_5_020.cpp
+++ b/test/testwave/testfiles/t_5_020.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_5_021.cpp b/test/testwave/testfiles/t_5_021.cpp
index d6f98c9..0f7ba50 100644
--- a/test/testwave/testfiles/t_5_021.cpp
+++ b/test/testwave/testfiles/t_5_021.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_5_022.cpp b/test/testwave/testfiles/t_5_022.cpp
index 6e4a752..b586341 100644
--- a/test/testwave/testfiles/t_5_022.cpp
+++ b/test/testwave/testfiles/t_5_022.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_5_023.cpp b/test/testwave/testfiles/t_5_023.cpp
index d7245e9..1766cbd 100644
--- a/test/testwave/testfiles/t_5_023.cpp
+++ b/test/testwave/testfiles/t_5_023.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_5_024.cpp b/test/testwave/testfiles/t_5_024.cpp
index f9d7131..0fa36d3 100644
--- a/test/testwave/testfiles/t_5_024.cpp
+++ b/test/testwave/testfiles/t_5_024.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_5_025.cpp b/test/testwave/testfiles/t_5_025.cpp
index 22d1d25..a11a05c 100644
--- a/test/testwave/testfiles/t_5_025.cpp
+++ b/test/testwave/testfiles/t_5_025.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_5_026.cpp b/test/testwave/testfiles/t_5_026.cpp
index 1e74c9d..fc18063 100644
--- a/test/testwave/testfiles/t_5_026.cpp
+++ b/test/testwave/testfiles/t_5_026.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_5_027.cpp b/test/testwave/testfiles/t_5_027.cpp
index 23ed978..c78028a 100644
--- a/test/testwave/testfiles/t_5_027.cpp
+++ b/test/testwave/testfiles/t_5_027.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_5_028.cpp b/test/testwave/testfiles/t_5_028.cpp
index b2e387e..40036ce 100644
--- a/test/testwave/testfiles/t_5_028.cpp
+++ b/test/testwave/testfiles/t_5_028.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_5_029.cpp b/test/testwave/testfiles/t_5_029.cpp
index dc77069..0a6b36a 100644
--- a/test/testwave/testfiles/t_5_029.cpp
+++ b/test/testwave/testfiles/t_5_029.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_5_030.cpp b/test/testwave/testfiles/t_5_030.cpp
index 9706956..9434e75 100644
--- a/test/testwave/testfiles/t_5_030.cpp
+++ b/test/testwave/testfiles/t_5_030.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_5_031.cpp b/test/testwave/testfiles/t_5_031.cpp
index 6bf920c..93db570 100644
--- a/test/testwave/testfiles/t_5_031.cpp
+++ b/test/testwave/testfiles/t_5_031.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_5_031.hpp b/test/testwave/testfiles/t_5_031.hpp
index d36b09c..ec91575 100644
--- a/test/testwave/testfiles/t_5_031.hpp
+++ b/test/testwave/testfiles/t_5_031.hpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_5_032.cpp b/test/testwave/testfiles/t_5_032.cpp
index ee9efc5..675ad50 100644
--- a/test/testwave/testfiles/t_5_032.cpp
+++ b/test/testwave/testfiles/t_5_032.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_5_033.cpp b/test/testwave/testfiles/t_5_033.cpp
index a7d516c..620813d 100644
--- a/test/testwave/testfiles/t_5_033.cpp
+++ b/test/testwave/testfiles/t_5_033.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_5_034.cpp b/test/testwave/testfiles/t_5_034.cpp
index 2d5b6f4..a5124d7 100644
--- a/test/testwave/testfiles/t_5_034.cpp
+++ b/test/testwave/testfiles/t_5_034.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_5_035.cpp b/test/testwave/testfiles/t_5_035.cpp
index 0b0735e..d62e82b 100644
--- a/test/testwave/testfiles/t_5_035.cpp
+++ b/test/testwave/testfiles/t_5_035.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_5_035.hpp b/test/testwave/testfiles/t_5_035.hpp
index 60d524f..a2a5f58 100644
--- a/test/testwave/testfiles/t_5_035.hpp
+++ b/test/testwave/testfiles/t_5_035.hpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_5_035_01.hpp b/test/testwave/testfiles/t_5_035_01.hpp
index 4145e55..e2beeee 100644
--- a/test/testwave/testfiles/t_5_035_01.hpp
+++ b/test/testwave/testfiles/t_5_035_01.hpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_5_035_02.hpp b/test/testwave/testfiles/t_5_035_02.hpp
index 3ebbb15..e716118 100644
--- a/test/testwave/testfiles/t_5_035_02.hpp
+++ b/test/testwave/testfiles/t_5_035_02.hpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_5_035_03.hpp b/test/testwave/testfiles/t_5_035_03.hpp
index 4832121..7b21d1a 100644
--- a/test/testwave/testfiles/t_5_035_03.hpp
+++ b/test/testwave/testfiles/t_5_035_03.hpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_5_035_04.hpp b/test/testwave/testfiles/t_5_035_04.hpp
index 8c421d5..50f5b62 100644
--- a/test/testwave/testfiles/t_5_035_04.hpp
+++ b/test/testwave/testfiles/t_5_035_04.hpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_5_035_05.hpp b/test/testwave/testfiles/t_5_035_05.hpp
index ce58c66..2f38896 100644
--- a/test/testwave/testfiles/t_5_035_05.hpp
+++ b/test/testwave/testfiles/t_5_035_05.hpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_5_035_06.hpp b/test/testwave/testfiles/t_5_035_06.hpp
index 65f0488..c6f0460 100644
--- a/test/testwave/testfiles/t_5_035_06.hpp
+++ b/test/testwave/testfiles/t_5_035_06.hpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_5_035_07.hpp b/test/testwave/testfiles/t_5_035_07.hpp
index 21a9465..cb9f17f 100644
--- a/test/testwave/testfiles/t_5_035_07.hpp
+++ b/test/testwave/testfiles/t_5_035_07.hpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_5_035_08.hpp b/test/testwave/testfiles/t_5_035_08.hpp
index 83fd0fe..6450185 100644
--- a/test/testwave/testfiles/t_5_035_08.hpp
+++ b/test/testwave/testfiles/t_5_035_08.hpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_5_035_09.hpp b/test/testwave/testfiles/t_5_035_09.hpp
index c22561f..b0c7c15 100644
--- a/test/testwave/testfiles/t_5_035_09.hpp
+++ b/test/testwave/testfiles/t_5_035_09.hpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_5_035_10.hpp b/test/testwave/testfiles/t_5_035_10.hpp
index bdbae19..f96c9ce 100644
--- a/test/testwave/testfiles/t_5_035_10.hpp
+++ b/test/testwave/testfiles/t_5_035_10.hpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_5_035_11.hpp b/test/testwave/testfiles/t_5_035_11.hpp
index 077eb67..0ab8ac3 100644
--- a/test/testwave/testfiles/t_5_035_11.hpp
+++ b/test/testwave/testfiles/t_5_035_11.hpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_5_035_12.hpp b/test/testwave/testfiles/t_5_035_12.hpp
index 44c10f2..0ebe198 100644
--- a/test/testwave/testfiles/t_5_035_12.hpp
+++ b/test/testwave/testfiles/t_5_035_12.hpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_5_035_13.hpp b/test/testwave/testfiles/t_5_035_13.hpp
index 9c6f237..7cda617 100644
--- a/test/testwave/testfiles/t_5_035_13.hpp
+++ b/test/testwave/testfiles/t_5_035_13.hpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_5_035_14.hpp b/test/testwave/testfiles/t_5_035_14.hpp
index 1843de3..e8452c0 100644
--- a/test/testwave/testfiles/t_5_035_14.hpp
+++ b/test/testwave/testfiles/t_5_035_14.hpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_5_035_15.hpp b/test/testwave/testfiles/t_5_035_15.hpp
index 3d03cbe..43aae4b 100644
--- a/test/testwave/testfiles/t_5_035_15.hpp
+++ b/test/testwave/testfiles/t_5_035_15.hpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_6_001.cpp b/test/testwave/testfiles/t_6_001.cpp
index 2db1c08..4f595cc 100644
--- a/test/testwave/testfiles/t_6_001.cpp
+++ b/test/testwave/testfiles/t_6_001.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_6_002.cpp b/test/testwave/testfiles/t_6_002.cpp
index 56e8749..5c5f736 100644
--- a/test/testwave/testfiles/t_6_002.cpp
+++ b/test/testwave/testfiles/t_6_002.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_6_003.cpp b/test/testwave/testfiles/t_6_003.cpp
index 4a57aaf..93a4af6 100644
--- a/test/testwave/testfiles/t_6_003.cpp
+++ b/test/testwave/testfiles/t_6_003.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_6_004.cpp b/test/testwave/testfiles/t_6_004.cpp
index 053a8e9..d6240c2 100644
--- a/test/testwave/testfiles/t_6_004.cpp
+++ b/test/testwave/testfiles/t_6_004.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_6_005.cpp b/test/testwave/testfiles/t_6_005.cpp
index a17c386..32880cf 100644
--- a/test/testwave/testfiles/t_6_005.cpp
+++ b/test/testwave/testfiles/t_6_005.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_6_006.cpp b/test/testwave/testfiles/t_6_006.cpp
index 9a156cc..2c12026 100644
--- a/test/testwave/testfiles/t_6_006.cpp
+++ b/test/testwave/testfiles/t_6_006.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_6_007.cpp b/test/testwave/testfiles/t_6_007.cpp
index b5d7db3..28aab92 100644
--- a/test/testwave/testfiles/t_6_007.cpp
+++ b/test/testwave/testfiles/t_6_007.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_6_008.cpp b/test/testwave/testfiles/t_6_008.cpp
index 81507f1..e7a70b6 100644
--- a/test/testwave/testfiles/t_6_008.cpp
+++ b/test/testwave/testfiles/t_6_008.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_6_009.cpp b/test/testwave/testfiles/t_6_009.cpp
index bd10bf2..20ce71b 100644
--- a/test/testwave/testfiles/t_6_009.cpp
+++ b/test/testwave/testfiles/t_6_009.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_6_010.cpp b/test/testwave/testfiles/t_6_010.cpp
index 764a589..1327b07 100644
--- a/test/testwave/testfiles/t_6_010.cpp
+++ b/test/testwave/testfiles/t_6_010.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_6_011.cpp b/test/testwave/testfiles/t_6_011.cpp
index 5054622..f4fcd06 100644
--- a/test/testwave/testfiles/t_6_011.cpp
+++ b/test/testwave/testfiles/t_6_011.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_6_012.cpp b/test/testwave/testfiles/t_6_012.cpp
index 84ccf37..3c02dcf 100644
--- a/test/testwave/testfiles/t_6_012.cpp
+++ b/test/testwave/testfiles/t_6_012.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_6_013.cpp b/test/testwave/testfiles/t_6_013.cpp
index efb8401..91e2338 100644
--- a/test/testwave/testfiles/t_6_013.cpp
+++ b/test/testwave/testfiles/t_6_013.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_6_014.cpp b/test/testwave/testfiles/t_6_014.cpp
index a885737..1594139 100644
--- a/test/testwave/testfiles/t_6_014.cpp
+++ b/test/testwave/testfiles/t_6_014.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_6_015.cpp b/test/testwave/testfiles/t_6_015.cpp
index 6f48ce6..d0776b5 100644
--- a/test/testwave/testfiles/t_6_015.cpp
+++ b/test/testwave/testfiles/t_6_015.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_6_016.cpp b/test/testwave/testfiles/t_6_016.cpp
index 895c9e8..676095e 100644
--- a/test/testwave/testfiles/t_6_016.cpp
+++ b/test/testwave/testfiles/t_6_016.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_6_017.cpp b/test/testwave/testfiles/t_6_017.cpp
index 6efe153..b993d52 100644
--- a/test/testwave/testfiles/t_6_017.cpp
+++ b/test/testwave/testfiles/t_6_017.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_6_018.cpp b/test/testwave/testfiles/t_6_018.cpp
index b664d5f..f348c0a 100644
--- a/test/testwave/testfiles/t_6_018.cpp
+++ b/test/testwave/testfiles/t_6_018.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_6_019.cpp b/test/testwave/testfiles/t_6_019.cpp
index 0e01482..13322f4 100644
--- a/test/testwave/testfiles/t_6_019.cpp
+++ b/test/testwave/testfiles/t_6_019.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_6_020.cpp b/test/testwave/testfiles/t_6_020.cpp
index 5201d35..0c3591a 100644
--- a/test/testwave/testfiles/t_6_020.cpp
+++ b/test/testwave/testfiles/t_6_020.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_6_021.cpp b/test/testwave/testfiles/t_6_021.cpp
index e758fcf..1b6c337 100644
--- a/test/testwave/testfiles/t_6_021.cpp
+++ b/test/testwave/testfiles/t_6_021.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_6_022.cpp b/test/testwave/testfiles/t_6_022.cpp
index e7aca5a..e5fe4d7 100644
--- a/test/testwave/testfiles/t_6_022.cpp
+++ b/test/testwave/testfiles/t_6_022.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_6_023.cpp b/test/testwave/testfiles/t_6_023.cpp
index 470f169..8961214 100644
--- a/test/testwave/testfiles/t_6_023.cpp
+++ b/test/testwave/testfiles/t_6_023.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_6_024.cpp b/test/testwave/testfiles/t_6_024.cpp
index 579f7e9..a03e3f7 100644
--- a/test/testwave/testfiles/t_6_024.cpp
+++ b/test/testwave/testfiles/t_6_024.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_6_025.cpp b/test/testwave/testfiles/t_6_025.cpp
index ab4f983..62d490b 100644
--- a/test/testwave/testfiles/t_6_025.cpp
+++ b/test/testwave/testfiles/t_6_025.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_6_026.cpp b/test/testwave/testfiles/t_6_026.cpp
index eee6f22..8d10f88 100644
--- a/test/testwave/testfiles/t_6_026.cpp
+++ b/test/testwave/testfiles/t_6_026.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_6_027.cpp b/test/testwave/testfiles/t_6_027.cpp
index 8ad50de..f49cb94 100644
--- a/test/testwave/testfiles/t_6_027.cpp
+++ b/test/testwave/testfiles/t_6_027.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_6_028.cpp b/test/testwave/testfiles/t_6_028.cpp
index 5a5fa68..3a76437 100644
--- a/test/testwave/testfiles/t_6_028.cpp
+++ b/test/testwave/testfiles/t_6_028.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_6_029.cpp b/test/testwave/testfiles/t_6_029.cpp
index 43b2c50..6f4581c 100644
--- a/test/testwave/testfiles/t_6_029.cpp
+++ b/test/testwave/testfiles/t_6_029.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_6_029.hpp b/test/testwave/testfiles/t_6_029.hpp
index bdad6d0..8c9c29a 100644
--- a/test/testwave/testfiles/t_6_029.hpp
+++ b/test/testwave/testfiles/t_6_029.hpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_6_030.cpp b/test/testwave/testfiles/t_6_030.cpp
index fb9ef51..28069a6 100644
--- a/test/testwave/testfiles/t_6_030.cpp
+++ b/test/testwave/testfiles/t_6_030.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_6_030.hpp b/test/testwave/testfiles/t_6_030.hpp
index 1bdcdf0..e9a6946 100644
--- a/test/testwave/testfiles/t_6_030.hpp
+++ b/test/testwave/testfiles/t_6_030.hpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_6_031.cpp b/test/testwave/testfiles/t_6_031.cpp
index 51997ec..20d3765 100644
--- a/test/testwave/testfiles/t_6_031.cpp
+++ b/test/testwave/testfiles/t_6_031.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_6_032.cpp b/test/testwave/testfiles/t_6_032.cpp
index 1ca3c1b..6ce3475 100644
--- a/test/testwave/testfiles/t_6_032.cpp
+++ b/test/testwave/testfiles/t_6_032.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_6_033.cpp b/test/testwave/testfiles/t_6_033.cpp
index 07f2d34..ab955c7 100644
--- a/test/testwave/testfiles/t_6_033.cpp
+++ b/test/testwave/testfiles/t_6_033.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_6_034.cpp b/test/testwave/testfiles/t_6_034.cpp
index 2114a0e..e97f5ca 100644
--- a/test/testwave/testfiles/t_6_034.cpp
+++ b/test/testwave/testfiles/t_6_034.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_6_035.cpp b/test/testwave/testfiles/t_6_035.cpp
index 5349400..2353737 100644
--- a/test/testwave/testfiles/t_6_035.cpp
+++ b/test/testwave/testfiles/t_6_035.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_6_036.cpp b/test/testwave/testfiles/t_6_036.cpp
index 96f9ac3..0b81717 100644
--- a/test/testwave/testfiles/t_6_036.cpp
+++ b/test/testwave/testfiles/t_6_036.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_6_037.cpp b/test/testwave/testfiles/t_6_037.cpp
index 3c5b3fb..d8d4302 100644
--- a/test/testwave/testfiles/t_6_037.cpp
+++ b/test/testwave/testfiles/t_6_037.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_6_038.cpp b/test/testwave/testfiles/t_6_038.cpp
index 2f72e74..6e5917b 100644
--- a/test/testwave/testfiles/t_6_038.cpp
+++ b/test/testwave/testfiles/t_6_038.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_6_039.cpp b/test/testwave/testfiles/t_6_039.cpp
index 45ebf58..4cfe297 100644
--- a/test/testwave/testfiles/t_6_039.cpp
+++ b/test/testwave/testfiles/t_6_039.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_6_040.cpp b/test/testwave/testfiles/t_6_040.cpp
index 96e48ba..e10f5d8 100644
--- a/test/testwave/testfiles/t_6_040.cpp
+++ b/test/testwave/testfiles/t_6_040.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_6_041.cpp b/test/testwave/testfiles/t_6_041.cpp
index 7355d20..880b86a 100644
--- a/test/testwave/testfiles/t_6_041.cpp
+++ b/test/testwave/testfiles/t_6_041.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_6_042.cpp b/test/testwave/testfiles/t_6_042.cpp
index 5bc4c1a..bde8234 100644
--- a/test/testwave/testfiles/t_6_042.cpp
+++ b/test/testwave/testfiles/t_6_042.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_6_043.cpp b/test/testwave/testfiles/t_6_043.cpp
index 30be6bc..990d999 100644
--- a/test/testwave/testfiles/t_6_043.cpp
+++ b/test/testwave/testfiles/t_6_043.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_6_044.cpp b/test/testwave/testfiles/t_6_044.cpp
index 0542a6d..49b5d61 100644
--- a/test/testwave/testfiles/t_6_044.cpp
+++ b/test/testwave/testfiles/t_6_044.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_6_045.cpp b/test/testwave/testfiles/t_6_045.cpp
index f0462ea..c72b106 100644
--- a/test/testwave/testfiles/t_6_045.cpp
+++ b/test/testwave/testfiles/t_6_045.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_6_046.cpp b/test/testwave/testfiles/t_6_046.cpp
index e5fd6d2..a211f41 100644
--- a/test/testwave/testfiles/t_6_046.cpp
+++ b/test/testwave/testfiles/t_6_046.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_6_047.cpp b/test/testwave/testfiles/t_6_047.cpp
index 6dbaf7e..d5d516f 100644
--- a/test/testwave/testfiles/t_6_047.cpp
+++ b/test/testwave/testfiles/t_6_047.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_6_048.cpp b/test/testwave/testfiles/t_6_048.cpp
index 38a8731..4ca7658 100644
--- a/test/testwave/testfiles/t_6_048.cpp
+++ b/test/testwave/testfiles/t_6_048.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_6_049.cpp b/test/testwave/testfiles/t_6_049.cpp
index 501727b..58c0f94 100644
--- a/test/testwave/testfiles/t_6_049.cpp
+++ b/test/testwave/testfiles/t_6_049.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_6_050.cpp b/test/testwave/testfiles/t_6_050.cpp
index 6f5cdee..20ec342 100644
--- a/test/testwave/testfiles/t_6_050.cpp
+++ b/test/testwave/testfiles/t_6_050.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_6_051.cpp b/test/testwave/testfiles/t_6_051.cpp
index 0334511..6bc530b 100644
--- a/test/testwave/testfiles/t_6_051.cpp
+++ b/test/testwave/testfiles/t_6_051.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_6_052.cpp b/test/testwave/testfiles/t_6_052.cpp
index 185a011..b2f104a 100644
--- a/test/testwave/testfiles/t_6_052.cpp
+++ b/test/testwave/testfiles/t_6_052.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_6_053.cpp b/test/testwave/testfiles/t_6_053.cpp
index f78b030..6866952 100644
--- a/test/testwave/testfiles/t_6_053.cpp
+++ b/test/testwave/testfiles/t_6_053.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_6_054.cpp b/test/testwave/testfiles/t_6_054.cpp
index f05775a..b365293 100644
--- a/test/testwave/testfiles/t_6_054.cpp
+++ b/test/testwave/testfiles/t_6_054.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_6_055.cpp b/test/testwave/testfiles/t_6_055.cpp
index 375471a..38706fc 100644
--- a/test/testwave/testfiles/t_6_055.cpp
+++ b/test/testwave/testfiles/t_6_055.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_6_056.cpp b/test/testwave/testfiles/t_6_056.cpp
index f0d073e..8e3a18b 100644
--- a/test/testwave/testfiles/t_6_056.cpp
+++ b/test/testwave/testfiles/t_6_056.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_6_057.cpp b/test/testwave/testfiles/t_6_057.cpp
index 696312a..1fc9023 100644
--- a/test/testwave/testfiles/t_6_057.cpp
+++ b/test/testwave/testfiles/t_6_057.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_6_058.cpp b/test/testwave/testfiles/t_6_058.cpp
index 4fe962c..d3a4cc7 100644
--- a/test/testwave/testfiles/t_6_058.cpp
+++ b/test/testwave/testfiles/t_6_058.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_6_059.cpp b/test/testwave/testfiles/t_6_059.cpp
index d2bc45a..d17de8f 100644
--- a/test/testwave/testfiles/t_6_059.cpp
+++ b/test/testwave/testfiles/t_6_059.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_6_060.cpp b/test/testwave/testfiles/t_6_060.cpp
index 2f2ba10..a8cc47f 100644
--- a/test/testwave/testfiles/t_6_060.cpp
+++ b/test/testwave/testfiles/t_6_060.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_6_061.cpp b/test/testwave/testfiles/t_6_061.cpp
index febc0f2..fd59ae2 100644
--- a/test/testwave/testfiles/t_6_061.cpp
+++ b/test/testwave/testfiles/t_6_061.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_6_062.cpp b/test/testwave/testfiles/t_6_062.cpp
index 0e3d7ed..0c7fded 100644
--- a/test/testwave/testfiles/t_6_062.cpp
+++ b/test/testwave/testfiles/t_6_062.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/test/testwave/testfiles/t_9_001.cpp b/test/testwave/testfiles/t_9_001.cpp
index 6d24e14..69606b7 100644
--- a/test/testwave/testfiles/t_9_001.cpp
+++ b/test/testwave/testfiles/t_9_001.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_9_002.cpp b/test/testwave/testfiles/t_9_002.cpp
index 323a47f..cb22531 100644
--- a/test/testwave/testfiles/t_9_002.cpp
+++ b/test/testwave/testfiles/t_9_002.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_9_003.cpp b/test/testwave/testfiles/t_9_003.cpp
index dedee61..1ff3848 100644
--- a/test/testwave/testfiles/t_9_003.cpp
+++ b/test/testwave/testfiles/t_9_003.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_9_004.cpp b/test/testwave/testfiles/t_9_004.cpp
index a922fd9..ee0b1d0 100644
--- a/test/testwave/testfiles/t_9_004.cpp
+++ b/test/testwave/testfiles/t_9_004.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_9_005.cpp b/test/testwave/testfiles/t_9_005.cpp
index f8f3219..11a117b 100644
--- a/test/testwave/testfiles/t_9_005.cpp
+++ b/test/testwave/testfiles/t_9_005.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_9_006.cpp b/test/testwave/testfiles/t_9_006.cpp
index a82342c..404993b 100644
--- a/test/testwave/testfiles/t_9_006.cpp
+++ b/test/testwave/testfiles/t_9_006.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_9_007.cpp b/test/testwave/testfiles/t_9_007.cpp
index e0ae096..340c10a 100644
--- a/test/testwave/testfiles/t_9_007.cpp
+++ b/test/testwave/testfiles/t_9_007.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_9_008.cpp b/test/testwave/testfiles/t_9_008.cpp
index c1f1c46..e5563ec 100644
--- a/test/testwave/testfiles/t_9_008.cpp
+++ b/test/testwave/testfiles/t_9_008.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_9_009.cpp b/test/testwave/testfiles/t_9_009.cpp
index 5f9fe1d..fa32fde 100644
--- a/test/testwave/testfiles/t_9_009.cpp
+++ b/test/testwave/testfiles/t_9_009.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_9_010.cpp b/test/testwave/testfiles/t_9_010.cpp
index 6c15206..3d44980 100644
--- a/test/testwave/testfiles/t_9_010.cpp
+++ b/test/testwave/testfiles/t_9_010.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_9_011.cpp b/test/testwave/testfiles/t_9_011.cpp
index 6305c49..f550ac2 100644
--- a/test/testwave/testfiles/t_9_011.cpp
+++ b/test/testwave/testfiles/t_9_011.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_9_012.cpp b/test/testwave/testfiles/t_9_012.cpp
index 5724d4e..06a927b 100644
--- a/test/testwave/testfiles/t_9_012.cpp
+++ b/test/testwave/testfiles/t_9_012.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_9_013.cpp b/test/testwave/testfiles/t_9_013.cpp
index 7db06e7..6119bf1 100644
--- a/test/testwave/testfiles/t_9_013.cpp
+++ b/test/testwave/testfiles/t_9_013.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_9_014.cpp b/test/testwave/testfiles/t_9_014.cpp
index da6a15e..64884c9 100644
--- a/test/testwave/testfiles/t_9_014.cpp
+++ b/test/testwave/testfiles/t_9_014.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/t_9_015.cpp b/test/testwave/testfiles/t_9_015.cpp
index 6af58ef..79876c1 100644
--- a/test/testwave/testfiles/t_9_015.cpp
+++ b/test/testwave/testfiles/t_9_015.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testfiles/test.cfg b/test/testwave/testfiles/test.cfg
index 8b9ceb8..7ecc7c1 100644
--- a/test/testwave/testfiles/test.cfg
+++ b/test/testwave/testfiles/test.cfg
@@ -2,7 +2,7 @@
 #    Boost.Wave: A Standard compliant C++ preprocessor library
 #    http://www.boost.org/
 #
-#    Copyright (c) 2t_1-2005 Hartmut Kaiser. Distributed under the Boost
+#    Copyright (c) 2003-2006 Hartmut Kaiser. 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)
 #
diff --git a/test/testwave/testwave.cpp b/test/testwave/testwave.cpp
index 8d7dbb3..60f6baa 100644
--- a/test/testwave/testwave.cpp
+++ b/test/testwave/testwave.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/test/testwave/testwave_app.cpp b/test/testwave/testwave_app.cpp
index 5098c51..79ebcc8 100644
--- a/test/testwave/testwave_app.cpp
+++ b/test/testwave/testwave_app.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
@@ -431,7 +431,7 @@ testwave_app::print_copyright()
         "Testwave: A test driver for the Boost.Wave C++ preprocessor library",
         "http://www.boost.org/",
         "",
-        "Copyright (c) 2001-2005 Hartmut Kaiser, Distributed under the Boost",
+        "Copyright (c) 2001-2006 Hartmut Kaiser, 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)",
         0
diff --git a/test/testwave/testwave_app.hpp b/test/testwave/testwave_app.hpp
index 53723db..2785fa4 100644
--- a/test/testwave/testwave_app.hpp
+++ b/test/testwave/testwave_app.hpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/tool/build/Jamfile b/tool/build/Jamfile
index 4c21295..6d190e4 100644
--- a/tool/build/Jamfile
+++ b/tool/build/Jamfile
@@ -4,7 +4,7 @@
 #
 # http://www.boost.org/
 #
-# Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+# Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/tool/build/Jamfile.v2 b/tool/build/Jamfile.v2
index cd1429e..047ed7d 100644
--- a/tool/build/Jamfile.v2
+++ b/tool/build/Jamfile.v2
@@ -4,7 +4,7 @@
 #
 # http://www.boost.org/
 #
-# Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+# Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 
diff --git a/tool/cpp.cpp b/tool/cpp.cpp
index 7df4797..739fb68 100644
--- a/tool/cpp.cpp
+++ b/tool/cpp.cpp
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
@@ -94,7 +94,7 @@ int print_copyright()
         "Wave: A Standard conformant C++ preprocessor based on the Boost.Wave library",
         "http://www.boost.org/",
         "",
-        "Copyright (c) 2001-2005 Hartmut Kaiser, Distributed under the Boost",
+        "Copyright (c) 2001-2006 Hartmut Kaiser, 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)",
         0
@@ -274,6 +274,59 @@ namespace {
 ///////////////////////////////////////////////////////////////////////////////
 }   // anonymous namespace
 
+///////////////////////////////////////////////////////////////////////////////
+//  Retrieve the position of a macro definition
+template <typename Context>
+bool
+get_macro_position(Context &ctx, 
+    typename Context::token_type::string_type const& name,
+    typename Context::position_type &pos)
+{
+    bool has_parameters = false;
+    bool is_predefined = false;
+    std::vector<typename Context::token_type> parameters;
+    typename Context::token_sequence_type definition;
+    
+    return ctx.get_macro_definition(name, has_parameters, is_predefined, pos, 
+        parameters, definition);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+//  Generate some meaningful error messages
+template <typename Context>
+void generate_error_message(Context &ctx, boost::wave::cpp_exception const &e)
+{
+    // default error reporting
+    cerr 
+        << e.file_name() << "(" << e.line_no() << "): "
+        << e.description() << endl;
+
+    using boost::wave::preprocess_exception;
+    switch(e.get_errorcode()) {
+    case preprocess_exception::macro_redefinition:
+        {
+            // report the point of the initial macro definition
+            typename Context::position_type pos;
+            if (get_macro_position(ctx, e.get_related_name(), pos)) {
+                cerr 
+                    << pos.get_file() << "(" << pos.get_line() << "): " 
+                    << preprocess_exception::severity_text(e.get_severity())
+                    << ": this is the location of the previous definition." << endl;
+            }
+            else {
+                cerr 
+                    << e.file_name() << "(" << e.line_no() << "): " 
+                    << preprocess_exception::severity_text(e.get_severity())
+                    << ": not able to retrieve the location of the previous definition." << endl;
+            }
+        }
+        break;
+
+    default:
+        break;
+    }
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 //  do the actual preprocessing
 int 
@@ -447,7 +500,7 @@ auto_stop_watch elapsed_time(cerr);
                 ctx.add_include_path((*cit).c_str());
             }
 
-        // if on the command line was given -I- , this has to be propagated
+        // if -I- was goven on the command line, this has to be propagated
             if (ip.seen_separator) 
                 ctx.set_sysinclude_delimiter();
                  
@@ -519,7 +572,7 @@ auto_stop_watch elapsed_time(cerr);
                 return -1;
             }
         }
-        else if (input_is_stdin && vm.count("autooutput")) {
+        else if (!input_is_stdin && vm.count("autooutput")) {
         // generate output in the file <input_base_name>.i
         fs::path out_file (file_name, fs::native);
         std::string basename (out_file.leaf());
@@ -584,9 +637,7 @@ auto_stop_watch elapsed_time(cerr);
             catch (boost::wave::cpp_exception const &e) {
             // some preprocessing error
                 if (boost::wave::is_recoverable(e)) {
-                    cerr 
-                        << e.file_name() << "(" << e.line_no() << "): "
-                        << e.description() << endl;
+                    generate_error_message(ctx, e);
                 }
                 else {
                     throw;      // re-throw for non-recoverable errors
diff --git a/tool/cpp.hpp b/tool/cpp.hpp
index d4970f5..62b3bda 100644
--- a/tool/cpp.hpp
+++ b/tool/cpp.hpp
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/tool/cpp_config.hpp b/tool/cpp_config.hpp
index 57f25ff..f44d076 100644
--- a/tool/cpp_config.hpp
+++ b/tool/cpp_config.hpp
@@ -4,7 +4,7 @@
     
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/tool/cpp_version.hpp b/tool/cpp_version.hpp
index f217081..69ebf41 100644
--- a/tool/cpp_version.hpp
+++ b/tool/cpp_version.hpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/tool/optional_whitespace_eater.hpp b/tool/optional_whitespace_eater.hpp
index 17cc035..13fcfe1 100644
--- a/tool/optional_whitespace_eater.hpp
+++ b/tool/optional_whitespace_eater.hpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/tool/stop_watch.hpp b/tool/stop_watch.hpp
index 94a28d1..90eed1c 100644
--- a/tool/stop_watch.hpp
+++ b/tool/stop_watch.hpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/
diff --git a/tool/trace_macro_expansion.hpp b/tool/trace_macro_expansion.hpp
index 51e55d4..36d0b2d 100644
--- a/tool/trace_macro_expansion.hpp
+++ b/tool/trace_macro_expansion.hpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. 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)
 =============================================================================*/