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 185415ec3..ca8064b64 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 42ab1e790..df5471dc9 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 b42f9d5ff..11dc262c4 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 bab3df94d..ce71c1007 100644
--- a/doc/acknowledgements.html
+++ b/doc/acknowledgements.html
@@ -79,7 +79,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) 
diff --git a/doc/class_reference_context.html b/doc/class_reference_context.html
index 84461d4b8..ccc2309f5 100644
--- a/doc/class_reference_context.html
+++ b/doc/class_reference_context.html
@@ -441,7 +441,7 @@ <h3>Control extended options</h3>
   </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 eca014a01..f571367a2 100644
--- a/doc/class_reference_ctxpolicy.html
+++ b/doc/class_reference_ctxpolicy.html
@@ -324,7 +324,7 @@ <h3>Macro definition </h3>
   </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 fad7301d6..7f2bf92a9 100644
--- a/doc/class_reference_filepos.html
+++ b/doc/class_reference_filepos.html
@@ -109,7 +109,7 @@ <h3><a name="constructors"></a>Constructors</h3>
   </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 f0c62aefa..5f806193b 100644
--- a/doc/class_reference_inptpolcy.html
+++ b/doc/class_reference_inptpolcy.html
@@ -121,7 +121,7 @@ <h3><a name="member_functions"></a>Member Functions</h3>
   </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 95d5464db..5738ad245 100644
--- a/doc/class_reference_lexer.html
+++ b/doc/class_reference_lexer.html
@@ -93,7 +93,7 @@ <h2><a name="member_functions"></a>Member functions</h2>
   </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 d46d90721..1e2f0fbfa 100644
--- a/doc/class_reference_tokentype.html
+++ b/doc/class_reference_tokentype.html
@@ -165,7 +165,7 @@ <h2>Accessor functions</h2>
   </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 e0704d22c..55e4a4b01 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 fee182b3b..509c71372 100644
--- a/doc/introduction.html
+++ b/doc/introduction.html
@@ -82,7 +82,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/macro_expansion_process.html b/doc/macro_expansion_process.html
index 26347f966..9415c5310 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 fe2a8c9e9..73a4e6000 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 aaef36c20..13775d1d0 100644
--- a/doc/preface.html
+++ b/doc/preface.html
@@ -99,7 +99,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/quickstart.html b/doc/quickstart.html
index 01841cf0e..25cfdc0ee 100644
--- a/doc/quickstart.html
+++ b/doc/quickstart.html
@@ -110,7 +110,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/references.html b/doc/references.html
index 8a54b707c..1f37507bc 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 e47405cb7..348994f24 100644
--- a/doc/samples.html
+++ b/doc/samples.html
@@ -99,7 +99,7 @@ <h2 dir="ltr">The  waveidl sample </h2>
   </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 f0a92116c..7eff5c496 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 6f59007f8..9c84bbd77 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 a6d5d8450..29c939cb6 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 bfeb40a28..194100c8c 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 34889efd8..0001f7db8 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 523e01821..1d5b66fb3 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 @@ class context {
     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 8763ad490..f4017eed0 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 @@ class cpp_exception
     }
     ~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 @@ class preprocess_exception :
     {
         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 @@ class preprocess_exception :
     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 a8ebc1660..312ab10c9 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 e52623e75..40937f2fb 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 67fdd213d..4a6b1e09b 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 6edcb2197..fd6c4a495 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 398f21402..15d54c924 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 bfe75dff7..cd787f61b 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 ee59d3189..8828253b5 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 677e94378..c37392d4a 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 3df35d316..251adad20 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 1a43463a1..bf171820f 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 b8696805c..18ff7917b 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 564bfdf3a..f27d9677a 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 d47918014..27fd9b088 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 6c25f4c85..74a2dd877 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 a23312fb5..4a8bf7c94 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 5f02d9629..bd5ee0dd2 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 ee0682422..7491b4d18 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 b5713e1c1..e39d0b1e4 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 809456e95..b7f9c22b5 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 4258de3e9..4394f3ff8 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 6f5b14ba8..38650c9cf 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 f7be15342..034de0516 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 a7b6dae02..24ded36db 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 25c0cb190..507087761 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 8b02d9f5b..e1919f3b5 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 d7dd4ea97..d36dfe08f 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 bad2fc686..3786d0d90 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 f31c65018..6dd14c8e1 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 4463c087e..79175976e 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 de6dec5e8..3d1c1b22a 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 cf183446a..9d0fbc7c3 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 @@ class macromap {
     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 3cfc95b56..6274d87fc 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 d2d5bc6b5..0c94ccb0a 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 6cca39c9c..bf7c3dd68 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 a0afa51ce..91e66bc9c 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 de7ef2520..2af3a2d48 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 a178b99fe..22dc3ff86 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 f3bc417ea..3e44ff579 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 0b3b1ca3b..81b1ad9c4 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 d36a3e985..ef5a66a60 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 52eed8612..19516a62b 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 85b787faa..5e563d656 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 4a9249588..d856eeb9e 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 8f1c6468a..90fcf4505 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 cbaaf255b..dd3ead2cd 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 08b0836c1..c7e223651 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 e512d4d75..8aafb77b2 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 4e911fb43..2bf2761c6 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 cd7fa57e2..55909b0c0 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 48098c25a..6e5157904 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 e63024996..eb0b72b84 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 d8e09df2b..1236b524b 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 e442d5502..fa0b0a5ba 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 a0e8e5ade..8cd384b6e 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 4972cdabe..f4814349b 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 893900e86..09afa3e0d 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 4d1bae4c0..aa943f5a5 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 f155b6847..2f410699c 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 83d463a05..c3aa7fa04 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 90f12785c..a89a4aa8a 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 a63b3e8b3..d46dfeb78 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 50b18dcef..dec606e51 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 a88af6d29..1fcec9eb8 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 4e1f2fc35..6a5d63779 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 1c0d200d4..53773e5b6 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 9efd66dc0..b4834b584 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 a551d37d2..7e16ad9ce 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 66355c464..13eca4304 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 623377417..c991f2541 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 3c877757f..bf4d2e208 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 dedfdb955..6658b2d21 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 624ccc5c9..be97ad577 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 a79b009df..9dc16eff9 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 a097c70ba..661ec96b5 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 1271119ff..85c6b48a0 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 f3115dd98..4bdf88484 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 2300713a2..6cda99e38 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 7ab7f8c1f..559153434 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 dadacee20..47aaa5d4f 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 764659bce..b7ef77e25 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 356e8d84a..1112f8891 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 e235ec4f9..688255602 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 56b3a5214..66d28e877 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 5b7575c1d..ccd646dac 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 a16d96a53..f66d35baf 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 1164c1982..7af2f6336 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 bb302881e..6ad5671f6 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 fe540e8c7..668f4eff3 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 532f35879..15c8bed9f 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 df53012d7..d7466af29 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 b81dfe4c2..7a1bf8e04 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 1585b9eff..4b9ad908a 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 5fa9a494c..1f1bd33ad 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 01e12e2c8..b352fa2e4 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 a0526bf2c..f0dd943d8 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 f7cecd4a0..fe9fee19b 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 829b62790..38da8c17c 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 6fc26b20b..8059ee46e 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 7cc7c2c26..9d650e4ec 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 3555ab84c..0e91ad0cb 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 10be3ede9..65b877a30 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 7d80b5d75..a6ede5e88 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 6744cde54..d3dad1228 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 76a677eda..48f6d0e65 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 85a1542ed..dc0d443bd 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 4669643eb..8df94b2ce 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 4dbc7d84b..cb1ab7e38 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 016558167..d638c2a53 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 6302d4dbb..9ed23bfbe 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 fdb3f6c91..e38efa11a 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 124fc1504..46b69cab0 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 c51b6598f..6a62af528 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 f8dd9e5c0..0aaf26ded 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 76e6f26d2..ac342136b 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 7556bcab4..225d2fcfa 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 0b5374d16..8c2330961 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 23465243e..4c803e790 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 513d17620..e7701c38d 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 d3201cb5d..28747e557 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 ecf144e2e..ccdedc866 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 fb89b0cfa..7739c6c35 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 329824279..89553018a 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 7d1beeb6d..5cc404a57 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 1ca5583cd..3753bacee 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 9864a108d..5f89a70ff 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 7cf3316d4..42b48c9b0 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 9b44cde8b..5d32cf9d1 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 a494c19a5..c215e6b3b 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 c0dac1f98..34b2b89a4 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 69049a663..fe4e8ff0c 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 23c6ac949..ae79440bf 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 01cb179f9..fb5e9f39f 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 c92e363c0..2929ff73d 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 5c7cd7ad0..8208eeb47 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 68929d21c..c774bb2a9 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 56d560ec0..f9b25b669 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 0e486b6c6..1c00128dd 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 4824f9929..d9617a782 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 73d0ff7e3..833ea49d9 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 2b4bc4ebc..3f2d51d6d 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 bc8bf37e8..f1b517499 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 50118de41..53ddea19c 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 abb227dc8..1a6ea4371 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 59011fd81..d51c9a987 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 d4f37fdb3..75336264a 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 1bcba483c..56c2e4e63 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 4c1b8b117..d36051f1e 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 9e852aedd..c2819b4e3 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 c6a1e64a7..e04b081bb 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 7c3187e6e..9cb7a8d5c 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 e4b668459..0f9193a63 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 d72edb988..fb5e34ed3 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 186ace12e..42342ee2a 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 f8063a0e2..db69c00f5 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 53b89af62..29dbccbad 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 74aeacc3b..bddc52df7 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 15850ec00..fd30fba90 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 5dbf82eb7..04796c0b9 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 a2896b5bd..933e59224 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 7329a2918..eba7e2709 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 004e40788..cdbc5cddf 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 76d937823..d30424e18 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 e59ce16c8..4ce9cf5d3 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 4bed9e93f..429295096 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 db58d6431..706e2fb11 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 c01b3ebfc..d6c4fbb7e 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 c78bf491c..84621763e 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 496ffd660..c91e3daa7 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 f8ef41f77..dd4ce1ac2 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 407bcc2c3..fb026b4d2 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 43223b16f..b70ae299a 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 efa5d2ce0..61921b3f1 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 fbba79360..f1d10cea6 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 defe81777..78e56e6f2 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 2de9e7773..fcb0f5221 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 462d9b9d7..94353f32f 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 cbf40932e..2662bda11 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 253ae8e95..ef5862980 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 f157879e9..dbbe6b992 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 0dea3bcb5..d1f1c5064 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 a37e4160d..5f71c531f 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 f81979544..de14c3191 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 47ef57fdd..3ddc6e572 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 c84c54e26..868deccb1 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 b0832c09c..7431d65f8 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 7d0a36172..995d1861d 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 bb3312d13..29abf73bf 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 0a910e246..82c4ae953 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 d1d6f22d8..38b78f138 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 27ca99fcb..1a35af914 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 3e92736fa..14adae0f0 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 aa39b4c22..d296ea97f 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 8b13fe436..d979d3417 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 f1caee184..d32da9c05 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 780a00917..e1bd0f2d2 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 514b58a7b..124675628 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 d6f98c9c2..0f7ba505e 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 6e4a75288..b58634101 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 d7245e9b5..1766cbd85 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 f9d7131e6..0fa36d3d6 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 22d1d25bd..a11a05cc5 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 1e74c9d51..fc18063dc 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 23ed97835..c78028ace 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 b2e387e82..40036cedc 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 dc7706903..0a6b36a03 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 970695638..9434e75ba 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 6bf920cc4..93db570b0 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 d36b09c84..ec915754a 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 ee9efc581..675ad5081 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 a7d516cf2..620813d13 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 2d5b6f44e..a5124d789 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 0b0735ee8..d62e82ba8 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 60d524f8b..a2a5f5811 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 4145e5521..e2beeee0c 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 3ebbb15d0..e71611803 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 483212153..7b21d1a2a 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 8c421d559..50f5b62a3 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 ce58c6671..2f38896f5 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 65f0488df..c6f046058 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 21a946523..cb9f17fb5 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 83fd0fea4..6450185b1 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 c22561f57..b0c7c15d5 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 bdbae19d5..f96c9ce6f 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 077eb6788..0ab8ac31c 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 44c10f26d..0ebe198b7 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 9c6f2377b..7cda61708 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 1843de36b..e8452c095 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 3d03cbee1..43aae4b51 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 2db1c084b..4f595cce5 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 56e874979..5c5f736f2 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 4a57aafc5..93a4af6bf 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 053a8e9bd..d6240c27b 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 a17c38620..32880cfb5 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 9a156cc81..2c12026dc 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 b5d7db344..28aab927b 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 81507f19c..e7a70b6f5 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 bd10bf248..20ce71bc9 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 764a589cc..1327b07f1 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 505462298..f4fcd06a0 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 84ccf3781..3c02dcf61 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 efb840176..91e233868 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 a885737b0..159413947 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 6f48ce65c..d0776b534 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 895c9e8bd..676095e11 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 6efe153f3..b993d52ce 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 b664d5f85..f348c0a60 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 0e01482d2..13322f481 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 5201d358e..0c3591a24 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 e758fcfbc..1b6c337a9 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 e7aca5a00..e5fe4d764 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 470f169b2..89612141e 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 579f7e9cc..a03e3f782 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 ab4f98320..62d490b81 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 eee6f22eb..8d10f88bd 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 8ad50de7c..f49cb94b7 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 5a5fa682c..3a7643745 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 43b2c5084..6f4581c61 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 bdad6d007..8c9c29af1 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 fb9ef51de..28069a6c1 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 1bdcdf0b2..e9a69466d 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 51997ece4..20d376503 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 1ca3c1ba8..6ce347533 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 07f2d3458..ab955c7e6 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 2114a0eb4..e97f5caf1 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 5349400c7..235373727 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 96f9ac348..0b81717a1 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 3c5b3fb8d..d8d43026a 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 2f72e7484..6e5917b2b 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 45ebf58b1..4cfe297f1 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 96e48baaf..e10f5d89c 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 7355d20be..880b86a27 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 5bc4c1acb..bde8234c3 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 30be6bcfa..990d9990c 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 0542a6d26..49b5d61b7 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 f0462ea47..c72b1063a 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 e5fd6d2ab..a211f412a 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 6dbaf7e96..d5d516fd4 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 38a8731d7..4ca7658fd 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 501727b9b..58c0f9408 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 6f5cdee28..20ec34206 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 033451180..6bc530b32 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 185a0116b..b2f104a43 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 f78b030c3..6866952b1 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 f05775ae6..b365293bd 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 375471ac3..38706fc83 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 f0d073e5f..8e3a18b77 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 696312a1f..1fc902339 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 4fe962c0c..d3a4cc77e 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 d2bc45abe..d17de8f72 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 2f2ba10f3..a8cc47fab 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 febc0f293..fd59ae2e3 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 0e3d7ed84..0c7fded7f 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 6d24e14cc..69606b78e 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 323a47f73..cb22531ea 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 dedee61e8..1ff38482c 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 a922fd975..ee0b1d0dc 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 f8f3219aa..11a117b37 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 a82342c77..404993bc5 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 e0ae09666..340c10a44 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 c1f1c46c3..e5563ecdf 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 5f9fe1d45..fa32fde7d 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 6c1520693..3d44980a0 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 6305c491f..f550ac27f 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 5724d4e57..06a927bd9 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 7db06e77a..6119bf1af 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 da6a15e10..64884c912 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 6af58ef65..79876c136 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 8b9ceb83d..7ecc7c178 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 8d7dbb38d..60f6baa8b 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 5098c5132..79ebcc8e9 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 53723db7f..2785fa473 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 4c21295a0..6d190e436 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 cd1429ee3..047ed7d39 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 7df479704..739fb6874 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 d4970f549..62b3bda51 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 57f25ff24..f44d076fb 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 f217081a4..69ebf413d 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 17cc0351e..13fcfe1e1 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 94a28d15f..90eed1cb8 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 51e55d46e..36d0b2d5d 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)
 =============================================================================*/