diff --git a/ChangeLog b/ChangeLog
index 76d4558..b895a21 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,124 +7,134 @@ LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 -------------------------------------------------------------------------------
 
 TODO (known issues):
-- Fix expansion of macros, which replacement-list terminates in a partial 
+- Fix expansion of macros, which replacement-list terminates in a partial
   macro expansion.
-- Fix the re2c lexer for iterators others then string::iterator (or more 
+- Fix the re2c lexer for iterators others then string::iterator (or more
   generally for iterators, which aren't random access iterators)
 - Try to remove the second parameter from the pp_iterator<>::force_include
   function.
-- Fix the trigraph backslash problem in the re2c (C/C++ and IDL) scanners, if 
+- Fix the trigraph backslash problem in the re2c (C/C++ and IDL) scanners, if
   there is the end of the (internal) buffer just in between a '??/' and a '\n'.
 
 -------------------------------------------------------------------------------
 
 CHANGELOG
 
+Boost V1.50.0
+ - V2.3.2
+ - Fixed #6758: not all members are initialized by base_iteration_context
+   constructor.
+ - Fixed #6838: Adding include file with force_include makes Wave fail to emit
+   #line directive
+ - Added support for test of --forceinclude option to testwave executable,
+   added test case verifying #6838 is fixed.
+ - Fixed #6870: build wave driver failed
+
 Boost V1.48.0
  - V2.3.1
  - Added the flag support_option_emit_contnewlines allowing to control whether
    backslash newline sequences are emitted by the Wave library. The default is
-   as before: these tokens will be silently ignored (after the token positions 
+   as before: these tokens will be silently ignored (after the token positions
    have been properly updated). Note: this option is supported by the SLex lexer
    module only.
  - Fixed #5887: flex_string.hpp needs to include <ios>
 
 Boost V1.47.0
 - V2.3.0
-- After preprocessing the body of any #pragma wave option() the wave tool now 
+- After preprocessing the body of any #pragma wave option() the wave tool now
   concatenates all adjacent string literals into a single string literal.
-- Fixed whitespace handling, added a corresponding set of test cases 
+- Fixed whitespace handling, added a corresponding set of test cases
   (t_9_020.cpp)
 - Added a new preprocessing hook: locate_include_file allowing to customize the
   way include files are located.
-- Added new command line option --noexpand/-N to the Wave driver allowing to 
-  suppress macro expansion for a given macro name (works for both, object like 
-  and function like macros). This option has to be used very carefully as it 
+- Added new command line option --noexpand/-N to the Wave driver allowing to
+  suppress macro expansion for a given macro name (works for both, object like
+  and function like macros). This option has to be used very carefully as it
   not only leaves the whole macro invocation untouched in the generated output
-  but also removes this macro from consideration for Wave itself. This can 
-  cause unexpected results if the suppressed macro would influence #ifdef's 
+  but also removes this macro from consideration for Wave itself. This can
+  cause unexpected results if the suppressed macro would influence #ifdef's
   later on.
-- Fixed problem #5554: wave slex parser eof without eol skips the last line.
+- Fixed Wave driver to retain all macros defined on the command line in
   interactive mode.
 - Fixed #5569: slex CONTLINE token works only for LF line endings
 
 Boost V1.46.0
 - V2.2.0
 - Added recognition of C++0x keywords to Re2C lexers.
-- Added --c++0x command line option to Wave to enabling the recognition of 
+- Added --c++0x command line option to Wave to enabling the recognition of
   C++0x keywords, converting those to C++0x tokens.
-- Adapted all of the library to play well with Boost.Filesystem V3 (which is 
+- Adapted all of the library to play well with Boost.Filesystem V3 (which is
   the default from now on).
 - Added support for extended character and string literals, added test case
   (which required to add C++0x support to the test application).
-- Added proper predefined macros fro --c++0x mode. __cplusplus is currently 
+- Added proper predefined macros fro --c++0x mode. __cplusplus is currently
   defined to 201101L, but this will change when the Standard is finalized.
-- Fixed a problem with object like macros, which when being adjacent to a 
+- Fixed a problem with object like macros, which when being adjacent to a
   parenthesis, caused the parenthesis to disappear when the macro expansion
   was suppressed by the expanding_object_like_macro() hook function.
-- Fixed a bug in pragma option(preserve), missing to set to preserve=1 if 
+- Fixed a bug in pragma option(preserve), missing to set to preserve=1 if
   after the previous value was preserve=2.
-- Changed the --preserve option of the wave tool to interprete the integer 
-  argument in a slightly different way: 
-      0: no whitespace is preserved, 
-      1: only begin of line whitespace is preserved, 
-      2: only begin of line whitespace and comments are preserved, 
+- Changed the --preserve option of the wave tool to interprete the integer
+  argument in a slightly different way:
+      0: no whitespace is preserved,
+      1: only begin of line whitespace is preserved,
+      2: only begin of line whitespace and comments are preserved,
       3: all whitespace is preserved
-  The #pragma wave option(preserve) now supports these arguments: 
+  The #pragma wave option(preserve) now supports these arguments:
   [0|1|2|3|push|pop].
 
 Boost V1.45.0
 - V2.1.0
-- Token pasting is well formed only as long as the formed token(s) are 
-  pp_tokens as defined by the C++0x Standard. Until now, Wave allowed for 
-  non-pp_tokens to be formed in --variadics mode. 
-- Fixed a problem, which prevented reporting /##/ in a macro definition as 
+- Token pasting is well formed only as long as the formed token(s) are
+  pp_tokens as defined by the C++0x Standard. Until now, Wave allowed for
+  non-pp_tokens to be formed in --variadics mode.
+- Fixed a problem, which prevented reporting /##/ in a macro definition as
   invalid token pasting.
 - Fixed problem preventing the skipped_token hook to be called for 'inactive'
   conditional preprocessing directive tokens. Improved overall consistency in
   reporting skipped tokens to the hooks function when processing conditional
   preprocessing directives. Added a new test case verifying the skipped_token
   hook gets called reproducibly (t_2_020.cpp).
-- Fixed a problem with the pp hooks 'expanding_object_like_macro' and 
+- Fixed a problem with the pp hooks 'expanding_object_like_macro' and
   'expanding_function_like_macro', which when returning true were stopping all
   preprocessing instead of just inhibiting the expansion of the macro.
-- Fixed a duplicated call to the pp hook skipped_token for preprocessing 
+- Fixed a duplicated call to the pp hook skipped_token for preprocessing
   directives inside inactive conditional branches.
 - Changing exception handling to fix clang++ regression errors.
 - Replaced assert() with BOOST_ASSERT to pacify the Boost inspect tool.
 
 Boost V1.44.0
 - V2.0.6
-- Added information about the file type to iteration context. This can be 
-  either main_file, system_header, or user_header depending whether the handled 
-  file is the main file to preprocess, a include file opened from `#include <>`, 
-  or a include file opened from `#include ""`. 
-- Added support for new Boost visibility macros. Properly exported all 
+- Added information about the file type to iteration context. This can be
+  either main_file, system_header, or user_header depending whether the handled
+  file is the main file to preprocess, a include file opened from `#include <>`,
+  or a include file opened from `#include ""`.
+- Added support for new Boost visibility macros. Properly exported all
   exceptions, etc.
 
 Boost V1.43.0
 - V2.0.5
 - Fixed the wave driver application to strip leading and trailing whitespace
   from macro names specified on the command line using -U.
-- Fixed line number counting for lines containing nothing but whitespace 
+- Fixed line number counting for lines containing nothing but whitespace
   followed by a C++ comment if the next line is a pp directive.
 - Fixed emitting of a #line directive after returned from an include file.
-- A couple of fixes allowing to properly report the current line number in 
+- A couple of fixes allowing to properly report the current line number in
   #line directives for different whitespace preserve modes (see --preserve/-p).
-- Added new preprocessing hook: emit_line_directive, allowing to customize the 
+- Added new preprocessing hook: emit_line_directive, allowing to customize the
   format of the generated #line directive.
-- Changed --line/-l command line option of the wave driver application to 
-  accept 0, 1, and 2 as options. The option values 0 and 1 behave as before 
+- Changed --line/-l command line option of the wave driver application to
+  accept 0, 1, and 2 as options. The option values 0 and 1 behave as before
   (disable/enable the generation of #line directives), while the option value 2
   will generate the #line directive using the relative filename (instead of the
   absolute filename emitted from option 1). The default option is value 1.
-- Added new example: emit_custom_line_directives, demonstrating the use of the 
+- Added new example: emit_custom_line_directives, demonstrating the use of the
   new preprocessing hook.
-- Added new preprocessing hook: found_unknown_directive, which is being invoked 
-  whenever an unknown preprocessor directive (i.e. '#' followed by some 
-  identifier) is detected. It allows to interpret the directive and to provide 
+- Added new preprocessing hook: found_unknown_directive, which is being invoked
+  whenever an unknown preprocessor directive (i.e. '#' followed by some
+  identifier) is detected. It allows to interpret the directive and to provide
   some replacement text.
-- Added new example: custom_directives demonstrating the usage of the new 
+- Added new example: custom_directives demonstrating the usage of the new
   preprocessing hook.
 - Fixed #4113: cpp_lexer does not handle qualified backslashes correctly.
 - Fixed #3106: wave on VS2010 beta compiler generates error.
@@ -136,31 +146,31 @@ Boost V1.42.0
 Boost V1.41.0
 - V2.0.3
 - Switched to Re2C V0.13.5
-- Fixed --list_includes/-l command line option of the wave driver tool to 
+- Fixed --list_includes/-l command line option of the wave driver tool to
   correctly indent the generated list of included files.
 - Finally fixed all remaining examples. Everything seems to work fine now.
 - Specifying a custom token type now works as expected. The new lexer interface
   introduced in V2.0 broke this part.
-- Removed old code related to pre Boost V1.31 (related to V1 of iterator 
+- Removed old code related to pre Boost V1.31 (related to V1 of iterator
   library).
 - Added a new commandline option --macrocounts/-c to the Wave driver application
-  which lists all macro invocation counts to an optionally specified file 
+  which lists all macro invocation counts to an optionally specified file
   (default is cout).
 - Fixed compilation problems caused by recent changes to the multi_pass iterator
   from Spirit V2.1.
-- Added the new preprocessing hooks detected_pragma_once() and 
-  detected_include_guard() which are getting called whenever either a #pragma 
-  once has been detected or if the include guard heuristics detected an 
+- Added the new preprocessing hooks detected_pragma_once() and
+  detected_include_guard() which are getting called whenever either a #pragma
+  once has been detected or if the include guard heuristics detected an
   include guard for a particular include file.
-- Added a new command line option to the wave driver tool: --listguards/-g 
-  allowing to trace all include files which are either contain a #pragma once 
+- Added a new command line option to the wave driver tool: --listguards/-g
+  allowing to trace all include files which are either contain a #pragma once
   or contain include guards.
-- Started to elminate g++ struct aliasing warnings (more to fix, mostly in 
+- Started to elminate g++ struct aliasing warnings (more to fix, mostly in
   flex_string).
 
 Boost V1.40.0
 - V2.0.2
-- Fixed a long standing race condition inhibiting to use Wave in multi threaded 
+- Fixed a long standing race condition inhibiting to use Wave in multi threaded
   environments.
 - Incorporated the changes from latest version of the flex_string class (#2946).
 - Fixed another race condition triggering problems using Wave in multi-threaded
@@ -168,41 +178,41 @@ Boost V1.40.0
 
 Boost V1.39.0
 - V2.0.1
-- Fixed Wave to compile with BOOST_FILESYSTEM_NO_DEPRECATED defined (i.e. the 
+- Fixed Wave to compile with BOOST_FILESYSTEM_NO_DEPRECATED defined (i.e. the
   library doesn't use the deprecated filesystem interface anymore).
 
 Boost V1.37.0
-- Updated examples to reflect the recent changes in the used multi_pass 
+- Updated examples to reflect the recent changes in the used multi_pass
   iterator.
-- Fixed documentation links still pointing to the old Boost CVS (thanks to 
+- Fixed documentation links still pointing to the old Boost CVS (thanks to
   Jürgen Hunold for providing the patch).
 
 Boost V1.36.0
-- Wave Version 2.0 is a new major release introducing some breaking API changes, 
-  preventing it to be used with Boost versions earlier than V1.36.0. The API 
-  and hook interface have been streamlined for more consistency. See the 
+- Wave Version 2.0 is a new major release introducing some breaking API changes,
+  preventing it to be used with Boost versions earlier than V1.36.0. The API
+  and hook interface have been streamlined for more consistency. See the
   documentation for more details.
 
-- Added an additional template parameter to the context object, allowing to 
+- Added an additional template parameter to the context object, allowing to
   specify any possibly derived type. This change propagates to the preprocessing
-  hooks, which now get passed the most derived context type as its first 
+  hooks, which now get passed the most derived context type as its first
   argument allowing to access protected members in the original context type.
   This fixes ticket #1752.
-- Fixed a problem during parsing of #pragma wave directive, where the value 
+- Fixed a problem during parsing of #pragma wave directive, where the value
   sequence contained a closing parenthesis. This caused a premature end of the
   pragma value parsing.
-- Fixed handling of support_option_single_line, which was ignored under certain 
+- Fixed handling of support_option_single_line, which was ignored under certain
   circumstances.
-- Fixed ticket #1766: Wrong evaluation of conditional preprocessor directives 
-  with predefined macros __FILE__, __LINE__ and __INCLUDE_LEVEL__. This bug 
-  triggered an error in constructs like #ifndef __FILE__. Thanks to Daniel 
+- Fixed ticket #1766: Wrong evaluation of conditional preprocessor directives
+  with predefined macros __FILE__, __LINE__ and __INCLUDE_LEVEL__. This bug
+  triggered an error in constructs like #ifndef __FILE__. Thanks to Daniel
   Wadehn for reporting and supplying a patch. Added corresponding regression
   test: t_2_018.cpp.
 - Fixed a bug which reported a valid macro redefinition as invalid if the macro
   replacement text referred to a second or higher parameter of this macro.
-- Fixed a problem in the wave tool to allow two errors to occur while 
+- Fixed a problem in the wave tool to allow two errors to occur while
   preprocessing two consecutive tokens.
-- Adjusted Spirit header includes to point to conform to the new directory 
+- Adjusted Spirit header includes to point to conform to the new directory
   structure, removed support for Spirit versions earlier than V1.7.
 - Started to migrate to new multi_pass iterators from Spirit V2.0.
 
@@ -211,75 +221,75 @@ Boost V1.35.0
 - Changed the return value of the 'evaluated_conditional_expression()' pp hook
   to 'bool' allowing to force Wave to re-evaluate the current conditional
   expression. This was suggested by Felipe Magno de Almeida.
-- Added a wave::context object as first parameter to all pp hook functions. 
-  This is an interface compatibility breaking change. The new pp-hooks can be 
-  disabled by defining the BOOST_WAVE_USE_DEPRECIATED_PREPROCESSING_HOOKS 
-  compile time constant to something not equal to zero. By default this 
+- Added a wave::context object as first parameter to all pp hook functions.
+  This is an interface compatibility breaking change. The new pp-hooks can be
+  disabled by defining the BOOST_WAVE_USE_DEPRECIATED_PREPROCESSING_HOOKS
+  compile time constant to something not equal to zero. By default this
   constant will be defined to zero for Boost V1.35.0 and newer, switching to
   the new interface by default.
 - Added optional support for the import keyword (needed for the C++ module
-  proposal). The identifier import will be recognized as a keyword, if 
-  the compile time constant BOOST_WAVE_SUPPORT_IMPORT_KEYWORD is defined to 
+  proposal). The identifier import will be recognized as a keyword, if
+  the compile time constant BOOST_WAVE_SUPPORT_IMPORT_KEYWORD is defined to
   something not equal zero.
-- Added new preprocessing hook functions: found_error_directive() and 
+- Added new preprocessing hook functions: found_error_directive() and
   found_warning_directive() to be called when #error/#warning directives are
   encountered. This was suggested by Andreas Sæbjørnsen.
 - Added a new sample to Wave: hannibal, a partial C++ parser implementation
   initially written by Danny Havenith (http://havenith-verlinden.nl/hannibal/)
   who agreed to add this here. Thanks!
-- Added new preprocessing hook function: found_line_directive() to be called 
+- Added new preprocessing hook function: found_line_directive() to be called
   when a #line directive is encountered. This was suggested by Andreas
   Sæbjørnsen.
 - Improved command line handling for the wave applet.
-- Incorporated latest bug fixes for the Hannibal sample provided by Danny 
-  Havenith. 
-- Added loading of a wave.cfg file from anywhere up the filesystem hierarchy 
-  starting from the main input file for the wave driver applet up to the 
+- Incorporated latest bug fixes for the Hannibal sample provided by Danny
+  Havenith.
+- Added loading of a wave.cfg file from anywhere up the filesystem hierarchy
+  starting from the main input file for the wave driver applet up to the
   root of the file system.
 - Added support_option_emit_pragma_directive to allow to control at runtime,
-  whether unknown #pragma directives should be emitted or not. To maintain 
+  whether unknown #pragma directives should be emitted or not. To maintain
   compatibility with earlier versions this option is by default on if the
-  compile time constant BOOST_WAVE_EMIT_PRAGMA_DIRECTIVES was defined to 
+  compile time constant BOOST_WAVE_EMIT_PRAGMA_DIRECTIVES was defined to
   be not equal to zero and it is off otherwise.
 - Enabled XML serialization support.
-- Added the throw_exception preprocessing hook, which gets called for every 
+- Added the throw_exception preprocessing hook, which gets called for every
   occurring error (whenever an exception would have been thrown). The default
-  of this new hook function is to throw the corresponding exception, which 
+  of this new hook function is to throw the corresponding exception, which
   reproduces the old behavior.
 - Implemented a new preprocessing hook: generated_token(), which get's called
   whenever a token is about to be returned form the library. This function may
-  be used to alter the token before it gets returned to the calling 
+  be used to alter the token before it gets returned to the calling
   application.
 - Added a new sample 'real_positions' demonstrating the new generated_token()
-  preprocessing hook and showing how to use Wave with a new token type without 
+  preprocessing hook and showing how to use Wave with a new token type without
   using a new lexer type.
-- Factored out the pure lex_input_interface to simplify writing different lexer 
+- Factored out the pure lex_input_interface to simplify writing different lexer
   types for Wave.
-- Added the token_statistics sample showing how to use Xpressive to build a 
+- Added the token_statistics sample showing how to use Xpressive to build a
   lexer for Wave.
-- Changed the list_includes sample to use a lexer which is based on the lexertl 
+- Changed the list_includes sample to use a lexer which is based on the lexertl
   library written by Ben Hanson (http://www.benhanson.net/lexertl.html).
-- Added a new support_option: insert_whitespace, allowing to switch off 
+- Added a new support_option: insert_whitespace, allowing to switch off
   whitespace insertion which is normally (by default) in place to disambiugate
   C++ tokens, which would otherwise form different tokens in the output.
 - Added a new commandline option to the Wave applet: --disambiguate, allowing
-  to control whitespace insertion. The default value for this option is 
+  to control whitespace insertion. The default value for this option is
   --disambiguate=1, resembling the previous behaviour. Specifying the option
   --disambiguate=0 allows to suppress whitespace insertion alltogether.
-- Added pragma option values push and pop to the line, preserve and output 
+- Added pragma option values push and pop to the line, preserve and output
   options allowing to store and restore the current option. The syntax is:
     #pragma wave options(<option>: push) and
     #pragma wave options(<option>: pop)
-  where <option> may be line, preserve or output. Thanks to Eric Niebler for 
+  where <option> may be line, preserve or output. Thanks to Eric Niebler for
   suggesting this feature.
-- Added the possibility to use static pre-compiled DFA tables for the lexertl 
+- Added the possibility to use static pre-compiled DFA tables for the lexertl
   based lexer.
-- Incorporated the changes from Andrei's latest version of the flex_string 
+- Incorporated the changes from Andrei's latest version of the flex_string
   class.
-- Added the is_macro_defined(name) function to the context object as described 
-  in the documentation. This function is usable with any string type compatible 
+- Added the is_macro_defined(name) function to the context object as described
+  in the documentation. This function is usable with any string type compatible
   with std::string.
-- Changed behavior of the --force_include functionality, which now looks for 
+- Changed behavior of the --force_include functionality, which now looks for
   the file to be (force-)included in the current directory first.
 - Switched to Re2C V0.11.2
 - Added const specifiers to some of the context member functions.
@@ -287,95 +297,95 @@ Boost V1.35.0
 - Fixed a runtime problem in the Re2C generated lexers when feeded with
   empty input files (thanks to Leo Davis for reporting and providing a patch).
 - Added the is_eoi() function to token classes, returning true if the token
-  has been initialized to be the end of input token (T_EOI) (thanks to Ovanes 
+  has been initialized to be the end of input token (T_EOI) (thanks to Ovanes
   Markarian for suggesting this).
 - Added missing #includes <cstring>, <cstdlib>, and <new> to flex_string.hpp.
 - Added missing #include <climits> to cpp_chlit_grammar.hpp.
-- Changed found_include_directive hook function to return a bool indicating, 
-  whether the file should be included (true) or skipped (false). Thanks to 
+- Changed found_include_directive hook function to return a bool indicating,
+  whether the file should be included (true) or skipped (false). Thanks to
   Felipe Magno de Almeida for suggesting this feature.
 - Added code to the wave driver applet ignoring a #import directive (the whole
-  directive is passed through to the output) whenever the pp constant 
+  directive is passed through to the output) whenever the pp constant
   BOOST_WAVE_SUPPORT_MS_EXTENSIONS is defined to something not equal to zero.
 - Fixed the wave driver applet to correctly continue after a error or warning.
-- Added a macro introspection facility allowing to iterate on all defined macro 
+- Added a macro introspection facility allowing to iterate on all defined macro
   names.
 - Added a new commandline option --macronames/-m to the Wave driver application
-  which lists all defined macros and their definitions to an optionally 
+  which lists all defined macros and their definitions to an optionally
   specified file (default is cout).
 - Fixed configuration to take into account thread related build settings.
 - Added the BOOST_WAVE_SUPPORT_LONGLONG_INTEGER_LITERALS pp constant allowing
-  to recognize large integer literals (larger in size than long/unsigned long) 
-  even if these do not have a 'll' suffix. This pp constant is effective only, 
-  if the target platform supports long long integers (BOOST_HAS_LONG_LONG is 
+  to recognize large integer literals (larger in size than long/unsigned long)
+  even if these do not have a 'll' suffix. This pp constant is effective only,
+  if the target platform supports long long integers (BOOST_HAS_LONG_LONG is
   defined).
-- The following preprocessing hooks now return a boolean value, which when 
-  returning 'true' cause the Wave library to skip the execution of the related 
+- The following preprocessing hooks now return a boolean value, which when
+  returning 'true' cause the Wave library to skip the execution of the related
   preprocessing action:
     . found_directive: allows to skip the whole directive it is called for
     . expanding_object_like_macro: allows to skip expansion of the given object
         like macro, the macro symbol is copied to the output
     . expanding_function_like_macro: allows to skip the expansion of the given
-        function like macro, the whole macro invocation (including all 
-        macro invocation parameters) are copied to the output without any 
+        function like macro, the whole macro invocation (including all
+        macro invocation parameters) are copied to the output without any
         further processing.
-- Changed the interpretation of the return value of the found_include_directive 
-  preprocessing hook: a return value of 'false' now processes the file 
-  to be included normally and a return value of 'true' now skips the processing 
-  of the include file directive (the file doesn't get included). 
-  This change was necessary to make the return values of the preprocessing 
-  hooks consistent. Now return 'false' generally means: normal execution and 
-  return 'true' generally means: skip execution of the corresponding 
+- Changed the interpretation of the return value of the found_include_directive
+  preprocessing hook: a return value of 'false' now processes the file
+  to be included normally and a return value of 'true' now skips the processing
+  of the include file directive (the file doesn't get included).
+  This change was necessary to make the return values of the preprocessing
+  hooks consistent. Now return 'false' generally means: normal execution and
+  return 'true' generally means: skip execution of the corresponding
   preprocessor action.
-- Fixed compilation problems on gcc, fixed ambiguity with boost code (detail 
+- Fixed compilation problems on gcc, fixed ambiguity with boost code (detail
   namespace was ambigious).
 - Fixed predefined macro support to be thread safe.
-- Added missing file to real_positions example. Thanks to Ludovic Aubert for 
+- Added missing file to real_positions example. Thanks to Ludovic Aubert for
   spotting the problem.
-- Unterminated C++/C comment diagnostics are now a warning and not an error 
+- Unterminated C++/C comment diagnostics are now a warning and not an error
   anymore.
-- Applied patch provided by Jens Seidel making sure every header compiles on 
+- Applied patch provided by Jens Seidel making sure every header compiles on
   its own.
 - Updates to the documentation.
 - Fixed a problem in flex_string::compare() (#include_next was non-functional).
 - Fixed a bug in the pp hook expanding_function_like_macro(), where the seqend
   parameter was set to the first token after the closing parenthesis instead of
   pointing at it.
-- Added the BOOST_WAVE_SUPPORT_THREADING allowing to explicitely control 
-  whether the Wave library is built with threading support enabled. If not 
+- Added the BOOST_WAVE_SUPPORT_THREADING allowing to explicitely control
+  whether the Wave library is built with threading support enabled. If not
   defined the build settings will be picked up from the Boost build environment
   (BOOST_HAS_THREADS).
-- Fixed a whitespace insertion glitch, where whitespace got inserted 
+- Fixed a whitespace insertion glitch, where whitespace got inserted
   unconditionally between two operators even if one of these was a comma.
-- Fixed #line directive after a macro invocation containing newlines to 
+- Fixed #line directive after a macro invocation containing newlines to
   correctly reference the line number.
-- Positions of macros defined on the command line now get properly reported as 
+- Positions of macros defined on the command line now get properly reported as
   "<command line>":1:...
 - Added testing of the preprocessor hooks.
 
 Boost V1.34.0
 - Wave Version 1.2.4
-- Added the possibility to explicitly enable/disable the generation of #line 
-  directives. Added a corresponding commandline argument to the Wave driver 
+- Added the possibility to explicitly enable/disable the generation of #line
+  directives. Added a corresponding commandline argument to the Wave driver
   tool (--line/-L) which takes either 0 or 1 as its parameter.
-- Added support for #pragma wave option(command: value) directives, which 
+- Added support for #pragma wave option(command: value) directives, which
   supports the following commands:
-   . #pragma wave option(line: [0|1])  
+   . #pragma wave option(line: [0|1])
         Enable/disable generation of #line directives
-   . #pragma wave option(preserve: [0|1|2])  
+   . #pragma wave option(preserve: [0|1|2])
         Control whitespace preservation
    . #pragma wave option(output: ["filename" | null | default])
         Redirect output to the given file (or no output, if 'null' is specified,
-        or output to the file as given on the command line, if 'default' is 
+        or output to the file as given on the command line, if 'default' is
         specified).
         The filename is resolved relative to the directory of the processed
         file.
   These new #pragma directives are implemented in the Wave driver tool only.
   It is possible to combine several options in one #pragma directive, i.e.
   #pragma wave option(line: 0, preserve: 2).
-- Changed the signature of the may_skip_whitespace() preprocessing hook to 
+- Changed the signature of the may_skip_whitespace() preprocessing hook to
   additionally take the preprocessing context as its first parameter.
-- Added the possibility to the Wave tool to disable initial output by 
+- Added the possibility to the Wave tool to disable initial output by
   specifying a '-' as the output file. This is useful for syntax checks only or
   in conjunction with the #pragma wave option(output: ...) to restrict the
   generated output.
@@ -383,27 +393,27 @@ Boost V1.34.0
 - Switched to Re2C V0.10.0
 - Fixed some of the VC7.1 /W4 warnings.
 - The Wave tool now creates the directory hierarchy of output files as needed.
-- Applied some optimization, which causes skipping of the parsing for almost 
+- Applied some optimization, which causes skipping of the parsing for almost
   all preprocessor directives when the if block status is false. This gains
   upto 10-20% in speed for average applications.
-- Added error diagnostic for #elif without matching #if, which was missing 
+- Added error diagnostic for #elif without matching #if, which was missing
   under certain circumstances.
 - Avoided the evaluation of #elif expressions if one of the previous #if/#elif
   blocks of the same level was true. This gains upto another 5% of speed for
   average applications.
 - The MS specific integer suffix 'i64' is now correctly supported by the Re2C
-  and SLex lexer components (only when BOOST_WAVE_SUPPORT_MS_EXTENSIONS is 
+  and SLex lexer components (only when BOOST_WAVE_SUPPORT_MS_EXTENSIONS is
   defined during compilation).
 - Changed the Wave tool to print the column number of an error/warning along
   with the line number. The new format is: 'filename:line:column: error text'.
-- It is now possible to recover from the unbalanced #if/#endif statement 
+- It is now possible to recover from the unbalanced #if/#endif statement
   warning in a proper way.
 - The Wave library now automaticaly recognizes include guards in headers files
   and uses this information to avoid opening these header files more than once.
   This speeds up things by upto 10-20% depending on the concrete include files.
-- Fixed the failing test t_6_023.cpp. Error reporting for illformed #else 
+- Fixed the failing test t_6_023.cpp. Error reporting for illformed #else
   directives was broken (because of some recent changes).
-- Fixed the failing test t_5_007.cpp. This was caused by the automatic include 
+- Fixed the failing test t_5_007.cpp. This was caused by the automatic include
   guard detection, which prevented the second inclusion of the specified
   include file the test was relying on.
 - Added the possibility to switch off the automatic include guard detection.
@@ -413,16 +423,16 @@ Boost V1.34.0
   after its include guard symbol gets undefined.
 - Added the generating platform to Wave's full version string.
 - Made the Wave tool fully interactive when started with input from stdin and
-  and output to stdout. In this mode the Wave tool preprocesses the input 
+  and output to stdout. In this mode the Wave tool preprocesses the input
   line by line and not only after receiving the full input as normally.
-- Added serialization support for the wave::context object, which stores 
+- Added serialization support for the wave::context object, which stores
   all information about defined macros and all #pragma once header information.
-- Added the command line option --state (-s) to the Wave tool, which tries to 
-  load the serialized information from the file given as the argument to 
-  --state and save the state information at the end to the same file. 
-  This option is available in interactive mode only. 
-- Added possibility to verify the compatibility of the configuration used 
-  during compilation of the Wave library with the config info used for the 
+- Added the command line option --state (-s) to the Wave tool, which tries to
+  load the serialized information from the file given as the argument to
+  --state and save the state information at the end to the same file.
+  This option is available in interactive mode only.
+- Added possibility to verify the compatibility of the configuration used
+  during compilation of the Wave library with the config info used for the
   application. Added a corresponding test to the Wave tool.
 - Added a new predefined macro __WAVE_CONFIG__ which expands to an integer
   literal containg the configuration information the library was compiled
@@ -430,84 +440,84 @@ Boost V1.34.0
 - Added proper versioning support to the serialization of state.
 - Fixed the macro tracing information to contain the column numbers of the macro
   definitions as well (the format used is the same as for error messages).
-- Fixed a memory leak in the flex_string copy on write code (thanks to Tobias 
+- Fixed a memory leak in the flex_string copy on write code (thanks to Tobias
   Schwinger for reporting this bug).
 - Fixed a memory corruption bug in the Re2C scanner buffer management code
   (thanks to Andreas Sæbjørnsen for spotting the bug).
-- Fixed a major performance bottleneck in the lex_token class. This speeds up 
-  Wave for upto another 20-40% depending on the amount of macro expansions to 
+- Fixed a major performance bottleneck in the lex_token class. This speeds up
+  Wave for upto another 20-40% depending on the amount of macro expansions to
   perform.
 - Added the BOOST_SPIRIT_USE_BOOST_ALLOCATOR_FOR_TREES and the
-  BOOST_SPIRIT_USE_LIST_FOR_TREES Spirit configration constants to the 
+  BOOST_SPIRIT_USE_LIST_FOR_TREES Spirit configration constants to the
   wave_config.hpp to allow to fine tune the generated Spirit tree code. VC7.1
   gives best results when both are defined.
 - Fixed a memory corruption bug triggered by a possible dangling reference.
 - Fixed Wave tools startup crash when compiled with VC8.
-- Added the name of the generating compiler (BOOST_COMPILER) to the full 
+- Added the name of the generating compiler (BOOST_COMPILER) to the full
   Wave version info.
 - Fixed all Jamfile.v2 to correctly disable RTTI for VC7.1.
 - Added #pragma message("...") to be optionally supported by the Wave library.
   This may be enabled by defining the BOOST_WAVE_SUPPORT_PRAGMA_MESSAGE pp
   constant to some value different from zero.
-- Fixed a couple of typos in the file cpp.cpp preventing it to compile on 
+- Fixed a couple of typos in the file cpp.cpp preventing it to compile on
   gcc 4.1.0 (thanks to Richard Guenther for reporting these).
 - Richard Guenther fixed another buffer overrun problem in the Re2C scanner.
 - Fixed Jamfile.v2 files for all sample applications.
 - Fixed a bug which lead to reporting of an illegal preprocessing directive
   inside not-evaluated conditional blocks under certain circumstances (thanks
   to Tobias Schwinger for reporting).
-- Fixed '#define true ...', '#define false ...' and other constructs, i.e. the 
+- Fixed '#define true ...', '#define false ...' and other constructs, i.e. the
   usage of the boolean keywords as identifiers during the preprocessing. Added
   a corresponding test case (t_9_017.cpp). Thanks to Andreas Sæbjørnsen for
   reporting.
-- Corrected the Jamfile[.v2] of the waveidl sample to refer to correct file 
+- Corrected the Jamfile[.v2] of the waveidl sample to refer to correct file
   names (thanks to Juergen Hunold for submitting a patch).
-- Fixed a bug which prevented the main iterator from returning a T_EOF token 
-  at the overall end of the input. 
-- Fixed a problem, where non-evaluated #elif directives never got passed to the 
+- Fixed a bug which prevented the main iterator from returning a T_EOF token
+  at the overall end of the input.
+- Fixed a problem, where non-evaluated #elif directives never got passed to the
   skippen_token() pp hook (thanks to Andreas Sæbjørnsen for reporting).
 - Fixed a problem in the get_tokenname() function.
 - Added a missing #define BOOST_WAVE_SOURCE 1 to the wave_config_constant.cpp
   file.
 - Fixed exception specifications to catch all exceptions by const&.
-- Fixed predefined macros to appear to be defined at a position referring to 
+- Fixed predefined macros to appear to be defined at a position referring to
   a file named "<built-in>". Thanks to Andreas Sæbjørnsen for reporting.
 - Fixed the Re2C lexer not to segfault on empty files anymore.
 - Stripped leading and trailing whitespace for all lines in a config file (Wave
   driver tool).
-- Fixed RTTI build issue for VC7.1/bjam --v2 (thanks to Rene Rivera for 
+- Fixed RTTI build issue for VC7.1/bjam --v2 (thanks to Rene Rivera for
   submitting a patch for the Wave Jamfile.v2).
 - Fixed certain problems reported by the Boost inspection tool.
 - Fixed a couple of SunPro5.8 warnings.
 - Fixed a bug resulting in a crash if a macro was redefined with a shorter
   expansion list as it was defined initially. Added a corresponding test case.
-- Fixed a bug causing an infinite loop when there was a missing endif in the 
+- Fixed a bug causing an infinite loop when there was a missing endif in the
   main preprocessed file.
 - Improved error recovery for illegal preprocessing directive errors.
-- Improved error handling and error recovery for conditional expressions 
+- Improved error handling and error recovery for conditional expressions
   (#if/#elif expressions).
-- Wave now passes 160 out of 161 tests from the MCPP V2.6.1 validation 
+- Wave now passes 160 out of 161 tests from the MCPP V2.6.1 validation
   testsuite!
 - Added new warning for invalid #line number and filename arguments
 - Improved error diagnostics for invalid #line directives containing arbitrary
   tokens after at the end of the line.
-- Improved error handling wrt the misuse of the __VA_ARG__ token in macro 
+- Improved error handling wrt the misuse of the __VA_ARG__ token in macro
   definitions.
 - The warning, that a file is not terminated by a newline is now issued for all
   files, not only for the main file (as previous).
 - Added a couple of new test cases to verify various diagnostics.
 - Fixed wave applet not to report missing #endif's when in interactive mode.
 - Cleaned up the Re2C lexer code.
-- Fixed a bug, where a empty line followed by an arbitrary token and followed 
+- Fixed a bug, where a empty line followed by an arbitrary token and followed
   by a preprocessing directive interpreted the preprcessing directive as if it
   were the first non-whitespace token on the line. This error occured only
   if the #line directive generation was suppressed. Thanks to Joan Grant for
   reporting this problem.
-- Fixed a problem in the Wave applet which prevented the correct recognition of 
-  Windows file paths in a configuration file, if this path was enclosed in 
+- Fixed a problem in the Wave applet which prevented the correct recognition of
+  Windows file paths in a configuration file, if this path was enclosed in
   quotes.
 - Extended the copyright notice to include the year 2007.
-- Fixed a problem in preserve=1 mode, when a C style comment triggered the 
+- Fixed a problem in preserve=1 mode, when a C style comment triggered the
   generation of a #line directive.
 - Worked around a linker issue for the True64/CXX compiler, complaining about
   multiple defined symbols when using the flex_string class.
@@ -515,46 +525,46 @@ Boost V1.34.0
 
 Sat Feb 18 2005
 - Version 1.2.3
-- Added a missing throw() specification to the function 
+- Added a missing throw() specification to the function
   cpp_exception::get_related_name().
 - Fix Boost bug ([ boost-Bugs-1395857 ] wave redefines BSIZE).
 - Added missing calls to the skipped_token() preprocessing hook which wasn't
   called for pp directives inside disabled #if blocks.
 - Made the context<> type noncopyable.
-- Introduced the --extended/-x command line option to the wave driver 
+- Introduced the --extended/-x command line option to the wave driver
   executable, which enables the #pragma wave system() directive. This directive
   is now disabled by default because it may cause a potential security threat.
 - Changed the what() function of the macro_handling_exception class, which now
   correctly returns the name of the exception type itself.
-- Added a diagnostic message to the wave driver executable, which is issued 
-  whenever a #pragma wave system() directive is found, but the -x (--extended) 
+- Added a diagnostic message to the wave driver executable, which is issued
+  whenever a #pragma wave system() directive is found, but the -x (--extended)
   command line argument was not given.
 - Fixed long integer suffix to be allowed to be mixed case (1Ll or 2lL).
 - Fixed the BOOST_PP_CAT(1e, -1) pp-token bug. Wave now correctly recognizes
-  pp-number tokens, which are converted to C++ tokens right before they are 
+  pp-number tokens, which are converted to C++ tokens right before they are
   returned from the library.
-- Moved the implementation of the token_id query functions (get_token_name(), 
+- Moved the implementation of the token_id query functions (get_token_name(),
   get_token_value()) to a separate source file.
 - Fixed a bug, which prevented to prefer pp-numbers in files preprocessed as
   a result of #include directives.
-- Fixed a bug, which prevented to open #include'd files specified by an 
+- Fixed a bug, which prevented to open #include'd files specified by an
   absolute path.
 - Fixed a problem in the expression parser value type.
 - Fixed a dynaload compilation problem with VC7.1 of the re2c lexer tests.
 
 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 
+- 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.
 - Added new sample: advanced_hooks.
 - Fixed a possible buffer overflow in the cpplexer and cpp exception classes.
 - Made the cpp_grammar thread safe.
-- Removed the need for the get_directivename() function. Fixed typos in the 
+- Removed the need for the get_directivename() function. Fixed typos in the
   predefined token table.
-- Removed assertions from get_token_name() and get_token_value() and replaced 
+- Removed assertions from get_token_name() and get_token_value() and replaced
   these with more meaningful code.
 - Added the BOOST_WAVE_USE_STRICT_LEXER configuration constant which allows to
   decide, whether the '$' character will be recognized as a part of identifiers
@@ -564,77 +574,77 @@ Sat Dec 24 13:33:53 CST 2005
   preprocessor constant (testwave V0.4.0).
 - Made the predefined_macros_grammar thread safe.
 - Added dll support for the generated Wave libraries.
-- Added the const_iterator based exlicit instantiations for the Re2C lexer to 
+- Added the const_iterator based exlicit instantiations for the Re2C lexer to
   the built Wave library and dll.
-- Added the whitespace handling policy to the context object. This actually is 
+- Added the whitespace handling policy to the context object. This actually is
   no separate policy, it's a new preprocessing hook allowing to decide, whether
   a concrete token has to be skipped.
-- Changed the --preserve option of the wave tool to take a single integer 
-  argument (0: no whitespace is preserved, 1: only comments are preserved, 
+- Changed the --preserve option of the wave tool to take a single integer
+  argument (0: no whitespace is preserved, 1: only comments are preserved,
   2: all whitespace is preserved)
 - Edited the command line option descriptions of the wave driver.
 - Fixed broken tags in documentation (magically inserted by DreamWeaver).
-- Merged the new whitespace_handling policy with the existing preprocessing 
+- Merged the new whitespace_handling policy with the existing preprocessing
   hooks. The name of the new preprocessing hook ist may_skip_whitespace().
 - Fixed compatibility issues for CW9.4 in the Wave test aplication.
-- Added get_errorcode() member to the wave exception classes allowing to 
+- Added get_errorcode() member to the wave exception classes allowing to
   get back the reason for the exception.
 - Added boost::wave::is_recoverable(cpp_exception const&) alowing to decide,
   whether it is possible to continue after a cpp_exception has been thrown.
   This is a temporary hack to overcome the current limitation of the library
   not allowing to do generic error recovery. It allows to recover from 75% of
   the generated errors types.
-- The --timer command line option for the Wave driver now prints the elapsed 
+- The --timer command line option for the Wave driver now prints the elapsed
   time correctly even if a preprcessing error occured.
 - Fixed an error recovery problem which skipped one token after continuing in
   case this was a pp directive.
-- Added the --autooutput (-E) option to the Wave driver applet which redirects 
-  the generated output to a file named after the input file changing the file 
+- Added the --autooutput (-E) option to the Wave driver applet which redirects
+  the generated output to a file named after the input file changing the file
   extension to '.i'.
 - Changed all throw's to boost::throw_exception.
-- Added the possibility to configure the command keyword for the wave specific 
+- Added the possibility to configure the command keyword for the wave specific
   #pragma directives. It is now possible to define a string literal via
   BOOST_WAVE_PRAGMA_COMMAND, which will be recognized and all corresponding
   #pragma's are dispatched to the interpret_pragma() preprocessing hook.
-  The default value for BOOST_WAVE_PRAGMA_COMMAND is "wave", just to ensure 
+  The default value for BOOST_WAVE_PRAGMA_COMMAND is "wave", just to ensure
   complete backward compatibility.
 - Added missing #pragma warning(pop) directives.
 - Fixed a bug wrt error propagation in the expression parser.
-- Fixed an assertion fired when cpp_token is used to process the quick_start 
+- Fixed an assertion fired when cpp_token is used to process the quick_start
   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 
+- 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 include the year 2006.
-  
+
 Mon Dec  5 22:05:22 CST 2005
 Boost V1.33.1
 - Version 1.2.1
 - Fixed bug reported as Sourceforge bug 1274584.
 - Switched to Re2C V0.9.9.
-- Fixed a bug where the 'parameters' and 'definition' parameters to the 
+- Fixed a bug where the 'parameters' and 'definition' parameters to the
   defined_macro callback of the preprocessing hooks were always empty (thanks
   to Stefan Seefeld for reporting).
-- Fixed missing namespace specifiers in token definition macros (thanks to 
+- Fixed missing namespace specifiers in token definition macros (thanks to
   Jozsef Mihalicza for reporting).
-- Enabled --preserved and --long_long modes by default for the cpp_tokens 
+- Enabled --preserved and --long_long modes by default for the cpp_tokens
   sample.
 - Newline tokens reported a wrong line number (offset by one) when using the
   Re2C generated lexer (thanks to Jozsef Mihalicza for pointing this out).
 - Changed file positions to carry 'unsigned int' line and column numbers.
-- Fixed tokens of a generated #line directive to carry the correct column 
+- Fixed tokens of a generated #line directive to carry the correct column
   numbers.
 - Tokens now contain the correct filename, line and column numbers even if
   a #line directive was encountered.
-- Fixed wrong line numbering in reference comments of the tests t_5_002.cpp and 
+- Fixed wrong line numbering in reference comments of the tests t_5_002.cpp and
   t_5_035.cpp.
-- Made sure, that preprocessor expression errors get ignored for 'passive' 
+- Made sure, that preprocessor expression errors get ignored for 'passive'
   #elif branches.
 - Fixed an issue reported by the gcc debug stl.
 - Added the <vc-7_1-stlport><*><rtti>off directive to all of the V1 Jamfiles.
@@ -668,21 +678,21 @@ Version 1.2
   way.
 - Added special handling of the eof tokens inside the lexer iterator classes
   for Comeau.
-- Applied a workaround proposed by David Abrahams to make the slex lexer work 
+- Applied a workaround proposed by David Abrahams to make the slex lexer work
   on the CodeWarrior platforms.
-  
+
 Sun May  8 17:22:59 WEDT 2005
 Version 1.1.17
 - Added ill_formed_character_literal and ill_formed_integer_literal errors.
 - Improved error handling and diagnostics for integer overflow in #if/#elif
   expressions.
-- Fixed a bug in the testwave application which prevented the correct 
+- Fixed a bug in the testwave application which prevented the correct
   recognition of expected errors under certain circumstances.
 - Fixed a portability problem (for gcc 3.3.x) in the testwave application.
 - Enforced that #if/#endif are balanced file wise.
-- Changed the command line arguments for the Wave testrun to use absolute 
+- Changed the command line arguments for the Wave testrun to use absolute
   directories.
-- Changed the test application to return a value != zero if one of the given 
+- Changed the test application to return a value != zero if one of the given
   config files were not found.
 - Fixed a command line parsing problem caused by a change in the parameter
   handling inside in the program_options library.
@@ -692,7 +702,7 @@ Version 1.1.17
 - Added operator==() to the token classes to fix the ambiguity error reported
   by the True64 compiler.
 - Improved the error message, when empty arguments are used in pure C++ mode.
-- Added character literal out of range testing and an additional corresponding 
+- Added character literal out of range testing and an additional corresponding
   error message.
 - Fixed parsing of long character literals (such as '\x1234').
 - Fixed almost all problems diagnosed by the Boost inspection report.
@@ -702,9 +712,9 @@ Version 1.1.17
 
 Thu Apr  7 10:07:45 WEDT 2005
 Version 1.1.16
-- Fixed a bug in the white space eating component, which prevented a C++ 
+- Fixed a bug in the white space eating component, which prevented a C++
   comment to be suppressed if it followed after another whitespace.
-- Fixed the inconsistencies between the documentation and the behaviour wrt the 
+- Fixed the inconsistencies between the documentation and the behaviour wrt the
   different include search paths. See the Wave driver docs for details of how
   the '-I', '-I-', and '-S' options work.
 - Allowed to specify more than one config file ('@' syntax) on the command line
@@ -714,13 +724,13 @@ Version 1.1.16
 - If comments shouldn't be preserved all C++ comments are replaced by newline
   tokens (instead of beeing igored completely).
 - Fixed a bug in the white space eater component.
-- Fixed a bug which reported wrong line numbers for error encountered during 
+- Fixed a bug which reported wrong line numbers for error encountered during
   retokenisation (concatination).
 - Fixed a bug in the unescaping code.
-- Fixed a compilation error of the testwave executable (added a missing 
+- Fixed a compilation error of the testwave executable (added a missing
   namespace specifier).
 - Added a missing header to make cpp.re.cpp compile on CW.
-- The predefined macro __BASE_FILE__ now returns a properly escaped file name 
+- The predefined macro __BASE_FILE__ now returns a properly escaped file name
   string.
 - Fixed the function boost::wave::util::impl::unescape_lit().
 - Added the Wave unit test framework. For now it contains about 60 unit tests
@@ -730,28 +740,28 @@ Version 1.1.16
 - Fixed a minor problem in the whitespace eating component.
 - Added optional trigraph conversion.
 - Changed all size_t, time_t etc. to std::size_t, std::time_t etc (for CW).
-- If the comments should not be preserved every C comment containing at minimum 
+- If the comments should not be preserved every C comment containing at minimum
   one newline is now converted to a newline token.
 - Added the lexed_tokens sample.
 - Fixed warnings and errors reported by the CodeWarrior compiler.
-- Added the '$V' replacement string to the testwave application. It expands to 
+- Added the '$V' replacement string to the testwave application. It expands to
   the current BOOST_LIB_VERSION.
 - Diagnosed the attempt to redefine the alternative operators as and, or etc.
 - Improved error handling.
-- Disabled the flex_string class for VC7, enabled to fallback to std::string 
+- Disabled the flex_string class for VC7, enabled to fallback to std::string
   for this compiler.
 - Renamed files to comply with the Boost rules.
 - Added the first part of the MCPP validation suite to the Wave unit tests.
 - Added even more missing "using namespace std;" statements for functions from
   the C runtime library. The Wave test suite now contains more than 100 unit
   tests.
-- Added the $P/$P(basename) replacement string to the testwave application 
-  which expands to the full path of the current file ($P) or to the current 
+- Added the $P/$P(basename) replacement string to the testwave application
+  which expands to the full path of the current file ($P) or to the current
   directory/basename ($P(basename)).
 - Fixed a bunch of portability problmes revealed by the regression tests on
   different platforms. Thanks to Stefan Slapeda for his support to make it work
   on the cw-9_4 toolset (win32).
-  
+
 Tue Mar 22 14:52:45 WEST 2005
 Version 1.1.15
 - Fixed a bug where the complete set of C99 predefined macros were pre-defined
@@ -761,25 +771,25 @@ Version 1.1.15
 - Added the --listincludes option to the Wave driver executable which allows to
   log the file names of the include files opened.
 - Fixed a gcc warning in token_cache.hpp (unused variable end).
-- Changed the logic behind #include_next. It now starts searching with the 
-  next directory after the directory the current file (the file containing the 
+- Changed the logic behind #include_next. It now starts searching with the
+  next directory after the directory the current file (the file containing the
   #include_next directive) is located in.
-- Changed the signature of the undefined_macro preprocessing hook to take the 
+- Changed the signature of the undefined_macro preprocessing hook to take the
   token itself and not the macro name only. This is important to pass the full
-  context information about the position of the #undef directive to the 
+  context information about the position of the #undef directive to the
   user provided hook (thanks to Stefan Seefeld for pointing that out).
 - Fixed several broken links in the Context Policy topic.
-- Fixed a bug in the handling of the #include_next directive inside of 
+- Fixed a bug in the handling of the #include_next directive inside of
   non-evaluated #if blocks.
 - Fixed a bug in the #include_next handling code (thanks to Stefan Seefeld).
-- Changed the signature of the opened_include_file() preprocessing hook which 
+- Changed the signature of the opened_include_file() preprocessing hook which
   now receives not only the absolute file name of the openend include file but
   additionally gets passed the (possibly) relative path of the openend include
   file. This concrete format of the relative path depends on the format of the
   include search directory given to the library.
 - Added a new preprocessing hook 'found_include_directive()' which gets called
-  for every #include directive (even for those where the file to include 
-  doesn't exist) and which gets passed the (expanded) token sequence found 
+  for every #include directive (even for those where the file to include
+  doesn't exist) and which gets passed the (expanded) token sequence found
   after the #include directive token.
 - The file names passed to the preprocessing hooks are now normalised.
 - Changed the opened_include_file() preprocessing hook to receive the correct
@@ -789,25 +799,25 @@ Version 1.1.15
 - Fixed a bug which prevented to define variadic macros from the command line.
 - Added a 'preserve comments' mode to preserve the comments in the input stream
   not inserted into macro definitions.
-- Added a new --preserve (-p) command line switch to the wave driver 
+- Added a new --preserve (-p) command line switch to the wave driver
   application to allow comments to be preserved in the generated output stream.
-  
+
 Mon Feb 21 09:30:04 WEST 2005
 Version 1.1.14 (Fixes in response to the Boost review)
 
-Wave was accepted into Boost! 
+Wave was accepted into Boost!
 
 With special thanks to Tom Brinkman, who volunteered to be the review manager.
 
-With thanks to David Abrahams, Beman Dewes, Reece Dunn, Larry Evans, 
-Doug Gregor, Joel de Guzman, Baptiste Lepilleur, Andy Little, Paul Mensonides, 
-Dan Nuffer, Andreas Pokorny, Vladimir Prus, Gennadiy Rozental, Michiel Salters, 
-Jonathan Turkanis, Chris Uzdavinis, Pavel Vozenilek, Michael Walter for bug 
+With thanks to David Abrahams, Beman Dewes, Reece Dunn, Larry Evans,
+Doug Gregor, Joel de Guzman, Baptiste Lepilleur, Andy Little, Paul Mensonides,
+Dan Nuffer, Andreas Pokorny, Vladimir Prus, Gennadiy Rozental, Michiel Salters,
+Jonathan Turkanis, Chris Uzdavinis, Pavel Vozenilek, Michael Walter for bug
 reports, fixes and hints.
 
 - Added support for the MS extensions #region and #endregion, which simply get
   ignored by Wave. The support for these is enabled only, when the pp constant
-  BOOST_WAVE_SUPPORT_MS_EXTENSIONS is defined. Otherwise these get flagged as 
+  BOOST_WAVE_SUPPORT_MS_EXTENSIONS is defined. Otherwise these get flagged as
   an illegal preprocessor directive (as before).
 - Fixed a problem, where the replacement text for a #pragma directive got lost
   if this directive was on the last line of a processed (include-)file.
@@ -817,39 +827,39 @@ reports, fixes and hints.
 - Fixed certain grammatical and stylistic quirks in the documentation.
 - Fixed a problem in libs/wave/build/Jamfile.v2 (as reported by Larry Evans).
   Fixed the Jamfile.v2 in the samples directories accordingly.
-- Added the '<toolset>vc-7_1:<rtti>off' to all Jamfile.v2 files to adjust for 
-  the internal buffer overflow bug in the VC7.1 compiler (reported by Joel de 
+- Added the '<toolset>vc-7_1:<rtti>off' to all Jamfile.v2 files to adjust for
+  the internal buffer overflow bug in the VC7.1 compiler (reported by Joel de
   Guzman).
 - Changed the '<toolset>vc-7_1:<rtti>off' to '<toolset>vc-7.1:<rtti>off' as
   required by the Boost.Build.v2 library (suggested by Vladimir Prus).
 - Finally fixed the Jamfile.v2 file (after a suggestion from Reece Dunn)
-- Fixed the column number reported for tokens for Slex lexer based 
+- Fixed the column number reported for tokens for Slex lexer based
   configurations (reported by Baptiste Lepilleur).
-- Added the __BASE_FILE__ predefined macro, which contains a string literal 
+- Added the __BASE_FILE__ predefined macro, which contains a string literal
   of the main file name to preprocess (the one the context<> template was
   created with). (suggested by Pavel Vozenilek)
 - Used the boost::reverse_iterator instead of the std::reverse_iterator
   for the flex_string class to allow compilation of Wave with VC7.0
   (as suggested by Reece Dunn).
-- Fixed a problem in the include_path template, which throwed a 
+- Fixed a problem in the include_path template, which throwed a
   boost::filesystem exception whenever a character was used in a file name
   to include, which is marked as illegal by the default name checker of the
   boost::filesystem::path.
-  
+
 Version 1.1.13 (Boost review candidate 2, bug fixed version)
 - Fixed a problem, where the context<> template referenced temporary iterator
   objects from the underlying stream (thanks to Michiel Salters for reporting
   this).
-- Fixed a bug in the re2c lexer, which allowed to dereference the end iterator 
+- Fixed a bug in the re2c lexer, which allowed to dereference the end iterator
   of the underlying input stream (thanks to Doug Gregor for pointing this out).
 - Fixed several assertions fired by the iterator checking code of the VC8 stl.
 
 Version 1.1.12 (Boost review candidate)
-- A rough performance analysis showed, that 30% of the time is spent parsing 
+- A rough performance analysis showed, that 30% of the time is spent parsing
   the input for pp directives (cpp_grammar), 35% of the time is spent inside
-  the flex_string code, mainly in the copy constructor and assignment 
-  operator, 15% of the time is spent inside the list and vector member 
-  functions, 10% is spent for memory allocation but only 1% of the time is 
+  the flex_string code, mainly in the copy constructor and assignment
+  operator, 15% of the time is spent inside the list and vector member
+  functions, 10% is spent for memory allocation but only 1% of the time is
   spent in the re2c lexer.
 - Identified a performance problem, where the token_cache was instantiated
   for every created lexer object, but needed to be initialised only once.
@@ -860,27 +870,27 @@ Version 1.1.12 (Boost review candidate)
 Version 1.1.11
 - Updated copyrights.
 - Fixed some bugs introduced by the latest refactoring.
-- Tried to fix the expansion of macros, which replacement-list terminates in a 
+- Tried to fix the expansion of macros, which replacement-list terminates in a
   partial macro expansion. No success so far.
 
 Version 1.1.10
-- Refactored some of the macro map (macro namespace) code (added comments, 
+- Refactored some of the macro map (macro namespace) code (added comments,
   splitted into separate files),
 - Fixed some typename errors in cpp_macromap.hpp (thanks to Vladimir Prus).
 - Fixed the BoostBuild V2 Jamfiles (thanks to Vladimir Prus).
 
 Version 1.1.9
-- Moved all of the #pragma wave option(value) operators out of the wavelib into 
+- Moved all of the #pragma wave option(value) operators out of the wavelib into
   the wave driver program. Removed enable_trace() and trace_flags() policy
   functions. Renamed trace_policy into context_policy.
 - Added the defined_macro() and undefined_macro() preprocessing hooks to allow
   easily to build macro cross referencers and such.
 
 Version 1.1.8
-- Replaced the usage of the string::erase() and string::insert() functions, 
+- Replaced the usage of the string::erase() and string::insert() functions,
   which were the only non-const string member functions used.
 - Token pasting is now well defined in variadics mode (was in C++0x mode only).
-- Changed the timing code in the wave driver to include the parsing of 
+- Changed the timing code in the wave driver to include the parsing of
   files included by the --forceinclude command line switch.
 - Performance measurements (very informal) [sec], the files are some of the
   preprocessor specific test cases from Paul Mensonides chaos_pp library.
@@ -903,7 +913,7 @@ Version 1.1.8
     selection.cpp         0.440          0.270         0.210           0.220
     slot.cpp              0.680          0.350         0.240           0.270
     tuple.cpp             0.420          0.240         0.190           0.210
-                      
+
 
 Wed Aug 25 13:23:27 WEDT 2004
 Version 1.1.7
@@ -911,12 +921,12 @@ Version 1.1.7
 - Removed several features from the code base:
   . removed C++0x support
   . removed TST support
-- Fixed the program_option validator syntax, which has changed since the last 
+- Fixed the program_option validator syntax, which has changed since the last
   update.
-- Removed misleading configuration options from the cpp_config.hpp file, 
+- Removed misleading configuration options from the cpp_config.hpp file,
   because the application will have to use the same config options as were used
   during the compilation of the library.
-- Changed the naming convention of typedef'd types in the library. Removed the 
+- Changed the naming convention of typedef'd types in the library. Removed the
   _t suffix, wherever possible.
 - Updated the documentation to reflect the removal of the C++0x features.
 
@@ -931,50 +941,50 @@ Version 1.1.6
 
 Version 1.1.5
 Version 1.0.6
-- Fixed a bug, which reported an #include statement as ill formed, if it was 
-  followed by an empty C comment only. This was an error in the cpp.re regular 
-  expression for C comments. Additionally, since this change simplified the 
-  Re2C generated lexer a lot it was possible to remove the compiler workaround 
+- Fixed a bug, which reported an #include statement as ill formed, if it was
+  followed by an empty C comment only. This was an error in the cpp.re regular
+  expression for C comments. Additionally, since this change simplified the
+  Re2C generated lexer a lot it was possible to remove the compiler workaround
   for the VC7.1 compiler which prevented the optimization of this lexer.
-  
+
 Mon Mar 29 09:36:59 WEDT 2004
 - Corrected the signature of the main() functions (was main(int, char const*[])).
 
 Sun Mar 28 12:55:59 WEDT 2004
 Version 1.1.4
-- Fixed a problem, where the first returned token was lost, whenever a 
+- Fixed a problem, where the first returned token was lost, whenever a
   --forceinclude file was given.
-- Adjusted the Wave driver and the other samples to use the new program_options 
+- Adjusted the Wave driver and the other samples to use the new program_options
   library syntax (V1.1.x only).
-  
+
 Mon Mar  1 19:14:21 WEST 2004
 Version 1.1.2
 Version 1.0.4
-- Fixed a problem, which does not report an error, if in a #define statement in 
+- Fixed a problem, which does not report an error, if in a #define statement in
   between a macro name and its replacement list were no whitespace given.
-- Fixed a bug, which generated an unexpected exception of the $ character in the 
+- Fixed a bug, which generated an unexpected exception of the $ character in the
   input.
-- Macro definitions, which differ by whitespace only (one definition contains 
-  whitespace at a certain position, the other definition does not) are correctly 
+- Macro definitions, which differ by whitespace only (one definition contains
+  whitespace at a certain position, the other definition does not) are correctly
   reported as a warning now.
-- Fixed a problem, where different formal argument names during macro 
+- Fixed a problem, where different formal argument names during macro
   redefinition were not flagged as a warning.
-- A wide character string used in a #line directive wasn't flagged as an error. 
-  
+- A wide character string used in a #line directive wasn't flagged as an error.
+
 Sun Feb 29 19:10:14 WEST 2004
 Used the test suite distributed with the mcpp V2.4 preprocessor to fix a bunch
 of mostly minor issues:
-- Fixed trigraph backslash followed by a newline handling (??/ \n) in the 
+- Fixed trigraph backslash followed by a newline handling (??/ \n) in the
   re2c (C/C++ and IDL) scanners.
 - Fixed a digraph/trigraph token type handling problem during macro expansion.
-- Fixed a digraph/trigraph token type problem during handling of the null 
+- Fixed a digraph/trigraph token type problem during handling of the null
   preprocessor directive.
 - Fixed several signed/unsigned conversion bugs in the expression evaluator.
 - Fixed the || and && operators in the expression evaluator to stop evaluation,
   as only the outcome of the overall expression is determined.
 - Fixed the expression evaluation engine to detect divide by zero errors.
 - Fixed a bug with operator || and && arithmetic (the deduced type was wrong).
-- Fixed a bug with the unary operators ! and - which IN conjunction with an 
+- Fixed a bug with the unary operators ! and - which IN conjunction with an
   arithmetic operation yielded A wrong result type.
 - Fixed a bug, which reported a macro definition as an invalid redefinition, if
   it was different from the original definition only by different whitespaces.
@@ -988,35 +998,35 @@ of mostly minor issues:
 - Fixed some spelling errors in the documentation (thanks to Rob Stewart).
 
 Tue Feb  3 20:20:16 WEST 2004
-- Fixed the problem, that macro definitions in a config file were flagged as 
+- Fixed the problem, that macro definitions in a config file were flagged as
   an error, if there was any whitespace in between the -D and the macro name
   (same problem existed for -P).
-  
+
 Fri Jan 30 20:28:27 WEST 2004
 - Fixed a missing boostification in the trace support header.
-- Added a missing std:: namespace qualification to the list_includes.cpp sample 
+- Added a missing std:: namespace qualification to the list_includes.cpp sample
   file.
 - Fixed line ending problems with the cpp.re and idl.re files.
 - Added quick_start sample.
 
 Sun Jan 25 20:26:45 WEST 2004
 This version was submitted to Boost as the review candidate (V1.1.0)
-- Fixed invalid explicit instantiation syntax as reported by the Comeau 
+- Fixed invalid explicit instantiation syntax as reported by the Comeau
   compiler.
 - Added a missing header to flex_string.hpp.
 
 Sat Jan 24 19:47:44 WEST 2004
 - Completely decoupled the used lexer from the preprocessor.
-- Unfortunately had to change the template interface of the context class. It 
+- Unfortunately had to change the template interface of the context class. It
   now instead of the token type takes the type of the lexer to use.
-- Reintroduced the cpp_tokens, list_includes and waveidl samples. 
+- Reintroduced the cpp_tokens, list_includes and waveidl samples.
   . cpp_tokens is based on the SLex lexer
   . list_includes shows the usage of the include file tracing capability
   . waveidl uses the Re2C based IDL lexer in conjunction with the default token
     type
-  
+
 Tue Jan 13 20:43:04 WEST 2004
-- Fixed several compilation issues under linux (gcc 3.2.3, gcc 3.3, gcc 3.3.2, 
+- Fixed several compilation issues under linux (gcc 3.2.3, gcc 3.3, gcc 3.3.2,
   gcc 3.4, Intel V7.1)
 - Fixed a compatibility problem with Spirit versions older than V1.7.
 
@@ -1025,38 +1035,38 @@ Mon Jan 12 20:39:50 WEST 2004
   . Moved code into namespace boost.
   . Prefixed all pp constants with "BOOST_".
   . Refactured the directory structure.
-- Removed IDL mode and SLex lexer from the code base. These will be re-added as 
+- Removed IDL mode and SLex lexer from the code base. These will be re-added as
   samples.
-- Changed the Wave configuration system to be more flexible (all 
+- Changed the Wave configuration system to be more flexible (all
      #if defined(BOOST_WAVE_...) changed to #if BOOST_WAVE_... != 0),
   which allows to configure the library without changing the code base itself
-  
+
 Sat Jan 10 18:17:50 WEST 2004
-- Incorporated Andrei Alexandrescu's latest changes to the flex_string class, 
+- Incorporated Andrei Alexandrescu's latest changes to the flex_string class,
   which resulted in an overall spedd gain of about 5-10%.
-  
+
 Wed Jan  7 17:46:45 WEST 2004
 - Found a major performance hole! The achieved general speedup is about 50-70%.
-- Added missing old MS specific extensions to the re2c lexer (_based, 
+- Added missing old MS specific extensions to the re2c lexer (_based,
   _declspec, _cdecl, _fastcall, _stdcall, _inline and _asm).
 - Added support for #include_next (as implemented by gcc).
 - Fixed compilation problems with gcc 3.3.1
 - Avoid to look up in symbol table of a potential macro name twice.
-- Added the Spirit SLex lexer sample to the Wave source tree, because it was 
+- Added the Spirit SLex lexer sample to the Wave source tree, because it was
   removed from the Spirit distribution.
-- Removed the configuration option, which allowed to reverse the names stored 
+- Removed the configuration option, which allowed to reverse the names stored
   in the symbol tables.
 - Implemented experimental support for using a TST (ternary search tree) as the
   container for the symbol tables.
-   
+
 Sun Jan  5 12:30:50     2004
 - Released V1.0.0
 
 Sun Jan  4 00:11:50     2004
 - Removed tabs from the flex_string.hpp file.
-- Modified the input_functor.hpp file to sqeeze out some milliseconds at 
+- Modified the input_functor.hpp file to sqeeze out some milliseconds at
   runtime.
-- The --timer option now prints the overall elapsed time even if an error 
+- The --timer option now prints the overall elapsed time even if an error
   occured.
 - Added support for #pragma once.
 
@@ -1066,11 +1076,11 @@ Fri Jan  2 22:58:54     2004
 
 Thu Jan  1 21:15:03     2004
 - Fixed a bug while predefining a macro with a value through the commmand line.
-- Fixed a bug, which reported a macro definition as illegal, if the redefined 
+- Fixed a bug, which reported a macro definition as illegal, if the redefined
   macro was a function like macro with parameters.
-- Fixed a bug, if concatenation of two tokens resulted in a C++ comment start 
+- Fixed a bug, if concatenation of two tokens resulted in a C++ comment start
   token.
-  
+
 Thu Jan  1 15:01:54     2004
 - Finished license migration.
 
@@ -1078,7 +1088,7 @@ Wed Dec 31 12:23:55     2003
 - Changed the copyright and licensing policiy to be Boost compatible.
 
 Wed Dec 31 12:01:14     2003
-- Fixed a problem while compiling certain headers from the Microsoft Windows 
+- Fixed a problem while compiling certain headers from the Microsoft Windows
   SDK:
         #define CreateWindowA(lpClassName, lpWindowName, dwStyle, x, y,\
         nWidth, nHeight, hWndParent, hMenu, hInstance, lpParam)\
@@ -1088,25 +1098,25 @@ Wed Dec 31 12:01:14     2003
   replacement list.
 - Fixed a problem with the MS extension __declspec, which now is recognized
   correctly.
-  
+
 Sat Dec 27 14:48:29     2003
 - Fixed remaining problems with assign/assign_a.
 - Fixed some gcc warnings about signed/unsigned comparision mismatch.
 
 Tue Nov 11 20:51:41 WEST 2003
-- Changed the IDL mode to recognize identifiers only. All keywords (except 
-  'true' and 'false') are returned as identifiers. This allows for easy 
-  extension of the IDL language. The drawback is, that after preprocessing 
+- Changed the IDL mode to recognize identifiers only. All keywords (except
+  'true' and 'false') are returned as identifiers. This allows for easy
+  extension of the IDL language. The drawback is, that after preprocessing
   there needs to be just another lexing stage, which recognizes the keywords.
-- Fixed a possible problem, when in between a #if/#elif directive and a 
+- Fixed a possible problem, when in between a #if/#elif directive and a
   subsequent opening parenthesis Wave finds no whitespace:
     #if(_WIN_VER >= 0x0500)
-  is now recognized correctly. 
+  is now recognized correctly.
   (This problem was pointed out by Porter Schermerhorn).
-  
+
 Sun Nov  9 21:05:23 WEST 2003
 - Started to work on implementation of an IDL lexer for the TAO idl compiler.
-  . Branched off the Re2C C++ lexer and related files as a starting point for 
+  . Branched off the Re2C C++ lexer and related files as a starting point for
     the new IDL lexer. Added connfiguration means to allow compile time
     decision, in which mode to operatoe (C++ or IDL).
   . Implemented the Re2C based IDL lexing component.
@@ -1118,22 +1128,22 @@ Sat Nov  8 20:05:52 WEST 2003
 - Adjusted for the new actor names in Spirit (assign_a and append_a).
 
 Thu Aug 21 16:54:20     2003
-- Removed the internally used macro 'countof()' to avoid possible nameclashes 
+- Removed the internally used macro 'countof()' to avoid possible nameclashes
   with user code.
 - Fixed a bug, which prevented the execution of the concatination operator '##'
   while expanding object-like macros.
-  
+
 Tue Aug  5 10:04:00     2003
-- Fixed a false assertion, if a #pragma directive started with some whitespace 
+- Fixed a false assertion, if a #pragma directive started with some whitespace
   on the line.
-- Added the #pragma wave timer() directive to allow rough timings during 
-  processing. This is done on top of a new callback hook for unrecognized 
-  #pragma's, which allows to easily add new pragma commands without changing 
+- Added the #pragma wave timer() directive to allow rough timings during
+  processing. This is done on top of a new callback hook for unrecognized
+  #pragma's, which allows to easily add new pragma commands without changing
   the Wave library.
-- Fixed a bug in the whitespace insertion engine, which prevented the insertion 
-  of a whitespace token in between two consecutive identifier tokens or a 
+- Fixed a bug in the whitespace insertion engine, which prevented the insertion
+  of a whitespace token in between two consecutive identifier tokens or a
   integer literal token followed by an identifier token.
-- Fixed a bug during macro concatenation, which allowed to concatenate 
+- Fixed a bug during macro concatenation, which allowed to concatenate
   unrelated tokens from the input stream:
     #define CAT(a, b) PRIMITIVE_CAT(a, b)
     #define PRIMITIVE_CAT(a, b) a ## b
@@ -1151,37 +1161,37 @@ Sun Jun 29 12:35:00     2003
 - Fixed 64 bit compatibility warnings.
 - Fixed a bug, which prevented the correct recognition of a #line directive, if
   only the filename part of this directive was generated by a macro expansion.
-- Fixed a bug during macro expansion of conditional expressions, which 
+- Fixed a bug during macro expansion of conditional expressions, which
   prevented the correct expansion of certain scoped macros.
-  
+
 Fri Jun 27 09:50:14     2003
 - Changed the output of the overall elapsed time (option --timer) to cerr.
 - Added a configuration constant WAVE_REVERSE_MACRONAMES_FOR_SYMBOLTABLE, which
-  reverses the macro names while storing them into the symbol table, which 
+  reverses the macro names while storing them into the symbol table, which
   allows to speed up name lookup especially, if the macro names are very long
   and if these share a common prefix.
 - Fixed a very subtle bug, which prevented the recognition of fully qualified
-  macro names during the macro expansion of conditionals expressions (for 
+  macro names during the macro expansion of conditionals expressions (for
   #if/#elif).
 - Improved the error output for the illformed pp expression error.
-  
+
 Thu Jun 26 08:20:30     2003
 - Done a complete spell check of the source code comments.
 
 Wed Jun 25 20:33:52     2003
-- Changed the conditional expression engine to work with integer numeric 
+- Changed the conditional expression engine to work with integer numeric
   literals only. Distinguished signed and unsigned literals.
 - Importing a region twice is allowed now.
-- Fixed a bug, which does not removed all placeholder tokens from a expanded 
+- Fixed a bug, which does not removed all placeholder tokens from a expanded
   token sequence while evaluating conditional expressions (C++0x mode only).
 
 Wed Jun 25 15:01:51     2003
-- Changed the conditional expression engine to respect the type of numeric 
+- Changed the conditional expression engine to respect the type of numeric
   literals, now expressions like '#if 1 / 10 == 0' evaluate correctly (to true
   :-)
-- Fixed a bug, where macro names referring to global macros (as ::A::B) were 
+- Fixed a bug, where macro names referring to global macros (as ::A::B) were
   not correctly recognized under certain circumstances.
-- Empty parameter lists for macros with ellipses only sometimes generated a 
+- Empty parameter lists for macros with ellipses only sometimes generated a
   placemarker token in the output:
     #define STR(...) #__VA_ARGS__
     STR()   // resulted in "§" instead of "" .
@@ -1192,20 +1202,20 @@ Wed Jun 25 08:35:06     2003
 - Reformatted the --timer output from pure seconds to a more reasonable format.
 
 Fri Jun 20 19:33:30     2003
-- Changed the enable_tracing function of the tracing_policies to take a 
+- Changed the enable_tracing function of the tracing_policies to take a
   trace_flags variable instead of a bool, to allow to control tracing with more
   granulation.
-- Added the tracing_enabled function to the tracing_policies, which returns the 
+- Added the tracing_enabled function to the tracing_policies, which returns the
   current tracing status.
 - Updated the documentation of the tracing policies.
 
 Thu Jun 19 21:45:39     2003
-- Reactivated the list_includes sample with the help of the new include file 
+- Reactivated the list_includes sample with the help of the new include file
   tracing facility.
 
 Thu Jun 19 17:55:35     2003
 - Eliminated the TraceT template parameter from the macromap<> template.
-- Added two hooks to the trace policy to allow to trace the opening and 
+- Added two hooks to the trace policy to allow to trace the opening and
   closing of include files.
 
 Thu Jun 19 14:08:10     2003
@@ -1213,24 +1223,24 @@ Thu Jun 19 14:08:10     2003
   of the overall elapsed time during the preprocessing of the given file.
 
 Fri Jun 13 09:11:29     2003
-- Emitted an error message, if an ellipses was found as a formal macro 
+- Emitted an error message, if an ellipses was found as a formal macro
   parameter and variadics were disabled.
-- Fixed a false error message, that the last line was not terminated with a 
+- Fixed a false error message, that the last line was not terminated with a
   newline, which occured, if no output was generated by the last line of the
   source file.
-  
+
 Thu Jun 12 15:20:22     2003
-- Fixed the recent change in argument expansion for the variadics/C99/C++0x 
+- Fixed the recent change in argument expansion for the variadics/C99/C++0x
   mode.
-- Fixed a problem, where an additional whitespace between _Pragma and the 
+- Fixed a problem, where an additional whitespace between _Pragma and the
   opening parenthesis resulted in a false error message.
 - Used a pool allocator for the token sequence containers (std::list<>'s),
-  which gives a speed gain of more than 60% (while profiling the Order 
+  which gives a speed gain of more than 60% (while profiling the Order
   library).
-  
+
 Wed Jun 11 22:18:54     2003
 - Fixed a macro scoping/expansion problem, when a macro returned a full scope
-  which is continued on the call site to form a full qualified name, the name 
+  which is continued on the call site to form a full qualified name, the name
   wasn't recognized correctly:
     # region A
     #  define MACRO 1
@@ -1241,22 +1251,22 @@ Wed Jun 11 22:18:54     2003
     # define ID(x) x
     ID(A)::MACRO     // 1
     ID(A::B)::MACRO  // 2, was expanded to A::B::MACRO
-- Changed the expansion of macro arguments such, that these will be expanded 
+- Changed the expansion of macro arguments such, that these will be expanded
   only, if the result is to be used for substitution during the expansion
   of the replacement list.
-  
+
 Wed Jun 11 14:40:29     2003
-- Included a whitespace eating finite state machine (FSM) for minimal 
+- Included a whitespace eating finite state machine (FSM) for minimal
   whitespace in the generated output. This was suggested by Paul Mensonides.
 - Updated the acknowledgement section
 
 Wed Jun  4 08:03:04     2003
-- Fixed a bug reported by Faisal Vali, which prevented the correct evaluation 
-  of conditional expressions, if these referenced macro names, which expanded 
+- Fixed a bug reported by Faisal Vali, which prevented the correct evaluation
+  of conditional expressions, if these referenced macro names, which expanded
   to a sequence containing non-expandable tokens.
-- Fixed the above bug for #elif directives too (in the first place this was 
+- Fixed the above bug for #elif directives too (in the first place this was
   fixed for #if directives only)
-  
+
 Mon May 26 22:15:40     2003
 - Added missing copyrights in several files.
 - Fixed false output, if a unknown _Pragma were encountered.
@@ -1267,11 +1277,11 @@ Mon May 26 22:15:40     2003
     #  define TEST 1
     #endregion
     ID(SCOPE::) TEST    // should expand to 1
-- Changed #import semantics for macros from copy semantics to reference 
-  semantics, i.e. macros are now considered to be implicitly imported into the 
-  scope, where they are defined. If a macro is imported into another scope and 
-  the original macro is undefined, the imported macro still exists. Further, 
-  if the imported macro is expanded, then while rescanning the original macro 
+- Changed #import semantics for macros from copy semantics to reference
+  semantics, i.e. macros are now considered to be implicitly imported into the
+  scope, where they are defined. If a macro is imported into another scope and
+  the original macro is undefined, the imported macro still exists. Further,
+  if the imported macro is expanded, then while rescanning the original macro
   is disabled too:
     #region A
     #  define B(x) x
@@ -1281,31 +1291,31 @@ Mon May 26 22:15:40     2003
     A::B (B)    (*) // B(*)
     B    (B)    (*) // B(*)
     A::B (A::B) (*) // A::B(*)
-- Fixed a recently introduced problem, where placemarker tokens slipped through 
+- Fixed a recently introduced problem, where placemarker tokens slipped through
   to the output under certain conditions (in variadics/C99/C++0x modes only).
 
 Mon May 19 16:30:49     2003
-- Fixed a bug, which prevented the recognition of the __lparen__, __rparen__ or 
+- Fixed a bug, which prevented the recognition of the __lparen__, __rparen__ or
   __comma__ alternative tokens, if these were the first token after an emitted
   #line directive (reported by Vesa Karvonen).
-- Added an optimization, that only those tokens are considered for a macro 
+- Added an optimization, that only those tokens are considered for a macro
   expansion, which may result in an expansion.
-  
+
 Tue May 13 18:16:26     2003
-- Fixed a newly introduced problem, where a omitted argument consisting out 
-  of whitespace only were failed to be replaced by a placemarker token. This 
+- Fixed a newly introduced problem, where a omitted argument consisting out
+  of whitespace only were failed to be replaced by a placemarker token. This
   lead to problems with constructs like the following:
     #define paste(a, b, c) a ## b ## c
     paste(1, , 3)  // should expand to 13, but expanded to 1## 3
-- Fixed a problem with the tracing support, which throwed an unexpected 
+- Fixed a problem with the tracing support, which throwed an unexpected
   exception if there were too few arguments given while expanding a macro.
-- Allowed to open and to import the global scope ('#region ::' and 
+- Allowed to open and to import the global scope ('#region ::' and
   '#import ::').
-- Fixed a bug, if more than one file was given with a --forceinclude command 
+- Fixed a bug, if more than one file was given with a --forceinclude command
   line option.
 
 Sat May 10 21:30:29     2003
-- Added __STDC_FULL_REGION__ and __STDC_CURRENT_REGION__ to the list of not 
+- Added __STDC_FULL_REGION__ and __STDC_CURRENT_REGION__ to the list of not
   undefinable macros.
 - In normal C++ mode and C99 mode the #ifdef/#ifndef and the operator defined()
   should not support qualified names. This is fixed now.
@@ -1313,53 +1323,53 @@ Sat May 10 21:30:29     2003
 - Fixed minor gcc -Wall compilation warnings.
 - Added better error support for qualified names used as arguments for #ifdef,
   #ifndef and operator defined().
-  
+
 Sat May 10 09:51:18     2003
 - Removed the feature, that the comma before the ellipsis parameter in a macro
   definition may be omitted.
-- Resolved an issue with the expansion of qualified macros, when these 
+- Resolved an issue with the expansion of qualified macros, when these
   qualified names were partially generated by a previous macro expansion
 - Allowed to specify fully qualified names as arguments to the #region directive
-  
+
 Wed May  7 22:44:21     2003
-- Changed the names of __SCOPE__ and __FULL_SCOPE__ predefined macros to 
-  __STDC_CURRENT_REGION__ and __STDC_FULL_REGION__ resp. The names are subject 
+- Changed the names of __SCOPE__ and __FULL_SCOPE__ predefined macros to
+  __STDC_CURRENT_REGION__ and __STDC_FULL_REGION__ resp. The names are subject
   to change if the #region keyword actually will be renamed to #scope/#module
   or whatever.
 - In C++0x mode it is now possible to omit the last comma before a variadics
   ellipsis in a macro definition:
-    #define cat_i(a, b, c, d, e ...) a ## b ## c ## d ## e 
+    #define cat_i(a, b, c, d, e ...) a ## b ## c ## d ## e
 - Fixed a bug in the stringize code, where an ellipsis to stringize resulted in
-  stringizing of the first ellipsis parameter only. Preserved the original 
+  stringizing of the first ellipsis parameter only. Preserved the original
   whitespace delimiting in between the ellipsis arguments.
-- Introduced the wave::language_support enum for convenient switching of the 
+- Introduced the wave::language_support enum for convenient switching of the
   supported language features throughout the library.
-- Fixed a bug, which prevented the definition of the predefined macro 
+- Fixed a bug, which prevented the definition of the predefined macro
   __WAVE_HAS_VARRIADICS__, if --variadics were given on the command line.
-  
+
 Tue May  6 15:49:45     2003
 - Made predefined macros available at every macro scope without qualification.
-- Predefined a new macro in C++0x mode: __STDC_GLOBAL__, which is defined at 
+- Predefined a new macro in C++0x mode: __STDC_GLOBAL__, which is defined at
   global macro scope only and equals to '1' (integer literal).
-- In C++0x mode there are two new predefined macros: 
-    __SCOPE__:      expands to the last part of the qualified name of the 
+- In C++0x mode there are two new predefined macros:
+    __SCOPE__:      expands to the last part of the qualified name of the
                     current macro scope
-    __FULL_SCOPE__: expands to the full qualified name of the current macro 
-                    scope 
-    
+    __FULL_SCOPE__: expands to the full qualified name of the current macro
+                    scope
+
 Mon May  5 23:02:48     2003
 - Fixed a problem in the new well defined token pasting code, which occured for
   constructs like the following:
     #define is_empty(...) is_empty_ ## __VA_ARGS__ ## _other
   i.e. where two or more '##' operators were contained in the replacement text.
-- Implemented __comma__, __lparen__ and __rparen__ alternative pp-tokens, which 
-  may be used as the ',', '(' and ')' tokens during preprocessing. These are 
-  only converted to there respective string representation in a special 
+- Implemented __comma__, __lparen__ and __rparen__ alternative pp-tokens, which
+  may be used as the ',', '(' and ')' tokens during preprocessing. These are
+  only converted to there respective string representation in a special
   translation phase after preprocessing. This was proposed by Vesa Karvonen.
-- Changed the macro scoping rules to: "If a qualified name does not find a 
-  nested name, it is not a qualified name to the preprocessor." This seems to 
+- Changed the macro scoping rules to: "If a qualified name does not find a
+  nested name, it is not a qualified name to the preprocessor." This seems to
   be the simplest usable solution for the possible ambiguities.
-- Fixed a bug in the macro expansion engine in C++0x mode, where the skipping 
+- Fixed a bug in the macro expansion engine in C++0x mode, where the skipping
   of whitespace inside of a qualified name wasn't consistent.
 
 Sun May  4 10:48:53     2003
@@ -1373,14 +1383,14 @@ Sun May  4 10:48:53     2003
   only (just as for the explicit instantiations of the other grammars).
 
 Fri May  2 22:44:27     2003
-- Qualified names are now allowed as parameters to the operator defined() in 
+- Qualified names are now allowed as parameters to the operator defined() in
   C++0x mode.
-- Separated the defined() functionality into a separate translation unit to 
+- Separated the defined() functionality into a separate translation unit to
   work around a VC7.1 ICE.
-  
+
 Fri May  2 15:38:26     2003
 - The C++0x mode now has a special set of predefined macros.
-- The predefined macro __WAVE_HAS_VARIADICS__ is now defined in C99 and C++0x 
+- The predefined macro __WAVE_HAS_VARIADICS__ is now defined in C99 and C++0x
   modes too (--variadics is implied for these modes).
 - Updated the documentation to reflect the recent changes and additions.
 - In C++0x mode Wave now supports macro scopes:
@@ -1393,26 +1403,26 @@ Fri May  2 15:38:26     2003
 - Fixed an issue with well defined token pasting of unrelated tokens.
 
 Tue Apr 29 08:47:37     2003
-- Fixed a bug in the macro expansion engine, which prevented the expansion 
-  of a certain macro under specific conditions (if the left of two tokens to 
-  concatenate were a disabled one (T_NONREPLACABLE_IDENTIFIER), then the 
+- Fixed a bug in the macro expansion engine, which prevented the expansion
+  of a certain macro under specific conditions (if the left of two tokens to
+  concatenate were a disabled one (T_NONREPLACABLE_IDENTIFIER), then the
   resulting token was disabled too).
-- Added additional diagnostics to the Wave driver to disambiguate the C99 and 
+- Added additional diagnostics to the Wave driver to disambiguate the C99 and
   C++0x modes.
 - Implemented a new API function and a corresponding Wave driver command line
   option, which allows to specify one or more include files to be preprocessed
   before the regular file is preprocessed (the files are processed as normal
-  input and all the resulting output is included, before processing the regular 
+  input and all the resulting output is included, before processing the regular
   input file). The Wave driver command line option is --forceinclude (-F).
 - Wave now compiles the Order library from Vesa Karvonen.
-  
+
 Mon Apr 28 07:57:10     2003
 - Fixed a bug in the macro expansion engine.
-- Removed a lot of (not needed) whitespace in the generated output (but still 
+- Removed a lot of (not needed) whitespace in the generated output (but still
   not optimal).
 
 Sat Apr 26 20:30:53     2003
-- Fixed a bug in the initialization code of the Slex lexer while working in 
+- Fixed a bug in the initialization code of the Slex lexer while working in
   C99 mode (reported by Reece Dunn).
 
 Fri Apr 18 08:37:35     2003
@@ -1422,7 +1432,7 @@ Fri Apr 18 08:37:35     2003
 - Started to implement experimental macro scoping.
 
 Thu Apr 10 10:20:07     2003
-- Fixed a problem with the #pragma wave stop(), where only the first token 
+- Fixed a problem with the #pragma wave stop(), where only the first token
   inside the stop directive was output, when the preprocessor stops in result
   of this pragma.
 - Implemented a new #pragma wave system(command), which spawns a new operation
@@ -1430,42 +1440,42 @@ Thu Apr 10 10:20:07     2003
   the stdout output of this process, retokenizes this output and inserts the
   generated token sequence in place of the original #pragma or operator _Pragma.
   Please note that the generated output is _not_ subject to any macro expansion
-  before its insertion as the replacement of the pragma itself. If you need to 
+  before its insertion as the replacement of the pragma itself. If you need to
   macro expand the replacement text, you always may force this by writing:
     #define SCAN(x) x
     SCAN(_Pragma("wave system(...)"))
   which re-scans the replacement once.
 - Replaced the Wave position_iterator with the boost::spirit::position_iterator
   (without any problems!).
-  
+
 Mon Apr  7 10:45:30     2003
-- Fixed macro_trace_policies::expand_object_like_macro not to be called with 
+- Fixed macro_trace_policies::expand_object_like_macro not to be called with
   the formal arguments as one of its parameters.
-- Updated the documentation to reflect the changes needed for the tracing 
+- Updated the documentation to reflect the changes needed for the tracing
   stuff.
-  
+
 Mon Mar 31 19:07:05     2003
 - Fixed variadics support in the trace output.
 - Fixed preprocessing of operator _Pragma() before it's execution.
-- Added _Pragma("wave stop(errmsg)") (#pragma wave stop(errmsg)) to allow 
+- Added _Pragma("wave stop(errmsg)") (#pragma wave stop(errmsg)) to allow
   diagnostics output from inside macro expansion.
 - Fixed operator _Pragma for unknown pragmas (these are simply put through to
   the output).
-- Implemented a maximal possible include nesting depth to avoid an out of 
-  memory error. The initial value for this is configurable through the compile 
-  time constant WAVE_MAX_INCLUDE_LEVEL_DEPTH, which defaults to 1024, if not 
+- Implemented a maximal possible include nesting depth to avoid an out of
+  memory error. The initial value for this is configurable through the compile
+  time constant WAVE_MAX_INCLUDE_LEVEL_DEPTH, which defaults to 1024, if not
   given.
   Additionally this may be enlarged through a new command line option:
   -n/--nesting (Wave driver only).
 
 Sun Mar 30 20:40:17     2003
-- Implemented the predefined macro __INCLUDE_LEVEL__, which expands to a 
-  decimal integer constant that represents the depth of nesting in include 
-  files. The value of this macro is incremented on every '#include' directive 
-  and decremented at every end of file. 
-- Implemented the operator _Pragma(). It is recognized in C99 mode and whenever 
+- Implemented the predefined macro __INCLUDE_LEVEL__, which expands to a
+  decimal integer constant that represents the depth of nesting in include
+  files. The value of this macro is incremented on every '#include' directive
+  and decremented at every end of file.
+- Implemented the operator _Pragma(). It is recognized in C99 mode and whenever
   variadics are enabled.
-  
+
 Sun Mar 30 08:30:12     2003
 - Changed the tracing format to be more readable.
 - Changed the tracing #pragma's to
@@ -1474,9 +1484,9 @@ Sun Mar 30 08:30:12     2003
   or
     enable tracing:     #pragma wave trace(1)
     disable tracing:    #pragma wave trace(0)
-- Changed the semantics of the -t (--traceto) switch. Without any -t switch 
+- Changed the semantics of the -t (--traceto) switch. Without any -t switch
   there isn't generated any trace output at all, even, if the corresponding
-  #pragma directives are found. To output the trace info to a file, the 
+  #pragma directives are found. To output the trace info to a file, the
   '-t file' syntax may be used, to output to std::cerr, the '-t-' (or '-t -')
   syntax may be used.
 
@@ -1485,108 +1495,108 @@ Fri Mar 28 17:27:25     2003
   to specify a policy for controlling the macro expansion tracing. The default
   macro_trace_policy does no tracing at all. This way one can add specific
   macro expansion tracing facilities to the library.
-- #pragma directives starting with a STDC identifier are no longer not macro 
-  expanded in C++ mode, in C++ mode these are now expanded as usual, in C99 
+- #pragma directives starting with a STDC identifier are no longer not macro
+  expanded in C++ mode, in C++ mode these are now expanded as usual, in C99
   mode not.
 - The tracing can be enabled/disabled from inside the preprocessed stream by
   inserting a special #pragma directive:
     enable tracing:     #pragma wave_option(trace: enable)
     disable tracing:    #pragma wave_option(trace: disable)
-- The Wave driver now allows to specify a destination for the macro expansion 
+- The Wave driver now allows to specify a destination for the macro expansion
   tracing trough a new command line switch: '-t path' or '--traceto path'. If
   this option isn't given, the trace output goes to stderr.
-- The Wave driver now allows to specify the name of the file, where the 
-  preprocessed result stream is to be saved: '-o path' or '--output path'. If 
+- The Wave driver now allows to specify the name of the file, where the
+  preprocessed result stream is to be saved: '-o path' or '--output path'. If
   this option is not given, the output goes to stdout.
-  
+
 Wed Mar 26 20:39:11     2003
 - Fixed a problem with alternative tokens (as 'and', 'or' etc.) and trigraph
   tokens, which were not correctly recognized inside #if/#elif expressions.
-- Alternative tokens ('and', 'or' etc.) are no longer subject to a possible 
+- Alternative tokens ('and', 'or' etc.) are no longer subject to a possible
   macro redefinition.
-- Fixed the special handling of 'true' and 'false' during the macro expansion 
+- Fixed the special handling of 'true' and 'false' during the macro expansion
   of #if/#elif expressions.
 
 Tue Mar 25 12:12:35     2003
 - Released Wave V0.9.1
 
 Mon Mar 24 13:34:27     2003
-- Implemented placemarkers, i.e. Wave now supports empty arguments during macro 
+- Implemented placemarkers, i.e. Wave now supports empty arguments during macro
   invocations. This must be enabled by means of a new pp constant:
-  WAVE_SUPPORT_VARIADICS_PLACEMARKERS which must be defined to enable the 
-  placemarker and variadics code and by defining the command line option 
+  WAVE_SUPPORT_VARIADICS_PLACEMARKERS which must be defined to enable the
+  placemarker and variadics code and by defining the command line option
   '--variadics' (Wave driver only).
-- Implemented variadics, i.e. Wave now supports macros with variable parameter 
+- Implemented variadics, i.e. Wave now supports macros with variable parameter
   counts. This must be enabled by means of the pp constant:
-  WAVE_SUPPORT_VARIADICS_PLACEMARKERS which must be defined to enable the 
-  placemarker and variadics code and by defining the command line option 
+  WAVE_SUPPORT_VARIADICS_PLACEMARKERS which must be defined to enable the
+  placemarker and variadics code and by defining the command line option
   '--variadics' (Wave driver only).
-- Implemented a C99 mode. This mode enables variadics and placemarkers by 
-  default and rejects some specific C++ tokens (as the alternate keywords and 
+- Implemented a C99 mode. This mode enables variadics and placemarkers by
+  default and rejects some specific C++ tokens (as the alternate keywords and
   '::', '->*', '.*'). This mode must be enabled by the means of the pp constant
-  WAVE_SUPPORT_VARIADICS_PLACEMARKERS (see above). The C99 mode is enabled by 
+  WAVE_SUPPORT_VARIADICS_PLACEMARKERS (see above). The C99 mode is enabled by
   the command line switch '--c99' (Wave driver only).
   This involved some changes in the C99/C++ lexers.
-  
+
 Fri Mar 21 16:02:10     2003
 - Fixed a bug in the macro expansion engine, which prevented the expansion of
-  macros, which name was concatenated out of a identifier and a integer 
+  macros, which name was concatenated out of a identifier and a integer
   followed directly by another identifier:
     #define X() X_ ## 0R()  // note: _zero_ followed by 'R'
     #define X_0R() ...
     X() // expanded to:  X_0R(), but should expand to ...
-  This is a problem resulting from the fact, that the Standard requires the 
+  This is a problem resulting from the fact, that the Standard requires the
   preprocessor to act on so called pp-tokens, but Wave acts on C++ tokens.
-  
+
 Thu Mar 20 21:39:21     2003
-- Fixed a problem with expression parsing (#if/#elif constant expressions), 
+- Fixed a problem with expression parsing (#if/#elif constant expressions),
   which failed to produce an error message for expressions like
     #if 1 2 3 4 5
-  i.e. where the token sequence starts with a valid constant expression, but 
+  i.e. where the token sequence starts with a valid constant expression, but
   the remainder of the line contained other tokens than whitespace.
 - Integrated the flex_string class from Andrei Alexandrescu (published on the
-  CUJ site) to get COW-string behaviour for the token values and position 
-  filename strings. This resulted in a major overall speedup (about 2-3 times 
+  CUJ site) to get COW-string behaviour for the token values and position
+  filename strings. This resulted in a major overall speedup (about 2-3 times
   faster in dependency of the complexity of pp usage in the input stream).
-- Fixed a bug, which reported ill formed #if/#else expressions as errors, even 
+- Fixed a bug, which reported ill formed #if/#else expressions as errors, even
   if the current if block status (conditional compilation status) is false.
 - Added a warning, if the last line of a file does not end with a newline.
 - Improved error recognition and handling for malformed preprocessor directives
 
 Mon Mar 17 19:53:29     2003
-- Fixed a concatenation problem: constructs like a##b##c where expanded 
+- Fixed a concatenation problem: constructs like a##b##c where expanded
   incorrectly.
-- Optimized the recognition of pp directives: 
-    - the parser is used only, if the next non-whitespace token starts a pp 
-      directive 
+- Optimized the recognition of pp directives:
+    - the parser is used only, if the next non-whitespace token starts a pp
+      directive
     - null directives now are recognized without calling the parser
     - the parser isn't called anymore, if the if_block_status is false and no
       conditional pp directive (#if etc.) is to be recognized.
   These optimizations give a speed improvement by upto 40%.
-- Removed adjacent whitespace during macro expansion (needs to be revised, 
+- Removed adjacent whitespace during macro expansion (needs to be revised,
   since there is some whitespace left, which may be removed)
-    
+
 Sun Mar 16 23:19:11     2003
 - Fixed a problem with include paths given on the command line, if the file
   to preprocess was not given as a full path (driver executable).
 - Fixed a problem with path names containing blanks (driver executable).
 - Cleaned command line and argument handling (driver executable).
 - Fixed a severe memory leak.
-- Fixed a bug, if a C++ keyword was used as a macro name or macro parameter 
-  name, which prevented the macro recognition and expansion to function 
+- Fixed a bug, if a C++ keyword was used as a macro name or macro parameter
+  name, which prevented the macro recognition and expansion to function
   properly.
-- Implemented the WAVE_SUPPORT_MS_EXTENSIONS compiler switch for the re2c 
+- Implemented the WAVE_SUPPORT_MS_EXTENSIONS compiler switch for the re2c
   generated lexer too.
-- Fixed a problem, which caused an internal T_PLACEHOLDER token to show up 
+- Fixed a problem, which caused an internal T_PLACEHOLDER token to show up
   outside the macro replacement engine.
-- Fixed a problem with macro #include directives, which prevents to find the 
-  file to include, if after the macro expansion the token sequence representing 
+- Fixed a problem with macro #include directives, which prevents to find the
+  file to include, if after the macro expansion the token sequence representing
   the filename began or ended with at least one whitespace token.
 - Fixed a problem, which caused a false error message if the '#' character was
   to be concatenated with an arbitrary other token.
-- The concatenation of a whitespace token with an arbitrary other token was 
+- The concatenation of a whitespace token with an arbitrary other token was
   reported as illegal token pasting (but it is certainly not).
-   
+
 Sat Mar 15 21:43:56     2003
 - Added a default constructor to the wave::util::file_position template.
 - Report the concatenation of unrelated tokens as an error.
@@ -1595,24 +1605,24 @@ Sat Mar 15 21:43:56     2003
 Fri Mar 14 20:14:18     2003
 - More work on documentation
 - Changed file_position to expose accessor functions (the member variables are
-  marked as private now). This opens up the possibility to provide another 
+  marked as private now). This opens up the possibility to provide another
   file_position implementation, which may be optimized in some way.
 - Fixed a problem with the token name table, the alternate and trigraph token
   names were printed incorrectly.
-- Fixed a bug, which prevented the correct recognition of 'defined X' (without 
+- Fixed a bug, which prevented the correct recognition of 'defined X' (without
   parenthesises).
-- Fixed a bug, which allowed to redefine and undefine the predefined name 
+- Fixed a bug, which allowed to redefine and undefine the predefined name
   'defined'.
-- Fixed a bug, which prevents the correct recognition of a macro based #include 
+- Fixed a bug, which prevents the correct recognition of a macro based #include
   directive, if it expands to something like #include <...>.
 - Fixed a bug, which prevented the recognition of duplicate macro parameter
   names.
-- Removed the insertion of additional whitespace inside of string literals 
+- Removed the insertion of additional whitespace inside of string literals
   (during stringizing).
-  
+
 Wed Mar 12 19:16:40     2003
-- Fixed a bug, which prevented the instantiation of the wave::context object 
-  with auxiliary iterators. The token type isn't coupled anymore with the 
+- Fixed a bug, which prevented the instantiation of the wave::context object
+  with auxiliary iterators. The token type isn't coupled anymore with the
   iterator type.
   This required some changes in the interface:
     - The wave::context object now has three template parameters (the iterator
@@ -1622,15 +1632,15 @@ Wed Mar 12 19:16:40     2003
 - Implemented a new position_iterator template on top of the iterator_adaptor<>
   template to make it work even for input_iterator type iterators.
 - Fixed a bug in the regular expressions for the Slex lexer.
-- The function 'set_sys_include_delimiter()' was renamed to 
-  'set_sysinclude_delimiter()' to better fit the naming scheme of the other 
+- The function 'set_sys_include_delimiter()' was renamed to
+  'set_sysinclude_delimiter()' to better fit the naming scheme of the other
   functions.
 - Wrote more documentation
 - Unified the different token definitions of the lexers, so that there is only
   one token type left. This required some changes in the interface:
     - There is no need anymore to explicitly specify the namespace of the token
       type to use.
-- Added the command line option -P to the Wave driver program, which predefines 
+- Added the command line option -P to the Wave driver program, which predefines
   a macro (i.e. defines it such, that is _not_ undefinable through an #undef
   directive from inside the preprocessed program).
 
@@ -1641,7 +1651,7 @@ Thu Mar  6 20:02:44     2003
 - Compiled Wave with IntelV7.0/DinkumwareSTL (from VC6sp5)
 - Fixed new compilation problems with gcc -Wall
 - Fixed the list_includes and cpp_tokens samples to compile and link correctly.
-- Fixed a bug, where a wrong filename was reported by the generated #line 
+- Fixed a bug, where a wrong filename was reported by the generated #line
   directive.
 - Fixed a bug, where the __FILE__ macro was expanded without '\"' around the
   filename.
@@ -1652,7 +1662,7 @@ Thu Mar  6 20:02:44     2003
 Wed Mar  5 21:11:14     2003
 - Reorganized the directory structure to mirror the namespace structure of the
   library
-- Fixed a bug, where the complete input after the first found #include 
+- Fixed a bug, where the complete input after the first found #include
   directive were eaten up.
 - Fixed a bug, where the __LINE__ macro expanded to a incorrect linenumber, if
   the __LINE__ macro was encountered on a line after a '\\' '\n' sequence.
@@ -1660,96 +1670,96 @@ Wed Mar  5 21:11:14     2003
 Tue Mar  4 11:50:24     2003
 - The new name of the project is 'Wave'.
 - Adjusted namespaces, comments etc. to reflect the new name.
-- Added the command line option -U [--undefine], which allows to remove one of 
-  the predefined macros (except __LINE__, __FILE__, __DATE__, __TIME__, 
+- Added the command line option -U [--undefine], which allows to remove one of
+  the predefined macros (except __LINE__, __FILE__, __DATE__, __TIME__,
   __STDC__ and __cplusplus)
 
 Sun Mar  2 20:10:04     2003
 - Fixed a bug while expanding macros without any definition part (empty macros)
 - The pp-iterator will not emit a newline for every recognized preprocessing
-  directive anymore. The generated output is much more condensed this way. 
+  directive anymore. The generated output is much more condensed this way.
 - The pp-iterator now emits #line directives at appropriate places.
 - Added an additional parser to the library, which may be used to parse macros
   given in the command line syntax, i.e. something like 'MACRO(x)=definition'.
-- Added the possibility to the cpp driver sample, to add macros from the 
+- Added the possibility to the cpp driver sample, to add macros from the
   command line through the -D command line switch.
-- Martin Wille contributed a test script to allow automatic testing of the 
+- Martin Wille contributed a test script to allow automatic testing of the
   cpp driver sample by feeding all files contained in the test_files directory
-  through the cpp driver and comparing the generated output with the 
+  through the cpp driver and comparing the generated output with the
   corresponding expectations.
 - Added config file support to allow for predefined option sets (for instance
   for the emulation of other compilers)
-- Changed the way, how include paths are defined. It resembles now the 
-  behaviour of gcc. 
-  Any directories specified with '-I' options before an eventually given '-I-' 
-  option are searched only for the case of '#include "file"', they are not 
-  searched for '#include <file>' directives. If additional directories are 
-  specified with '-I' options after a '-I-' option was given, these directories 
-  are searched for all '#include' directives. In addition, the '-I-' option 
-  inhibits the use of the current directory as the first search directory for 
-  '#include "file"'. Therefore, the current directory is searched only if it is 
-  requested explicitly with '-I.'. Specifying both '-I-' and '-I.' allows to 
-  control precisely which directories are searched before the current one 
+- Changed the way, how include paths are defined. It resembles now the
+  behaviour of gcc.
+  Any directories specified with '-I' options before an eventually given '-I-'
+  option are searched only for the case of '#include "file"', they are not
+  searched for '#include <file>' directives. If additional directories are
+  specified with '-I' options after a '-I-' option was given, these directories
+  are searched for all '#include' directives. In addition, the '-I-' option
+  inhibits the use of the current directory as the first search directory for
+  '#include "file"'. Therefore, the current directory is searched only if it is
+  requested explicitly with '-I.'. Specifying both '-I-' and '-I.' allows to
+  control precisely which directories are searched before the current one
   and which are searched after.
 - Added config file support to the cpp driver.
 - stored not only the current 'name' of a file (given eventually by a #line
   directive) but in parallel the actual full file system name of this file too.
-  
+
 Tue Feb 25 21:44:19     2003
 - Fixed the warnings emitted by gcc -Wall.
-- Fixed a bug in the cpp grammar, which causes to failing the recognition of 
-  certain preprocessor directives if at the end of this directive were placed 
+- Fixed a bug in the cpp grammar, which causes to failing the recognition of
+  certain preprocessor directives if at the end of this directive were placed
   a C++ comment.
 - Simplified and extended the insertion of whitespace tokens at places, where
-  otherwise two adjacent tokens would form a new different token, if 
+  otherwise two adjacent tokens would form a new different token, if
   retokenized.
 
 Mon Feb 24 19:13:46     2003
 - defined() functionality was broken
 - added missing typename keywords
 - added missing using namespace statements, where appropriate
-- added a warning, when a predefined macro is to be undefined (by an #undef 
+- added a warning, when a predefined macro is to be undefined (by an #undef
   directive)
-- removed the 'compile in C mode' hack for the re2c generated lexer (VC7.1 
-  (final beta) is not able to compile it with optimizations switched on 
+- removed the 'compile in C mode' hack for the re2c generated lexer (VC7.1
+  (final beta) is not able to compile it with optimizations switched on
   anyway :( )
 - compiled with gcc 3.2 and Intel V7.0 (20030129Z)
 
 Sun Feb 23 23:39:33  2003
 - Fixed a couple of 'missing typename' bugs (thanks to Martin Wille)
-- Added code to insert whitespace at places, where otherwise two adjacent 
+- Added code to insert whitespace at places, where otherwise two adjacent
   tokens would form a new different token, if retokenized.
 - Fixed a severe macro expansion bug.
-- Added the handling of invalid or not allowed universal character values 
+- Added the handling of invalid or not allowed universal character values
   inside of string literals and character literals.
 
 Sat Feb 22 20:52:06  2003
 - Bumped version to 0.9.0
 - Added test for invalid or not allowed universal character values (see
   C++ Standard 2.2.2 [lex.charset] and Annex E)
-- Fixed a bug with newlines between a macro name and the opening parenthesis 
+- Fixed a bug with newlines between a macro name and the opening parenthesis
   during the macro expansion and a bug with newlines inside the parameter list
   during the macro expansion.
 - Added the following predefined macros:
     __SPIRIT_PP__
-        expands to the version number of the pp-iterator lib (i.e. 0x0090 for 
+        expands to the version number of the pp-iterator lib (i.e. 0x0090 for
         V0.9.0)
     __SPIRIT_PP_VERSION__
         expands to the full version number of the pp-iterator lib (i.e.
         0x00900436 for V0.9.0.436)
     __SPIRIT_PP_VERSION_STR__
-        expands to the full version string of the pp-iterator lib (i.e. 
+        expands to the full version string of the pp-iterator lib (i.e.
         "0.9.0.436")
-  
+
 Fri Feb 21 22:09:04  2003 (feature complete!)
-- Allowed to optionally compile the Re2c generated lexer in 'C' mode, because 
+- Allowed to optionally compile the Re2c generated lexer in 'C' mode, because
   at least the VC7.1 (final beta) compiler has problems to compile it in 'C++'
   mode with optimizations switch on
-- Implemented #error and #warning (optional) directives (C++ standard 16.5). 
-  Additionally there are now allowed the following preprocessor configuration 
+- Implemented #error and #warning (optional) directives (C++ standard 16.5).
+  Additionally there are now allowed the following preprocessor configuration
   constants:
     CPP_PREPROCESS_ERROR_MESSAGE_BODY
-        if defined, preprocesses the message body of #error and #warning  
+        if defined, preprocesses the message body of #error and #warning
         directives to allow for better diagnostics.
     CPP_SUPPORT_WARNING_DIRECTIVE
         if defined, then the #warning directive will be recognized such, that
@@ -1758,64 +1768,64 @@ Fri Feb 21 22:09:04  2003 (feature complete!)
   error inside the lexer is now propagated as an cpplexer_exception.
 - Implemented the #line directive (C++ standard 16.4)
 - Implemented #pragma directive (C++ standard 16.6)
-  Additionally there are now allowed the following preprocessor configuration 
+  Additionally there are now allowed the following preprocessor configuration
   constants:
     CPP_RETURN_PRAGMA_DIRECTIVES
         if defined, then the whole pragma directive is returned as a token
-        sequence to the caller, if not defined the whole pragma directive is 
+        sequence to the caller, if not defined the whole pragma directive is
         skipped
     CPP_PREPROCESS_PRAGMA_BODY
-        if defined, then the #pragma body will be preprocessed 
+        if defined, then the #pragma body will be preprocessed
 - Implemented #include directive with macro arguments (C++ standard 16.2.4)
-- Made the namespace structure finer granulated to leave only the main 
+- Made the namespace structure finer granulated to leave only the main
   interface classes in the main namespace cpp. All other classes are moved into
   sub-namespaces to reflect the logical dependencies
 - Reorganized the public interface of the context<> template class, made all
   non relevant functions into the protected.
 - Implemented predefined macros (__LINE__ et.al.) (C++ standard 16.8)
 - Further documentation work
-  
+
 Wed Feb 19 23:44:47  2003
-- Corrected a lot of bugs in the macro expansion engine, which now should be 
+- Corrected a lot of bugs in the macro expansion engine, which now should be
   conformant to the C++ standard.
 - # (null) directive (C++ standard 16.7)
 
 Sun Feb 16 08:40:38  2003
-- Added a macro expansion engine which expands macros with arguments 
+- Added a macro expansion engine which expands macros with arguments
   C++ standard 16.3 [cpp.replace]
 - Added a new sample: cpp_tokens. This sample preprocesses a given file and
-  prints out the string representations of all tokens returned from the pp 
+  prints out the string representations of all tokens returned from the pp
   iterator
 - Added documentation (to be continued!)
 - Added a couple of small test files to test elementary functionality
   (the tests mainly were contributed by Paul Mensonides)
-- The main cpp sample is now a simple preprocessor driver program, which 
-  outputs the string representation of the preprocessed input stream. Use 
+- The main cpp sample is now a simple preprocessor driver program, which
+  outputs the string representation of the preprocessed input stream. Use
   cpp --help to get a hint, how to use it.
-- Fixed a bug in the preprocessor grammar which failed to recognize a pp 
+- Fixed a bug in the preprocessor grammar which failed to recognize a pp
   statement, if there was a C++ comment at the end of the line
 - Added '#' operator (C++ standard 16.3.2) [cpp.stringize]
-- Fixed a bug in the slex based C++ lexer to handle the concatenation 
+- Fixed a bug in the slex based C++ lexer to handle the concatenation
   characters correctly ('\\' followed by a '\n')
 
 Sun Feb  9 23:01:00  2003
 - Improved error handling for #if et.al.
 - Fixed a pair of lexer errors
-- Implemented the #if/#elif statements, the sample now contains a complete C++ 
-  expression evaluation engine (for the calculation of the outcome of the 
+- Implemented the #if/#elif statements, the sample now contains a complete C++
+  expression evaluation engine (for the calculation of the outcome of the
   #if/#elif statement conditions)
 - Implemented macro replacement (with parameters)
 - Implemented the '##' [cpp.concat] operator
 - Implemented the defined() [cpp.cond] operator
 
 Sun Feb  2 23:28:24  2003
-- Implemented the  #define, #undef, #ifdef, #ifndef, #else and #endif 
+- Implemented the  #define, #undef, #ifdef, #ifndef, #else and #endif
   statements
 - Added optional parse tree output as xml stream (controlled through the config
   pp constant CPP_DUMP_PARSE_TREE)
 
 Fri Jan 31 21:30:55  2003
-- Fixed different minor issues and a border case (#include statement at the 
+- Fixed different minor issues and a border case (#include statement at the
   last line of a included file)
 
 Wed Jan 29 21:13:32  2003
@@ -1826,40 +1836,40 @@ Wed Jan 29 21:13:32  2003
 
 Sat Jan 18 22:01:03  2003
 - Fixed a bug in the stream position calculation scheme
-- Made cpp::exceptions more standard conformant (added 'throw()' at appropriate 
+- Made cpp::exceptions more standard conformant (added 'throw()' at appropriate
   places)
 - Overall housekeeping :-)
 
 Wed Jan 15 21:54:20  2003
 Changes since project start (still 0.5.0)
 - Added #include <...> and #include "..." functionality
-- pp directives are now generally recognized 
+- pp directives are now generally recognized
 - Decoupled the C++ lexers and the pp grammar to separate compilation
   units (optionally) to speed up compilation (a lot!)
 
 Thu Jan  2 12:39:30  2003
-A completely new version 0.5.0 of the C preprocessor was started. It's a 
+A completely new version 0.5.0 of the C preprocessor was started. It's a
 complete rewrite of the existing code base. The main differences are:
-- The preprocessor is now implemented as an iterator, which returns the 
+- The preprocessor is now implemented as an iterator, which returns the
   current preprocessed token from the input stream.
 - The preprocessing of include files isn't implemented through recursion
   anymore. This follows directly from the first change. As a result of this
   change the internal error handling is simplified.
-- The C preprocessor iterator itself is feeded by a new unified C++ lexer 
-  iterator. BTW, this C++ lexer iterator could be used standalone and is not 
-  tied to the C preprocessor. There are two different C++ lexers implemented 
+- The C preprocessor iterator itself is feeded by a new unified C++ lexer
+  iterator. BTW, this C++ lexer iterator could be used standalone and is not
+  tied to the C preprocessor. There are two different C++ lexers implemented
   now, which are functionally completely identical. These expose a similar
   interface, so the C preprocessor could be used with both of them.
 - The C++ lexers integrated into the C preprocessor by now are:
-    Slex:   A spirit based table driven regular expression lexer (the slex 
+    Slex:   A spirit based table driven regular expression lexer (the slex
             engine originally was written by Dan Nuffer and is available as a
             separate Spirit sample).
     Re2c:   A C++ lexer generated with the help of the re2c tool. This C++
             lexer was written as a sample by Dan Nuffer too.
   It isn't hard to plug in additional different C++ lexers. There are plans to
-  integrate a third one written by Juan Carlos Arevalo-Baeza, which is 
+  integrate a third one written by Juan Carlos Arevalo-Baeza, which is
   available as a Spirit sample.
-  
+
 -------------------------------------------------------------------------------
 Tue Feb 12 22:29:50  2002
 Changes from 0.2.3 to 0.2.4:
@@ -1869,7 +1879,7 @@ Changes from 0.2.3 to 0.2.4:
 Sun Feb 10 21:07:19  2002
 Changes from 0.2.2 to 0.2.3:
 - Implemented concatenation operator '##' (cpp.concat)
-- Removed defined() functionality for Intel compiler (it ICE's) until this 
+- Removed defined() functionality for Intel compiler (it ICE's) until this
   issue is resolved
 - Separated code for dumping a parse tree to XML for inclusion in the main
   Spirit headers
@@ -1878,7 +1888,7 @@ Thu Jan 17 23:51:21  2002
 Changes from 0.2.1 to 0.2.2:
 - Fixes to compile with gcc 2.95.2 and gcc 3.0.2 (thanks Dan Nuffer)
 - Reformatted the grammars to conform to a single formatting guideline
-- Assigned explicit rule_id's to the rules of cpp_grammar, so that the 
+- Assigned explicit rule_id's to the rules of cpp_grammar, so that the
   access code to the embedded definition class is not needed anymore
 - Fixed a remaining const problem
 
@@ -1903,9 +1913,9 @@ Changes from 0.1.0 to 0.2.0:
 - Added directive '#warning'
 - Corrected error reporting
 - Added command line option -I- for finer control of the searched include
-  directories (-I and -I- should now work as in gcc, see readme.html for 
+  directories (-I and -I- should now work as in gcc, see readme.html for
   more info)
 - Corrected conditional preprocessing (should be fully functional now)
 - Fixed existing code base for changes made in parse tree support
-- Moved parse tree utility functions to a separate header (prepared for 
+- Moved parse tree utility functions to a separate header (prepared for
   inclusion to the Spirit main library)
diff --git a/include/boost/wave.hpp b/include/boost/wave.hpp
index 14842e3..f2b3bc2 100644
--- a/include/boost/wave.hpp
+++ b/include/boost/wave.hpp
@@ -5,7 +5,7 @@
 
     See http://www.boost.org/libs/wave for documentation
 
-    Copyright (c) 2001-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, 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 f053cdb..50c1d1c 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, 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_exceptions.hpp b/include/boost/wave/cpp_exceptions.hpp
index 3fbd61a..584c04d 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, 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_iteration_context.hpp b/include/boost/wave/cpp_iteration_context.hpp
index bf9f734..78c5590 100644
--- a/include/boost/wave/cpp_iteration_context.hpp
+++ b/include/boost/wave/cpp_iteration_context.hpp
@@ -1,10 +1,10 @@
 /*=============================================================================
     Boost.Wave: A Standard compliant C++ preprocessor library
     Definition of the preprocessor context
-    
+
     http://www.boost.org/
 
-    Copyright (c) 2001-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the 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,7 +22,7 @@
 #include <boost/wave/cpp_exceptions.hpp>
 #include <boost/wave/language_support.hpp>
 #include <boost/wave/util/file_position.hpp>
-// #include <boost/spirit/include/iterator/classic_multi_pass.hpp> // make_multi_pass 
+// #include <boost/spirit/include/iterator/classic_multi_pass.hpp> // make_multi_pass
 
 // this must occur after all of the includes and before any code appears
 #ifdef BOOST_HAS_ABI_HEADERS
@@ -36,9 +36,9 @@ namespace iteration_context_policies {
 
 ///////////////////////////////////////////////////////////////////////////////
 //
-//      The iteration_context_policies templates are policies for the 
-//      boost::wave::iteration_context which allows to control, how a given 
-//      input file is to be represented by a pair of iterators pointing to the 
+//      The iteration_context_policies templates are policies for the
+//      boost::wave::iteration_context which allows to control, how a given
+//      input file is to be represented by a pair of iterators pointing to the
 //      begin and the end of the resulting input sequence.
 //
 ///////////////////////////////////////////////////////////////////////////////
@@ -47,18 +47,18 @@ namespace iteration_context_policies {
     //
     //  load_file_to_string
     //
-    //      Loads a file into a string and returns the iterators pointing to 
+    //      Loads a file into a string and returns the iterators pointing to
     //      the beginning and the end of the loaded string.
     //
     ///////////////////////////////////////////////////////////////////////////
-    struct load_file_to_string 
+    struct load_file_to_string
     {
         template <typename IterContextT>
-        class inner 
+        class inner
         {
         public:
             template <typename PositionT>
-            static void init_iterators(IterContextT &iter_ctx, 
+            static void init_iterators(IterContextT &iter_ctx,
                 PositionT const &act_pos, language_support language)
             {
                 typedef typename IterContextT::iterator_type iterator_type;
@@ -66,7 +66,7 @@ namespace iteration_context_policies {
                 // read in the file
                 std::ifstream instream(iter_ctx.filename.c_str());
                 if (!instream.is_open()) {
-                    BOOST_WAVE_THROW_CTX(iter_ctx.ctx, preprocess_exception, 
+                    BOOST_WAVE_THROW_CTX(iter_ctx.ctx, preprocess_exception,
                         bad_include_file, iter_ctx.filename.c_str(), act_pos);
                     return;
                 }
@@ -77,7 +77,7 @@ namespace iteration_context_policies {
                     std::istreambuf_iterator<char>());
 
                 iter_ctx.first = iterator_type(
-                    iter_ctx.instring.begin(), iter_ctx.instring.end(), 
+                    iter_ctx.instring.begin(), iter_ctx.instring.end(),
                     PositionT(iter_ctx.filename), language);
                 iter_ctx.last = iterator_type();
             }
@@ -92,7 +92,7 @@ namespace iteration_context_policies {
 ///////////////////////////////////////////////////////////////////////////////
 //  Base class for iteration contexts
 template <typename ContextT, typename IteratorT>
-struct base_iteration_context 
+struct base_iteration_context
 {
     enum file_type
     {
@@ -103,21 +103,23 @@ struct base_iteration_context
     };
 
     base_iteration_context(ContextT& ctx_,
-            BOOST_WAVE_STRINGTYPE const &fname, std::size_t if_block_depth = 0)   
-    :   real_filename(fname), real_relative_filename(fname), filename(fname), 
-        line(1), emitted_lines(0), if_block_depth(if_block_depth), ctx(ctx_) 
+            BOOST_WAVE_STRINGTYPE const &fname, std::size_t if_block_depth = 0)
+    :   real_filename(fname), real_relative_filename(fname), filename(fname),
+        line(1), emitted_lines(0), if_block_depth(if_block_depth), ctx(ctx_),
+        type(main_file)
     {}
-    base_iteration_context(ContextT& ctx_, 
-            IteratorT const &first_, IteratorT const &last_, 
+    base_iteration_context(ContextT& ctx_,
+            IteratorT const &first_, IteratorT const &last_,
             BOOST_WAVE_STRINGTYPE const &fname, std::size_t if_block_depth = 0,
-            file_type type = main_file)
-    :   first(first_), last(last_), real_filename(fname), 
-        real_relative_filename(fname), filename(fname), 
-        line(1), emitted_lines(0), if_block_depth(if_block_depth), ctx(ctx_) 
+            file_type type_ = main_file)
+    :   first(first_), last(last_), real_filename(fname),
+        real_relative_filename(fname), filename(fname),
+        line(1), emitted_lines(0), if_block_depth(if_block_depth), ctx(ctx_),
+        type(type_)
     {}
 
 // the actual input stream
-    IteratorT first;            // actual input stream position 
+    IteratorT first;            // actual input stream position
     IteratorT last;             // end of input stream
     BOOST_WAVE_STRINGTYPE real_filename;  // real name of the current file
     BOOST_WAVE_STRINGTYPE real_relative_filename;  // real relative name of the current file
@@ -130,14 +132,14 @@ struct base_iteration_context
 };
 
 ///////////////////////////////////////////////////////////////////////////////
-//  
+//
 template <
-    typename ContextT, typename IteratorT, 
-    typename InputPolicyT = typename ContextT::input_policy_type 
+    typename ContextT, typename IteratorT,
+    typename InputPolicyT = typename ContextT::input_policy_type
 >
 struct iteration_context
 :   public base_iteration_context<ContextT, IteratorT>,
-    public InputPolicyT::template 
+    public InputPolicyT::template
         inner<iteration_context<ContextT, IteratorT, InputPolicyT> >
 {
     typedef IteratorT iterator_type;
@@ -146,10 +148,10 @@ struct iteration_context
     typedef base_iteration_context<ContextT, IteratorT> base_type;
     typedef iteration_context<ContextT, IteratorT, InputPolicyT> self_type;
 
-    iteration_context(ContextT& ctx, BOOST_WAVE_STRINGTYPE const &fname, 
-            position_type const &act_pos, 
+    iteration_context(ContextT& ctx, BOOST_WAVE_STRINGTYPE const &fname,
+            position_type const &act_pos,
             boost::wave::language_support language_,
-            typename base_type::file_type type = base_type::main_file) 
+            typename base_type::file_type type = base_type::main_file)
     :   base_iteration_context<ContextT, IteratorT>(ctx, fname, type)
     {
         InputPolicyT::template inner<self_type>::init_iterators(
diff --git a/include/boost/wave/cpp_throw.hpp b/include/boost/wave/cpp_throw.hpp
index 010e571..dbbd858 100644
--- a/include/boost/wave/cpp_throw.hpp
+++ b/include/boost/wave/cpp_throw.hpp
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
-    Copyright (c) 2001-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, 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 8f80cfb..0b478c3 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, 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 c69f8aa..d93a2e5 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, 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_generator.hpp b/include/boost/wave/cpplexer/cpp_lex_interface_generator.hpp
index 8e1bd77..73688ee 100644
--- a/include/boost/wave/cpplexer/cpp_lex_interface_generator.hpp
+++ b/include/boost/wave/cpplexer/cpp_lex_interface_generator.hpp
@@ -5,7 +5,7 @@
     
     http://www.boost.org/
 
-    Copyright (c) 2001-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, 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 fe93888..10b032a 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, 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 81e5895..c69ea50 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, 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 5ef0ca2..933c400 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, 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/detect_include_guards.hpp b/include/boost/wave/cpplexer/detect_include_guards.hpp
index 09463ff..286cd86 100644
--- a/include/boost/wave/cpplexer/detect_include_guards.hpp
+++ b/include/boost/wave/cpplexer/detect_include_guards.hpp
@@ -22,7 +22,7 @@
     will work as well). The code allows for any whitespace, newline and single 
     '#' tokens before the #if/#ifndef and after the final #endif.
 
-    Copyright (c) 2001-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, 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 7b24359..daf9065 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-2011 Hartmut Kaiser. 
+    Copyright (c) 2001-2012 Hartmut Kaiser. 
     Distributed under the Boost Software License, 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 5febbb4..527342b 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, 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 7487385..fa4b202 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, 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 e052558..11c5acd 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-2011 Hartmut Kaiser. 
+    Copyright (c) 2001-2012 Hartmut Kaiser. 
     Distributed under the Boost Software License, 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 4dedb48..39f75a2 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, 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 09b0a06..9429bd1 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, 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 c494f9f..ae563d0 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, 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 d6d3422..2e555cf 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, 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 3da519e..fd41a2b 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, 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 a52d36a..54c7477 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, 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 593c977..a575c9f 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, 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 0cd6e13..9703b3a 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, 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 d309e2e..9ef3559 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, 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 d582a07..d2d2212 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, 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 96ac8f6..b09ed71 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, 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 f6e2415..b06b98d 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, 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 4e66a53..dcbefda 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, 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 9d35a2f..bb7fd8a 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, 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_value_error.hpp b/include/boost/wave/grammars/cpp_value_error.hpp
index 9cba99a..b1043ea 100644
--- a/include/boost/wave/grammars/cpp_value_error.hpp
+++ b/include/boost/wave/grammars/cpp_value_error.hpp
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
-    Copyright (c) 2001-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, 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 f4e5998..1711c19 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, 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 b573113..212fad6 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, 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 a2edba7..e75743c 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, 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 f89f9ea..34960de 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, 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 29c2bec..d0f2fcb 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, 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 8441b41..5b6bcc3 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See accompanying file
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
@@ -61,32 +61,32 @@ namespace util {
 ///////////////////////////////////////////////////////////////////////////////
 // retrieve the macro name from the parse tree
 template <
-    typename ContextT, typename ParseNodeT, typename TokenT, 
+    typename ContextT, typename ParseNodeT, typename TokenT,
     typename PositionT
 >
-inline bool  
-retrieve_macroname(ContextT& ctx, ParseNodeT const &node, 
+inline bool
+retrieve_macroname(ContextT& ctx, ParseNodeT const &node,
     boost::spirit::classic::parser_id id, TokenT &macroname, PositionT& act_pos,
     bool update_position)
 {
 ParseNodeT const *name_node = 0;
 
     using boost::spirit::classic::find_node;
-    if (!find_node(node, id, &name_node)) 
+    if (!find_node(node, id, &name_node))
     {
         // ill formed define statement (unexpected, should not happen)
-        BOOST_WAVE_THROW_CTX(ctx, preprocess_exception, bad_define_statement, 
+        BOOST_WAVE_THROW_CTX(ctx, preprocess_exception, bad_define_statement,
             "bad parse tree (unexpected)", act_pos);
         return false;
     }
 
 typename ParseNodeT::children_t const &children = name_node->children;
 
-    if (0 == children.size() || 
-        children.front().value.begin() == children.front().value.end()) 
+    if (0 == children.size() ||
+        children.front().value.begin() == children.front().value.end())
     {
         // ill formed define statement (unexpected, should not happen)
-        BOOST_WAVE_THROW_CTX(ctx, preprocess_exception, bad_define_statement, 
+        BOOST_WAVE_THROW_CTX(ctx, preprocess_exception, bad_define_statement,
             "bad parse tree (unexpected)", act_pos);
         return false;
     }
@@ -103,9 +103,9 @@ typename ParseNodeT::children_t const &children = name_node->children;
 ///////////////////////////////////////////////////////////////////////////////
 // retrieve the macro parameters or the macro definition from the parse tree
 template <typename ParseNodeT, typename ContainerT, typename PositionT>
-inline bool  
+inline bool
 retrieve_macrodefinition(
-    ParseNodeT const &node, boost::spirit::classic::parser_id id, 
+    ParseNodeT const &node, boost::spirit::classic::parser_id id,
     ContainerT &macrodefinition, PositionT& act_pos, bool update_position)
 {
     using namespace boost::wave;
@@ -163,7 +163,7 @@ bool add_macro_definition(ContextT &ctx, std::string macrostring,
     typedef typename ContextT::token_type token_type;
     typedef typename ContextT::lexer_type lexer_type;
     typedef typename token_type::position_type position_type;
-    typedef boost::wave::grammars::predefined_macros_grammar_gen<lexer_type> 
+    typedef boost::wave::grammars::predefined_macros_grammar_gen<lexer_type>
         predef_macros_type;
 
     using namespace boost::wave;
@@ -178,12 +178,12 @@ std::string::iterator end = macrostring.end();
 
 // parse the macro definition
 position_type act_pos("<command line>");
-boost::spirit::classic::tree_parse_info<lexer_type> hit = 
+boost::spirit::classic::tree_parse_info<lexer_type> hit =
     predef_macros_type::parse_predefined_macro(
         lexer_type(begin, end, position_type(), language), lexer_type());
 
     if (!hit.match || (!hit.full && T_EOF != token_id(*hit.stop))) {
-        BOOST_WAVE_THROW_CTX(ctx, preprocess_exception, bad_macro_definition, 
+        BOOST_WAVE_THROW_CTX(ctx, preprocess_exception, bad_macro_definition,
             macrostring.c_str(), act_pos);
         return false;
     }
@@ -194,24 +194,24 @@ std::vector<token_type> macroparameters;
 typename ContextT::token_sequence_type macrodefinition;
 bool has_parameters = false;
 
-    if (!boost::wave::util::retrieve_macroname(ctx, *hit.trees.begin(), 
+    if (!boost::wave::util::retrieve_macroname(ctx, *hit.trees.begin(),
             BOOST_WAVE_PLAIN_DEFINE_ID, macroname, act_pos, true))
         return false;
-    has_parameters = boost::wave::util::retrieve_macrodefinition(*hit.trees.begin(), 
+    has_parameters = boost::wave::util::retrieve_macrodefinition(*hit.trees.begin(),
         BOOST_WAVE_MACRO_PARAMETERS_ID, macroparameters, act_pos, true);
-    boost::wave::util::retrieve_macrodefinition(*hit.trees.begin(), 
+    boost::wave::util::retrieve_macrodefinition(*hit.trees.begin(),
         BOOST_WAVE_MACRO_DEFINITION_ID, macrodefinition, act_pos, true);
 
-//  If no macrodefinition is given, and the macro string does not end with a 
+//  If no macrodefinition is given, and the macro string does not end with a
 //  '=', then the macro should be defined with the value '1'
-    if (0 == macrodefinition.size() && 
+    if (0 == macrodefinition.size() &&
         '=' != macrostring[macrostring.size()-1])
     {
         macrodefinition.push_back(token_type(T_INTLIT, "1", act_pos));
     }
 
 // add the new macro to the macromap
-    return ctx.add_macro_definition(macroname, has_parameters, macroparameters, 
+    return ctx.add_macro_definition(macroname, has_parameters, macroparameters,
         macrodefinition, is_predefined);
 }
 #endif // BOOST_WAVE_ENABLE_COMMANDLINE_MACROS != 0
@@ -226,11 +226,11 @@ template <typename ContextT> class pp_iterator;
 namespace impl {
 
 ///////////////////////////////////////////////////////////////////////////////
-//  
+//
 //  pp_iterator_functor
 //
 ///////////////////////////////////////////////////////////////////////////////
-template <typename ContextT> 
+template <typename ContextT>
 class pp_iterator_functor {
 
 public:
@@ -247,7 +247,7 @@ private:
     typedef typename ContextT::lexer_type               lexer_type;
     typedef typename result_type::string_type           string_type;
     typedef typename result_type::position_type         position_type;
-    typedef boost::wave::grammars::cpp_grammar_gen<lexer_type, token_sequence_type> 
+    typedef boost::wave::grammars::cpp_grammar_gen<lexer_type, token_sequence_type>
         cpp_grammar_type;
 
 //  iteration context related types (an iteration context represents a current
@@ -258,9 +258,9 @@ private:
 
 // parse tree related types
     typedef typename cpp_grammar_type::node_factory_type node_factory_type;
-    typedef boost::spirit::classic::tree_parse_info<lexer_type, node_factory_type> 
+    typedef boost::spirit::classic::tree_parse_info<lexer_type, node_factory_type>
         tree_parse_info_type;
-    typedef boost::spirit::classic::tree_match<lexer_type, node_factory_type> 
+    typedef boost::spirit::classic::tree_match<lexer_type, node_factory_type>
         parse_tree_match_type;
     typedef typename parse_tree_match_type::node_t       parse_node_type;       // tree_node<node_val_data<> >
     typedef typename parse_tree_match_type::parse_node_t parse_node_value_type; // node_val_data<>
@@ -268,16 +268,16 @@ private:
 
 public:
     template <typename IteratorT>
-    pp_iterator_functor(ContextT &ctx_, IteratorT const &first_, 
+    pp_iterator_functor(ContextT &ctx_, IteratorT const &first_,
             IteratorT const &last_, typename ContextT::position_type const &pos_)
-    :   ctx(ctx_), 
+    :   ctx(ctx_),
         iter_ctx(new base_iteration_context_type(ctx,
-                lexer_type(first_, last_, pos_, 
-                    boost::wave::enable_prefer_pp_numbers(ctx.get_language())), 
-                lexer_type(), 
+                lexer_type(first_, last_, pos_,
+                    boost::wave::enable_prefer_pp_numbers(ctx.get_language())),
+                lexer_type(),
                 pos_.get_file().c_str()
-            )), 
-        seen_newline(true), skipped_newline(false), 
+            )),
+        seen_newline(true), skipped_newline(false),
         must_emit_line_directive(false), act_pos(ctx_.get_main_pos()),
         whitespace(boost::wave::need_insert_whitespace(ctx.get_language()))
     {
@@ -296,7 +296,7 @@ public:
 
 protected:
     friend class pp_iterator<ContextT>;
-    bool on_include_helper(char const *t, char const *s, bool is_system, 
+    bool on_include_helper(char const *t, char const *s, bool is_system,
         bool include_next);
 
 protected:
@@ -369,10 +369,10 @@ private:
     token_sequence_type unput_queue;     // tokens to be preprocessed again
     token_sequence_type pending_queue;   // tokens already preprocessed
 
-    // detect whether to insert additional whitespace in between two adjacent 
-    // tokens, which otherwise would form a different token type, if 
+    // detect whether to insert additional whitespace in between two adjacent
+    // tokens, which otherwise would form a different token type, if
     // re-tokenized
-    boost::wave::util::insert_whitespace_detection whitespace; 
+    boost::wave::util::insert_whitespace_detection whitespace;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -384,14 +384,14 @@ typename pp_iterator_functor<ContextT>::result_type const
 ///////////////////////////////////////////////////////////////////////////////
 //
 //  returned_from_include()
-// 
+//
 //      Tests if it is necessary to pop the include file context (eof inside
 //      a file was reached). If yes, it pops this context. Preprocessing will
 //      continue with the next outer file scope.
 //
 ///////////////////////////////////////////////////////////////////////////////
-template <typename ContextT> 
-inline bool 
+template <typename ContextT>
+inline bool
 pp_iterator_functor<ContextT>::returned_from_include()
 {
     if (iter_ctx->first == iter_ctx->last && ctx.get_iteration_depth() > 0) {
@@ -402,7 +402,7 @@ pp_iterator_functor<ContextT>::returned_from_include()
         ctx.get_hooks().returning_from_include_file(ctx.derived());
 #endif
 
-    // restore the previous iteration context after finishing the preprocessing 
+    // restore the previous iteration context after finishing the preprocessing
     // of the included file
         BOOST_WAVE_STRINGTYPE oldfile = iter_ctx->real_filename;
         position_type old_pos (act_pos);
@@ -414,7 +414,7 @@ pp_iterator_functor<ContextT>::returned_from_include()
             if (iter_ctx->first.has_include_guards(guard_name))
                 ctx.add_pragma_once_header(ctx.get_current_filename(), guard_name);
         }
-#endif 
+#endif
         iter_ctx = ctx.pop_iteration_context();
 
         must_emit_line_directive = true;
@@ -426,13 +426,13 @@ pp_iterator_functor<ContextT>::returned_from_include()
         act_pos.set_line(iter_ctx->line);
         act_pos.set_column(0);
 
-    // restore the actual current file and directory 
+    // restore the actual current file and directory
 #if BOOST_WAVE_SUPPORT_PRAGMA_ONCE != 0
         namespace fs = boost::filesystem;
         fs::path rfp(wave::util::create_path(iter_ctx->real_filename.c_str()));
         std::string real_filename(rfp.string());
         ctx.set_current_filename(real_filename.c_str());
-#endif 
+#endif
         ctx.set_current_directory(iter_ctx->real_filename.c_str());
         ctx.set_current_relative_filename(iter_ctx->real_relative_filename.c_str());
 
@@ -441,7 +441,7 @@ pp_iterator_functor<ContextT>::returned_from_include()
         if (iter_ctx->if_block_depth != ctx.get_if_block_depth()) {
             using boost::wave::util::impl::escape_lit;
             BOOST_WAVE_STRINGTYPE msg(escape_lit(oldfile));
-            BOOST_WAVE_THROW_CTX(ctx, preprocess_exception, unbalanced_if_endif, 
+            BOOST_WAVE_THROW_CTX(ctx, preprocess_exception, unbalanced_if_endif,
                 msg.c_str(), old_pos);
         }
         return true;
@@ -458,12 +458,12 @@ pp_iterator_functor<ContextT>::returned_from_include()
 ///////////////////////////////////////////////////////////////////////////////
 namespace impl {
 
-    //  It may be necessary to emit a #line directive either 
-    //  - when comments need to be preserved: if the current token is not a 
+    //  It may be necessary to emit a #line directive either
+    //  - when comments need to be preserved: if the current token is not a
     //    whitespace, except comments
-    //  - when comments are to be skipped: if the current token is not a 
+    //  - when comments are to be skipped: if the current token is not a
     //    whitespace token.
-    template <typename ContextT> 
+    template <typename ContextT>
     bool consider_emitting_line_directive(ContextT const& ctx, token_id id)
     {
         if (need_preserve_comments(ctx.get_language())) {
@@ -472,7 +472,7 @@ namespace impl {
                 return true;
             }
         }
-        if (!IS_CATEGORY(id, WhiteSpaceTokenType) && 
+        if (!IS_CATEGORY(id, WhiteSpaceTokenType) &&
             !IS_CATEGORY(id, EOLTokenType) && !IS_CATEGORY(id, EOFTokenType))
         {
           return true;
@@ -481,7 +481,7 @@ namespace impl {
     }
 }
 
-template <typename ContextT> 
+template <typename ContextT>
 inline typename pp_iterator_functor<ContextT>::result_type const &
 pp_iterator_functor<ContextT>::operator()()
 {
@@ -519,11 +519,11 @@ pp_iterator_functor<ContextT>::operator()()
     }
 
 // if there were skipped any newlines, we must emit a #line directive
-    if ((must_emit_line_directive || (was_seen_newline && skipped_newline)) && 
-        impl::consider_emitting_line_directive(ctx, id)) 
+    if ((must_emit_line_directive || (was_seen_newline && skipped_newline)) &&
+        impl::consider_emitting_line_directive(ctx, id))
     {
     // must emit a #line directive
-        if (need_emit_line_directives(ctx.get_language()) && emit_line_directive()) 
+        if (need_emit_line_directives(ctx.get_language()) && emit_line_directive())
         {
             skipped_newline = false;
             ctx.get_hooks().may_skip_whitespace(ctx.derived(), act_token, skipped_newline);     // feed ws eater FSM
@@ -552,13 +552,13 @@ pp_iterator_functor<ContextT>::operator()()
 
 #if BOOST_WAVE_SUPPORT_CPP0X != 0
     case T_RAWSTRINGLIT:
-        iter_ctx->emitted_lines += 
+        iter_ctx->emitted_lines +=
             context_policies::util::rawstring_count_newlines(act_token);
         break;
 #endif
 
     case T_CCOMMENT:          // will come here only if whitespace is preserved
-        iter_ctx->emitted_lines += 
+        iter_ctx->emitted_lines +=
             context_policies::util::ccomment_count_newlines(act_token);
         break;
 
@@ -569,12 +569,12 @@ pp_iterator_functor<ContextT>::operator()()
             std::string pp_number(
                 util::to_string<std::string>(act_token.get_value()));
 
-            lexer_type it = lexer_type(pp_number.begin(), 
-                pp_number.end(), act_token.get_position(), 
+            lexer_type it = lexer_type(pp_number.begin(),
+                pp_number.end(), act_token.get_position(),
                 ctx.get_language());
             lexer_type end = lexer_type();
 
-            for (/**/; it != end && T_EOF != token_id(*it); ++it) 
+            for (/**/; it != end && T_EOF != token_id(*it); ++it)
                 rescanned.push_back(*it);
 
             pending_queue.splice(pending_queue.begin(), rescanned);
@@ -599,8 +599,8 @@ pp_iterator_functor<ContextT>::operator()()
     // tokens, which would form different (and wrong) tokens
         whitespace.shift_tokens(T_SPACE);
         pending_queue.push_front(act_token);        // push this token back
-        return act_token = result_type(T_SPACE, 
-            typename result_type::string_type(" "), 
+        return act_token = result_type(T_SPACE,
+            typename result_type::string_type(" "),
             act_token.get_position());
     }
     whitespace.shift_tokens(id);
@@ -608,7 +608,7 @@ pp_iterator_functor<ContextT>::operator()()
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-template <typename ContextT> 
+template <typename ContextT>
 inline typename pp_iterator_functor<ContextT>::result_type const &
 pp_iterator_functor<ContextT>::get_next_token()
 {
@@ -616,21 +616,21 @@ pp_iterator_functor<ContextT>::get_next_token()
 
 // if there is something in the unput_queue, then return the next token from
 // there (all tokens in the queue are preprocessed already)
-    if (!pending_queue.empty() || !unput_queue.empty()) 
+    if (!pending_queue.empty() || !unput_queue.empty())
         return pp_token();      // return next token
 
 // test for EOF, if there is a pending input context, pop it back and continue
 // parsing with it
 bool returned_from_include_file = returned_from_include();
 
-// try to generate the next token 
+// try to generate the next token
     if (iter_ctx->first != iter_ctx->last) {
         do {
-        // If there are pending tokens in the queue, we'll have to return 
+        // If there are pending tokens in the queue, we'll have to return
         // these. This may happen from a #pragma directive, which got replaced
         // by some token sequence.
             if (!pending_queue.empty()) {
-            util::on_exit::pop_front<token_sequence_type> 
+            util::on_exit::pop_front<token_sequence_type>
                 pop_front_token(pending_queue);
 
                 return act_token = pending_queue.front();
@@ -652,16 +652,16 @@ bool returned_from_include_file = returned_from_include();
                 ++iter_ctx->first;
 
             // now make sure this line has a newline
-                if ((!seen_newline || act_pos.get_column() > 1) && 
-                    !need_single_line(ctx.get_language())) 
+                if ((!seen_newline || act_pos.get_column() > 1) &&
+                    !need_single_line(ctx.get_language()))
                 {
                 // warn, if this file does not end with a newline
-                    BOOST_WAVE_THROW_CTX(ctx, preprocess_exception, 
+                    BOOST_WAVE_THROW_CTX(ctx, preprocess_exception,
                         last_line_not_terminated, "", act_pos);
                 }
                 continue;   // if this is the main file, the while loop breaks
             }
-            else if (T_NEWLINE == id || T_CPPCOMMENT == id) {   
+            else if (T_NEWLINE == id || T_CPPCOMMENT == id) {
             // a newline is to be returned ASAP, a C++ comment too
             // (the C++ comment token includes the trailing newline)
                 seen_newline = true;
@@ -673,7 +673,7 @@ bool returned_from_include_file = returned_from_include();
                     util::impl::call_skipped_token_hook(ctx, act_token);
                     continue;
                 }
-                return act_token; 
+                return act_token;
             }
             seen_newline = false;
 
@@ -684,17 +684,17 @@ bool returned_from_include_file = returned_from_include();
 //                 must_emit_line_directive = true;
 
             // loop to the next token to analyze
-            // simply fall through, since the iterator was already adjusted 
+            // simply fall through, since the iterator was already adjusted
             // correctly
             }
             else if (ctx.get_if_block_status()) {
-            // preprocess this token, eat up more, if appropriate, return 
+            // preprocess this token, eat up more, if appropriate, return
             // the next preprocessed token
                 return pp_token();
             }
             else {
-            // compilation condition is false: if the current token is a 
-            // newline, account for it, otherwise discard the actual token and 
+            // compilation condition is false: if the current token is a
+            // newline, account for it, otherwise discard the actual token and
             // try the next one
                 if (T_NEWLINE == token_id(act_token)) {
                     seen_newline = true;
@@ -706,14 +706,14 @@ bool returned_from_include_file = returned_from_include();
                 ++iter_ctx->first;
             }
 
-        } while ((iter_ctx->first != iter_ctx->last) || 
+        } while ((iter_ctx->first != iter_ctx->last) ||
                  (returned_from_include_file = returned_from_include()));
 
     // overall eof reached
-        if (ctx.get_if_block_depth() > 0 && !need_single_line(ctx.get_language())) 
+        if (ctx.get_if_block_depth() > 0 && !need_single_line(ctx.get_language()))
         {
         // missing endif directive(s)
-            BOOST_WAVE_THROW_CTX(ctx, preprocess_exception, 
+            BOOST_WAVE_THROW_CTX(ctx, preprocess_exception,
                 missing_matching_endif, "", act_pos);
         }
     }
@@ -730,7 +730,7 @@ bool returned_from_include_file = returned_from_include();
 //  emit_line_directive(): emits a line directive from the act_token data
 //
 ///////////////////////////////////////////////////////////////////////////////
-template <typename ContextT> 
+template <typename ContextT>
 inline bool
 pp_iterator_functor<ContextT>::emit_line_directive()
 {
@@ -738,7 +738,7 @@ pp_iterator_functor<ContextT>::emit_line_directive()
 
 typename ContextT::position_type pos = act_token.get_position();
 
-//     if (must_emit_line_directive && 
+//     if (must_emit_line_directive &&
 //         iter_ctx->emitted_lines+1 == act_pos.get_line() &&
 //         iter_ctx->filename == act_pos.get_file())
 //     {
@@ -746,14 +746,14 @@ typename ContextT::position_type pos = act_token.get_position();
 //         return false;
 //     }
 
-    if (must_emit_line_directive || 
-        iter_ctx->emitted_lines+1 != act_pos.get_line()) 
+    if (must_emit_line_directive ||
+        iter_ctx->emitted_lines+1 != act_pos.get_line())
     {
     // unput the current token
         pending_queue.push_front(act_token);
         pos.set_line(act_pos.get_line());
 
-        if (iter_ctx->emitted_lines+2 == act_pos.get_line()) {
+        if (iter_ctx->emitted_lines+2 == act_pos.get_line() && act_pos.get_line() != 1) {
         // prefer to output a single newline instead of the #line directive
 //             whitespace.shift_tokens(T_NEWLINE);
             act_token = result_type(T_NEWLINE, "\n", pos);
@@ -776,7 +776,7 @@ typename ContextT::position_type pos = act_token.get_position();
                 pos.set_column(column);      // account for '#line'
                 pending.push_back(result_type(T_SPACE, " ", pos));
 
-            // 21 is the max required size for a 64 bit integer represented as a 
+            // 21 is the max required size for a 64 bit integer represented as a
             // string
             char buffer[22];
 
@@ -822,7 +822,7 @@ typename ContextT::position_type pos = act_token.get_position();
 //  pptoken(): return the next preprocessed token
 //
 ///////////////////////////////////////////////////////////////////////////////
-template <typename ContextT> 
+template <typename ContextT>
 inline typename pp_iterator_functor<ContextT>::result_type const &
 pp_iterator_functor<ContextT>::pp_token()
 {
@@ -832,7 +832,7 @@ token_id id = token_id(*iter_ctx->first);
 
     // eat all T_PLACEHOLDER tokens, eventually slipped through out of the
     // macro engine
-    do { 
+    do {
         if (!pending_queue.empty()) {
         // if there are pending tokens in the queue, return the first one
             act_token = pending_queue.front();
@@ -840,14 +840,14 @@ token_id id = token_id(*iter_ctx->first);
             act_pos = act_token.get_position();
         }
         else if (!unput_queue.empty()
-              || T_IDENTIFIER == id 
+              || T_IDENTIFIER == id
               || IS_CATEGORY(id, KeywordTokenType)
               || IS_EXTCATEGORY(id, OperatorTokenType|AltExtTokenType)
               || IS_CATEGORY(id, BoolLiteralTokenType))
         {
         //  call the lexer, preprocess the required number of tokens, put them
         //  into the unput queue
-            act_token = ctx.expand_tokensequence(iter_ctx->first, 
+            act_token = ctx.expand_tokensequence(iter_ctx->first,
                 iter_ctx->last, pending_queue, unput_queue, skipped_newline);
         }
         else {
@@ -870,11 +870,11 @@ namespace impl {
 
     // call 'found_directive' preprocessing hook
     template <typename ContextT>
-    bool call_found_directive_hook(ContextT& ctx, 
+    bool call_found_directive_hook(ContextT& ctx,
         typename ContextT::token_type const& found_directive)
     {
 #if BOOST_WAVE_USE_DEPRECIATED_PREPROCESSING_HOOKS != 0
-        ctx.get_hooks().found_directive(found_directive);     
+        ctx.get_hooks().found_directive(found_directive);
 #else
         if (ctx.get_hooks().found_directive(ctx.derived(), found_directive))
             return true;    // skip this directive and return newline only
@@ -884,11 +884,11 @@ namespace impl {
 
 //     // call 'skipped_token' preprocessing hook
 //     template <typename ContextT>
-//     void call_skipped_token_hook(ContextT& ctx, 
+//     void call_skipped_token_hook(ContextT& ctx,
 //         typename ContextT::token_type const& skipped)
 //     {
 // #if BOOST_WAVE_USE_DEPRECIATED_PREPROCESSING_HOOKS != 0
-//         ctx.get_hooks().skipped_token(skipped);     
+//         ctx.get_hooks().skipped_token(skipped);
 // #else
 //         ctx.get_hooks().skipped_token(ctx.derived(), skipped);
 // #endif
@@ -907,7 +907,7 @@ namespace impl {
             if (IS_CATEGORY(id, EOLTokenType) || IS_CATEGORY(id, EOFTokenType))
                 break;          // do not enter a new line
             if (T_CPPCOMMENT == id ||
-                context_policies::util::ccomment_has_newline(*it)) 
+                context_policies::util::ccomment_has_newline(*it))
             {
                 break;
             }
@@ -934,7 +934,7 @@ namespace impl {
         token_id id = token_id(*it);
 
             if (T_CPPCOMMENT == id || T_NEWLINE == id ||
-                context_policies::util::ccomment_has_newline(*it)) 
+                context_policies::util::ccomment_has_newline(*it))
             {
                 if (call_hook)
                     util::impl::call_skipped_token_hook(ctx, *it);
@@ -954,7 +954,7 @@ namespace impl {
 
     ///////////////////////////////////////////////////////////////////////////
     template <typename ContextT, typename IteratorT>
-    bool skip_to_eol(ContextT &ctx, IteratorT &it, IteratorT const &end, 
+    bool skip_to_eol(ContextT &ctx, IteratorT &it, IteratorT const &end,
         bool call_hook = true)
     {
         using namespace boost::wave;
@@ -963,9 +963,9 @@ namespace impl {
         token_id id = token_id(*it);
 
             if (T_CPPCOMMENT == id || T_NEWLINE == id ||
-                context_policies::util::ccomment_has_newline(*it)) 
+                context_policies::util::ccomment_has_newline(*it))
             {
-                // always call hook for eol 
+                // always call hook for eol
                 util::impl::call_skipped_token_hook(ctx, *it);
                 ++it;           // skip eol/C/C++ comment
                 return true;    // found eol
@@ -995,12 +995,12 @@ namespace impl {
 ///////////////////////////////////////////////////////////////////////////////
 template <typename ContextT>
 template <typename IteratorT>
-inline bool 
+inline bool
 pp_iterator_functor<ContextT>::extract_identifier(IteratorT &it)
 {
     token_id id = util::impl::skip_whitespace(it, iter_ctx->last);
-    if (T_IDENTIFIER == id || IS_CATEGORY(id, KeywordTokenType) || 
-        IS_EXTCATEGORY(id, OperatorTokenType|AltExtTokenType) || 
+    if (T_IDENTIFIER == id || IS_CATEGORY(id, KeywordTokenType) ||
+        IS_EXTCATEGORY(id, OperatorTokenType|AltExtTokenType) ||
         IS_CATEGORY(id, BoolLiteralTokenType))
     {
         IteratorT save = it;
@@ -1022,10 +1022,10 @@ string_type str(util::impl::as_string<string_type>(iter_ctx->first, it));
 ///////////////////////////////////////////////////////////////////////////////
 template <typename ContextT>
 template <typename IteratorT>
-inline bool 
+inline bool
 pp_iterator_functor<ContextT>::ensure_is_last_on_line(IteratorT& it, bool call_hook)
 {
-    if (!impl::pp_is_last_on_line(ctx, it, iter_ctx->last, call_hook)) 
+    if (!impl::pp_is_last_on_line(ctx, it, iter_ctx->last, call_hook))
     {
     // enable error recovery (start over with the next line)
         impl::skip_to_eol(ctx, it, iter_ctx->last);
@@ -1041,15 +1041,15 @@ pp_iterator_functor<ContextT>::ensure_is_last_on_line(IteratorT& it, bool call_h
         return false;
     }
 
-    if (it == iter_ctx->last && !need_single_line(ctx.get_language())) 
+    if (it == iter_ctx->last && !need_single_line(ctx.get_language()))
     {
     // The line doesn't end with an eol but eof token.
         seen_newline = true;    // allow to resume after warning
         iter_ctx->first = it;
 
-    // Trigger a warning that the last line was not terminated with a 
+    // Trigger a warning that the last line was not terminated with a
     // newline.
-        BOOST_WAVE_THROW_CTX(ctx, preprocess_exception, 
+        BOOST_WAVE_THROW_CTX(ctx, preprocess_exception,
             last_line_not_terminated, "", act_pos);
 
         return false;
@@ -1059,20 +1059,20 @@ pp_iterator_functor<ContextT>::ensure_is_last_on_line(IteratorT& it, bool call_h
 
 template <typename ContextT>
 template <typename IteratorT>
-inline bool 
+inline bool
 pp_iterator_functor<ContextT>::skip_to_eol_with_check(IteratorT &it, bool call_hook)
 {
     typename ContextT::string_type value ((*it).get_value());
     if (!impl::skip_to_eol(ctx, it, iter_ctx->last, call_hook) &&
-        !need_single_line(ctx.get_language())) 
+        !need_single_line(ctx.get_language()))
     {
     // The line doesn't end with an eol but eof token.
         seen_newline = true;    // allow to resume after warning
         iter_ctx->first = it;
 
-    // Trigger a warning, that the last line was not terminated with a 
+    // Trigger a warning, that the last line was not terminated with a
     // newline.
-        BOOST_WAVE_THROW_CTX(ctx, preprocess_exception, 
+        BOOST_WAVE_THROW_CTX(ctx, preprocess_exception,
             last_line_not_terminated, "", act_pos);
         return false;
     }
@@ -1084,8 +1084,8 @@ pp_iterator_functor<ContextT>::skip_to_eol_with_check(IteratorT &it, bool call_h
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-//  handle_pp_directive: handle certain pp_directives 
-template <typename ContextT> 
+//  handle_pp_directive: handle certain pp_directives
+template <typename ContextT>
 template <typename IteratorT>
 inline bool
 pp_iterator_functor<ContextT>::handle_pp_directive(IteratorT &it)
@@ -1105,9 +1105,9 @@ pp_iterator_functor<ContextT>::handle_pp_directive(IteratorT &it)
 
             case T_PP_ELIF:         // #elif
                 if (!ctx.get_enclosing_if_block_status()) {
-                    if (!ctx.enter_elif_block(false)) { 
+                    if (!ctx.enter_elif_block(false)) {
                     // #else without matching #if
-                        BOOST_WAVE_THROW_CTX(ctx, preprocess_exception, 
+                        BOOST_WAVE_THROW_CTX(ctx, preprocess_exception,
                             missing_matching_if, "#elif", act_pos);
                         return true;  // do not analyze this directive any further
                     }
@@ -1126,7 +1126,7 @@ pp_iterator_functor<ContextT>::handle_pp_directive(IteratorT &it)
                     else
                         on_endif();
 
-                // make sure, there are no (non-whitespace) tokens left on 
+                // make sure, there are no (non-whitespace) tokens left on
                 // this line
                     ensure_is_last_on_line(it);
 
@@ -1156,11 +1156,11 @@ pp_iterator_functor<ContextT>::handle_pp_directive(IteratorT &it)
         case T_PP_QHEADER_NEXT:
 #endif
             include_next = (T_PP_QHEADER_NEXT == id) ? true : false;
-            if (!impl::call_found_directive_hook(ctx, *it)) 
+            if (!impl::call_found_directive_hook(ctx, *it))
             {
                 string_type dir((*it).get_value());
 
-            // make sure, there are no (non-whitespace) tokens left on 
+            // make sure, there are no (non-whitespace) tokens left on
             // this line
                 if (ensure_is_last_on_line(it))
                 {
@@ -1177,11 +1177,11 @@ pp_iterator_functor<ContextT>::handle_pp_directive(IteratorT &it)
         case T_PP_HHEADER_NEXT:
 #endif
             include_next = (T_PP_HHEADER_NEXT == id) ? true : false;
-            if (!impl::call_found_directive_hook(ctx, *it)) 
+            if (!impl::call_found_directive_hook(ctx, *it))
             {
                 string_type dir((*it).get_value());
 
-            // make sure, there are no (non-whitespace) tokens left on 
+            // make sure, there are no (non-whitespace) tokens left on
             // this line
                 if (ensure_is_last_on_line(it))
                 {
@@ -1203,7 +1203,7 @@ pp_iterator_functor<ContextT>::handle_pp_directive(IteratorT &it)
                 else
                     on_endif();
 
-            // make sure, there are no (non-whitespace) tokens left on 
+            // make sure, there are no (non-whitespace) tokens left on
             // this line
                 ensure_is_last_on_line(it);
 
@@ -1225,8 +1225,8 @@ pp_iterator_functor<ContextT>::handle_pp_directive(IteratorT &it)
 
         // extract first non-whitespace token as argument
         case T_PP_UNDEF:                // #undef
-            if (!impl::call_found_directive_hook(ctx, *it) && 
-                extract_identifier(it)) 
+            if (!impl::call_found_directive_hook(ctx, *it) &&
+                extract_identifier(it))
             {
                 on_undefine(it);
             }
@@ -1234,8 +1234,8 @@ pp_iterator_functor<ContextT>::handle_pp_directive(IteratorT &it)
             break;
 
         case T_PP_IFDEF:                // #ifdef
-            if (!impl::call_found_directive_hook(ctx, *it) && 
-                extract_identifier(it)) 
+            if (!impl::call_found_directive_hook(ctx, *it) &&
+                extract_identifier(it))
             {
                 on_ifdef(directive, it);
             }
@@ -1243,8 +1243,8 @@ pp_iterator_functor<ContextT>::handle_pp_directive(IteratorT &it)
             break;
 
         case T_PP_IFNDEF:               // #ifndef
-            if (!impl::call_found_directive_hook(ctx, *it) && 
-                extract_identifier(it)) 
+            if (!impl::call_found_directive_hook(ctx, *it) &&
+                extract_identifier(it))
             {
                 on_ifndef(directive, it);
             }
@@ -1254,8 +1254,8 @@ pp_iterator_functor<ContextT>::handle_pp_directive(IteratorT &it)
 #if BOOST_WAVE_SUPPORT_MS_EXTENSIONS != 0
 //         case T_MSEXT_PP_REGION:         // #region ...
 //             break;
-//             
-//         case T_MSEXT_PP_ENDREGION:      // #endregion 
+//
+//         case T_MSEXT_PP_ENDREGION:      // #endregion
 //             break;
 #endif
 
@@ -1275,7 +1275,7 @@ pp_iterator_functor<ContextT>::handle_pp_directive(IteratorT &it)
 
 ///////////////////////////////////////////////////////////////////////////////
 //  pp_directive(): recognize a preprocessor directive
-template <typename ContextT> 
+template <typename ContextT>
 inline bool
 pp_iterator_functor<ContextT>::pp_directive()
 {
@@ -1331,7 +1331,7 @@ lexer_type it = iter_ctx->first;
 // ignore/handle all pp directives not related to conditional compilation while
 // if block status is false
     if (handle_pp_directive(it)) {
-        // we may skip pp directives only if the current if block status is 
+        // we may skip pp directives only if the current if block status is
         // false or if it was a #include directive we could handle directly
         return true;    //  the pp directive has been handled/skipped
     }
@@ -1345,21 +1345,21 @@ tree_parse_info_type hit = cpp_grammar_type::parse_cpp_grammar(
     it, iter_ctx->last, act_pos, found_eof, found_directive, found_eoltokens);
 
     if (hit.match) {
-    // position the iterator past the matched sequence to allow 
+    // position the iterator past the matched sequence to allow
     // resynchronization, if an error occurs
         iter_ctx->first = hit.stop;
         seen_newline = true;
         must_emit_line_directive = true;
 
-    // found a valid pp directive, dispatch to the correct function to handle 
+    // found a valid pp directive, dispatch to the correct function to handle
     // the found pp directive
     bool result = dispatch_directive (hit, found_directive, found_eoltokens);
 
         if (found_eof && !need_single_line(ctx.get_language())) {
         // The line was terminated with an end of file token.
-        // So trigger a warning, that the last line was not terminated with a 
+        // So trigger a warning, that the last line was not terminated with a
         // newline.
-            BOOST_WAVE_THROW_CTX(ctx, preprocess_exception, 
+            BOOST_WAVE_THROW_CTX(ctx, preprocess_exception,
                 last_line_not_terminated, "", act_pos);
         }
         return result;
@@ -1384,7 +1384,7 @@ tree_parse_info_type hit = cpp_grammar_type::parse_cpp_grammar(
 //  dispatch_directive(): dispatch a recognized preprocessor directive
 //
 ///////////////////////////////////////////////////////////////////////////////
-template <typename ContextT> 
+template <typename ContextT>
 inline bool
 pp_iterator_functor<ContextT>::dispatch_directive(
     tree_parse_info_type const &hit, result_type const& found_directive,
@@ -1408,30 +1408,30 @@ const_child_iterator_t end_child_it = (*root.begin()).children.end();
 token_id id = token_id(found_directive);
 
     // call preprocessing hook
-    if (impl::call_found_directive_hook(ctx, found_directive)) 
+    if (impl::call_found_directive_hook(ctx, found_directive))
         return true;    // skip this directive and return newline only
 
     switch (static_cast<unsigned int>(id)) {
 //     case T_PP_QHEADER:      // #include "..."
 // #if BOOST_WAVE_SUPPORT_INCLUDE_NEXT != 0
 //     case T_PP_QHEADER_NEXT: // #include_next "..."
-// #endif 
-//         on_include ((*nodeval.begin()).get_value(), false, 
+// #endif
+//         on_include ((*nodeval.begin()).get_value(), false,
 //             T_PP_QHEADER_NEXT == id);
 //         break;
 
 //     case T_PP_HHEADER:      // #include <...>
 // #if BOOST_WAVE_SUPPORT_INCLUDE_NEXT != 0
 //     case T_PP_HHEADER_NEXT: // #include_next <...>
-// #endif 
-//         on_include ((*nodeval.begin()).get_value(), true, 
+// #endif
+//         on_include ((*nodeval.begin()).get_value(), true,
 //             T_PP_HHEADER_NEXT == id);
 //         break;
-    
+
     case T_PP_INCLUDE:      // #include ...
 #if BOOST_WAVE_SUPPORT_INCLUDE_NEXT != 0
     case T_PP_INCLUDE_NEXT: // #include_next ...
-#endif 
+#endif
         on_include (begin_child_it, end_child_it, T_PP_INCLUDE_NEXT == id);
         break;
 
@@ -1442,11 +1442,11 @@ token_id id = token_id(found_directive);
 //     case T_PP_UNDEF:        // #undef
 //         on_undefine(*nodeval.begin());
 //         break;
-// 
+//
 //     case T_PP_IFDEF:        // #ifdef
 //         on_ifdef(found_directive, begin_child_it, end_child_it);
 //         break;
-// 
+//
 //     case T_PP_IFNDEF:       // #ifndef
 //         on_ifndef(found_directive, begin_child_it, end_child_it);
 //         break;
@@ -1479,7 +1479,7 @@ token_id id = token_id(found_directive);
     case T_PP_WARNING:      // #warning
         on_warning(begin_child_it, end_child_it);
         break;
-#endif 
+#endif
 
     case T_PP_PRAGMA:       // #pragma
         return on_pragma(begin_child_it, end_child_it);
@@ -1492,14 +1492,14 @@ token_id id = token_id(found_directive);
 
     default:                // #something else
         on_illformed((*nodeval.begin()).get_value());
-        
-        // if we end up here, we have been instructed to ignore the error, so 
+
+        // if we end up here, we have been instructed to ignore the error, so
         // we simply copy the whole construct to the output
         {
             token_sequence_type expanded;
             get_token_value<result_type, parse_node_type> get_value;
 
-            std::copy(make_ref_transform_iterator(begin_child_it, get_value), 
+            std::copy(make_ref_transform_iterator(begin_child_it, get_value),
                 make_ref_transform_iterator(end_child_it, get_value),
                 std::inserter(expanded, expanded.end()));
             pending_queue.splice(pending_queue.begin(), expanded);
@@ -1514,14 +1514,14 @@ token_id id = token_id(found_directive);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-// 
+//
 //  on_include: handle #include <...> or #include "..." directives
 //
 ///////////////////////////////////////////////////////////////////////////////
-template <typename ContextT> 
-inline void  
-pp_iterator_functor<ContextT>::on_include (string_type const &s, 
-    bool is_system, bool include_next) 
+template <typename ContextT>
+inline void
+pp_iterator_functor<ContextT>::on_include (string_type const &s,
+    bool is_system, bool include_next)
 {
     BOOST_ASSERT(ctx.get_if_block_status());
 
@@ -1529,16 +1529,16 @@ pp_iterator_functor<ContextT>::on_include (string_type const &s,
 typename string_type::size_type pos_end = s.find_last_of(is_system ? '>' : '\"');
 
     if (string_type::npos == pos_end) {
-        BOOST_WAVE_THROW_CTX(ctx, preprocess_exception, bad_include_statement, 
+        BOOST_WAVE_THROW_CTX(ctx, preprocess_exception, bad_include_statement,
             s.c_str(), act_pos);
         return;
     }
 
-typename string_type::size_type pos_begin = 
+typename string_type::size_type pos_begin =
     s.find_last_of(is_system ? '<' : '\"', pos_end-1);
 
     if (string_type::npos == pos_begin) {
-        BOOST_WAVE_THROW_CTX(ctx, preprocess_exception, bad_include_statement, 
+        BOOST_WAVE_THROW_CTX(ctx, preprocess_exception, bad_include_statement,
             s.c_str(), act_pos);
         return;
     }
@@ -1547,14 +1547,14 @@ std::string file_token(s.substr(pos_begin, pos_end-pos_begin+1).c_str());
 std::string file_path(s.substr(pos_begin+1, pos_end-pos_begin-1).c_str());
 
 // finally include the file
-    on_include_helper(file_token.c_str(), file_path.c_str(), is_system, 
+    on_include_helper(file_token.c_str(), file_path.c_str(), is_system,
         include_next);
 }
 
-template <typename ContextT> 
-inline bool  
-pp_iterator_functor<ContextT>::on_include_helper (char const *f, char const *s, 
-    bool is_system, bool include_next) 
+template <typename ContextT>
+inline bool
+pp_iterator_functor<ContextT>::on_include_helper (char const *f, char const *s,
+    bool is_system, bool include_next)
 {
     namespace fs = boost::filesystem;
 
@@ -1572,31 +1572,31 @@ char const *current_name = 0;   // never try to match current file name
     ctx.get_hooks().found_include_directive(f, include_next);
 #else
     if (ctx.get_hooks().found_include_directive(ctx.derived(), f, include_next))
-        return true;    // client returned false: skip file to include 
+        return true;    // client returned false: skip file to include
 #endif
 
     file_path = util::impl::unescape_lit(file_path);
     std::string native_path_str;
 
-    if (!ctx.get_hooks().locate_include_file(ctx, file_path, is_system, 
-            current_name, dir_path, native_path_str)) 
+    if (!ctx.get_hooks().locate_include_file(ctx, file_path, is_system,
+            current_name, dir_path, native_path_str))
     {
-        BOOST_WAVE_THROW_CTX(ctx, preprocess_exception, bad_include_file, 
+        BOOST_WAVE_THROW_CTX(ctx, preprocess_exception, bad_include_file,
             file_path.c_str(), act_pos);
         return false;
     }
 
 // test, if this file is known through a #pragma once directive
 #if BOOST_WAVE_SUPPORT_PRAGMA_ONCE != 0
-    if (!ctx.has_pragma_once(native_path_str)) 
-#endif 
+    if (!ctx.has_pragma_once(native_path_str))
+#endif
     {
     // the new include file determines the actual current directory
         ctx.set_current_directory(native_path_str.c_str());
 
     // preprocess the opened file
     boost::shared_ptr<base_iteration_context_type> new_iter_ctx (
-        new iteration_context_type(ctx, native_path_str.c_str(), act_pos, 
+        new iteration_context_type(ctx, native_path_str.c_str(), act_pos,
             boost::wave::enable_prefer_pp_numbers(ctx.get_language()),
             is_system ? base_iteration_context_type::system_header :
                 base_iteration_context_type::user_header));
@@ -1628,7 +1628,7 @@ char const *current_name = 0;   // never try to match current file name
         fs::path rfp(wave::util::create_path(iter_ctx->real_filename.c_str()));
         std::string real_filename(rfp.string());
         ctx.set_current_filename(real_filename.c_str());
-#endif 
+#endif
 
         ctx.set_current_relative_filename(dir_path.c_str());
         iter_ctx->real_relative_filename = dir_path.c_str();
@@ -1640,7 +1640,7 @@ char const *current_name = 0;   // never try to match current file name
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-//  
+//
 //  on_include(): handle #include ... directives
 //
 ///////////////////////////////////////////////////////////////////////////////
@@ -1649,7 +1649,7 @@ namespace impl {
 
     // trim all whitespace from the beginning and the end of the given string
     template <typename StringT>
-    inline StringT 
+    inline StringT
     trim_whitespace(StringT const &s)
     {
         typedef typename StringT::size_type size_type;
@@ -1662,8 +1662,8 @@ namespace impl {
     }
 }
 
-template <typename ContextT> 
-inline void  
+template <typename ContextT>
+inline void
 pp_iterator_functor<ContextT>::on_include(
     typename parse_tree_type::const_iterator const &begin,
     typename parse_tree_type::const_iterator const &end, bool include_next)
@@ -1675,12 +1675,12 @@ get_token_value<result_type, parse_node_type> get_value;
 token_sequence_type expanded;
 token_sequence_type toexpand;
 
-    std::copy(make_ref_transform_iterator(begin, get_value), 
+    std::copy(make_ref_transform_iterator(begin, get_value),
         make_ref_transform_iterator(end, get_value),
         std::inserter(toexpand, toexpand.end()));
 
     typename token_sequence_type::iterator begin2 = toexpand.begin();
-    ctx.expand_whole_tokensequence(begin2, toexpand.end(), expanded, 
+    ctx.expand_whole_tokensequence(begin2, toexpand.end(), expanded,
         false);
 
 // now, include the file
@@ -1689,7 +1689,7 @@ bool is_system = '<' == s[0] && '>' == s[s.size()-1];
 
     if (!is_system && !('\"' == s[0] && '\"' == s[s.size()-1])) {
     // should resolve into something like <...> or "..."
-        BOOST_WAVE_THROW_CTX(ctx, preprocess_exception, bad_include_statement, 
+        BOOST_WAVE_THROW_CTX(ctx, preprocess_exception, bad_include_statement,
             s.c_str(), act_pos);
         return;
     }
@@ -1697,14 +1697,14 @@ bool is_system = '<' == s[0] && '>' == s[s.size()-1];
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-//  
+//
 //  on_define(): handle #define directives
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-template <typename ContextT> 
-inline void  
-pp_iterator_functor<ContextT>::on_define (parse_node_type const &node) 
+template <typename ContextT>
+inline void
+pp_iterator_functor<ContextT>::on_define (parse_node_type const &node)
 {
     BOOST_ASSERT(ctx.get_if_block_status());
 
@@ -1715,12 +1715,12 @@ token_sequence_type macrodefinition;
 bool has_parameters = false;
 position_type pos(act_token.get_position());
 
-    if (!boost::wave::util::retrieve_macroname(ctx, node, 
+    if (!boost::wave::util::retrieve_macroname(ctx, node,
             BOOST_WAVE_PLAIN_DEFINE_ID, macroname, pos, false))
         return;
-    has_parameters = boost::wave::util::retrieve_macrodefinition(node, 
+    has_parameters = boost::wave::util::retrieve_macrodefinition(node,
         BOOST_WAVE_MACRO_PARAMETERS_ID, macroparameters, pos, false);
-    boost::wave::util::retrieve_macrodefinition(node, 
+    boost::wave::util::retrieve_macrodefinition(node,
         BOOST_WAVE_MACRO_DEFINITION_ID, macrodefinition, pos, false);
 
     if (has_parameters) {
@@ -1729,44 +1729,44 @@ position_type pos(act_token.get_position());
         // test whether ellipsis are given, and if yes, if these are placed as the
         // last argument, test if __VA_ARGS__ is used as a macro parameter name
             using namespace cpplexer;
-            typedef typename std::vector<result_type>::iterator 
+            typedef typename std::vector<result_type>::iterator
                 parameter_iterator_t;
 
             bool seen_ellipses = false;
             parameter_iterator_t end = macroparameters.end();
-            for (parameter_iterator_t pit = macroparameters.begin(); 
-                pit != end; ++pit) 
+            for (parameter_iterator_t pit = macroparameters.begin();
+                pit != end; ++pit)
             {
                 if (seen_ellipses) {
                 // ellipses are not the last given formal argument
-                    BOOST_WAVE_THROW_CTX(ctx, preprocess_exception, 
-                        bad_define_statement, macroname.get_value().c_str(), 
+                    BOOST_WAVE_THROW_CTX(ctx, preprocess_exception,
+                        bad_define_statement, macroname.get_value().c_str(),
                         (*pit).get_position());
                     return;
                 }
-                if (T_ELLIPSIS == token_id(*pit)) 
+                if (T_ELLIPSIS == token_id(*pit))
                     seen_ellipses = true;
 
                 // can't use __VA_ARGS__ as a argument name
                 if ("__VA_ARGS__" == (*pit).get_value()) {
-                    BOOST_WAVE_THROW_CTX(ctx, preprocess_exception, 
-                        bad_define_statement_va_args, 
+                    BOOST_WAVE_THROW_CTX(ctx, preprocess_exception,
+                        bad_define_statement_va_args,
                         macroname.get_value().c_str(), (*pit).get_position());
                     return;
                 }
             }
 
-        // if there wasn't an ellipsis, then there shouldn't be a __VA_ARGS__ 
+        // if there wasn't an ellipsis, then there shouldn't be a __VA_ARGS__
         // placeholder in the definition too [C99 Standard 6.10.3.5]
             if (!seen_ellipses) {
                 typedef typename token_sequence_type::iterator definition_iterator_t;
 
                 bool seen_va_args = false;
                 definition_iterator_t pend = macrodefinition.end();
-                for (definition_iterator_t dit = macrodefinition.begin(); 
-                     dit != pend; ++dit) 
+                for (definition_iterator_t dit = macrodefinition.begin();
+                     dit != pend; ++dit)
                 {
-                    if (T_IDENTIFIER == token_id(*dit) && 
+                    if (T_IDENTIFIER == token_id(*dit) &&
                         "__VA_ARGS__" == (*dit).get_value())
                     {
                         seen_va_args = true;
@@ -1774,8 +1774,8 @@ position_type pos(act_token.get_position());
                 }
                 if (seen_va_args) {
                 // must not have seen __VA_ARGS__ placeholder
-                    BOOST_WAVE_THROW_CTX(ctx, preprocess_exception, 
-                        bad_define_statement_va_args, 
+                    BOOST_WAVE_THROW_CTX(ctx, preprocess_exception,
+                        bad_define_statement_va_args,
                         macroname.get_value().c_str(), act_token.get_position());
                     return;
                 }
@@ -1786,17 +1786,17 @@ position_type pos(act_token.get_position());
         {
         // test, that there is no T_ELLIPSES given
             using namespace cpplexer;
-            typedef typename std::vector<result_type>::iterator 
+            typedef typename std::vector<result_type>::iterator
                 parameter_iterator_t;
 
             parameter_iterator_t end = macroparameters.end();
-            for (parameter_iterator_t pit = macroparameters.begin(); 
-                pit != end; ++pit) 
+            for (parameter_iterator_t pit = macroparameters.begin();
+                pit != end; ++pit)
             {
                 if (T_ELLIPSIS == token_id(*pit)) {
                 // if variadics are disabled, no ellipses should be given
-                    BOOST_WAVE_THROW_CTX(ctx, preprocess_exception, 
-                        bad_define_statement, macroname.get_value().c_str(), 
+                    BOOST_WAVE_THROW_CTX(ctx, preprocess_exception,
+                        bad_define_statement, macroname.get_value().c_str(),
                         (*pit).get_position());
                     return;
                 }
@@ -1805,17 +1805,17 @@ position_type pos(act_token.get_position());
     }
 
 // add the new macro to the macromap
-    ctx.add_macro_definition(macroname, has_parameters, macroparameters, 
+    ctx.add_macro_definition(macroname, has_parameters, macroparameters,
         macrodefinition);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-//  
+//
 //  on_undefine(): handle #undef directives
 //
 ///////////////////////////////////////////////////////////////////////////////
-template <typename ContextT> 
-inline void  
+template <typename ContextT>
+inline void
 pp_iterator_functor<ContextT>::on_undefine (lexer_type const &it)
 {
     BOOST_ASSERT(ctx.get_if_block_status());
@@ -1825,12 +1825,12 @@ pp_iterator_functor<ContextT>::on_undefine (lexer_type const &it)
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-//  
+//
 //  on_ifdef(): handle #ifdef directives
 //
 ///////////////////////////////////////////////////////////////////////////////
-template <typename ContextT> 
-inline void  
+template <typename ContextT>
+inline void
 pp_iterator_functor<ContextT>::on_ifdef(
     result_type const& found_directive, lexer_type const &it)
 //     typename parse_tree_type::const_iterator const &it)
@@ -1838,8 +1838,8 @@ pp_iterator_functor<ContextT>::on_ifdef(
 {
 // get_token_value<result_type, parse_node_type> get_value;
 // token_sequence_type toexpand;
-// 
-//     std::copy(make_ref_transform_iterator((*begin).children.begin(), get_value), 
+//
+//     std::copy(make_ref_transform_iterator((*begin).children.begin(), get_value),
 //         make_ref_transform_iterator((*begin).children.end(), get_value),
 //         std::inserter(toexpand, toexpand.end()));
 
@@ -1854,19 +1854,19 @@ token_sequence_type directive;
 #else
     do {
         is_defined = ctx.is_defined_macro((*it).get_value()); // toexpand.begin(), toexpand.end());
-    } while (ctx.get_hooks().evaluated_conditional_expression(ctx.derived(), 
+    } while (ctx.get_hooks().evaluated_conditional_expression(ctx.derived(),
              found_directive, directive, is_defined));
 #endif
     ctx.enter_if_block(is_defined);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-//  
+//
 //  on_ifndef(): handle #ifndef directives
 //
 ///////////////////////////////////////////////////////////////////////////////
-template <typename ContextT> 
-inline void  
+template <typename ContextT>
+inline void
 pp_iterator_functor<ContextT>::on_ifndef(
     result_type const& found_directive, lexer_type const &it)
 //     typename parse_tree_type::const_iterator const &it)
@@ -1874,8 +1874,8 @@ pp_iterator_functor<ContextT>::on_ifndef(
 {
 // get_token_value<result_type, parse_node_type> get_value;
 // token_sequence_type toexpand;
-// 
-//     std::copy(make_ref_transform_iterator((*begin).children.begin(), get_value), 
+//
+//     std::copy(make_ref_transform_iterator((*begin).children.begin(), get_value),
 //         make_ref_transform_iterator((*begin).children.end(), get_value),
 //         std::inserter(toexpand, toexpand.end()));
 
@@ -1890,48 +1890,48 @@ token_sequence_type directive;
 #else
     do {
         is_defined = ctx.is_defined_macro((*it).get_value()); // toexpand.begin(), toexpand.end());
-    } while (ctx.get_hooks().evaluated_conditional_expression(ctx.derived(), 
+    } while (ctx.get_hooks().evaluated_conditional_expression(ctx.derived(),
              found_directive, directive, is_defined));
 #endif
     ctx.enter_if_block(!is_defined);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-//  
+//
 //  on_else(): handle #else directives
 //
 ///////////////////////////////////////////////////////////////////////////////
-template <typename ContextT> 
-inline void  
+template <typename ContextT>
+inline void
 pp_iterator_functor<ContextT>::on_else()
 {
     if (!ctx.enter_else_block()) {
     // #else without matching #if
-        BOOST_WAVE_THROW_CTX(ctx, preprocess_exception, missing_matching_if, 
+        BOOST_WAVE_THROW_CTX(ctx, preprocess_exception, missing_matching_if,
             "#else", act_pos);
     }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-//  
+//
 //  on_endif(): handle #endif directives
 //
 ///////////////////////////////////////////////////////////////////////////////
-template <typename ContextT> 
-inline void  
+template <typename ContextT>
+inline void
 pp_iterator_functor<ContextT>::on_endif()
 {
     if (!ctx.exit_if_block()) {
     // #endif without matching #if
-        BOOST_WAVE_THROW_CTX(ctx, preprocess_exception, missing_matching_if, 
+        BOOST_WAVE_THROW_CTX(ctx, preprocess_exception, missing_matching_if,
             "#endif", act_pos);
     }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 //  replace all remaining (== undefined) identifiers with an integer literal '0'
-template <typename ContextT> 
-inline void  
+template <typename ContextT>
+inline void
 pp_iterator_functor<ContextT>::replace_undefined_identifiers(
     token_sequence_type &expanded)
 {
@@ -1940,7 +1940,7 @@ pp_iterator_functor<ContextT>::replace_undefined_identifiers(
          exp_it != exp_end; ++exp_it)
     {
         using namespace boost::wave;
-        
+
         token_id id = token_id(*exp_it);
         if (IS_CATEGORY(id, IdentifierTokenType) ||
             IS_CATEGORY(id, KeywordTokenType))
@@ -1952,12 +1952,12 @@ pp_iterator_functor<ContextT>::replace_undefined_identifiers(
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-//  
+//
 //  on_if(): handle #if directives
 //
 ///////////////////////////////////////////////////////////////////////////////
-template <typename ContextT> 
-inline void  
+template <typename ContextT>
+inline void
 pp_iterator_functor<ContextT>::on_if(
     result_type const& found_directive,
     typename parse_tree_type::const_iterator const &begin,
@@ -1967,7 +1967,7 @@ pp_iterator_functor<ContextT>::on_if(
 get_token_value<result_type, parse_node_type> get_value;
 token_sequence_type toexpand;
 
-    std::copy(make_ref_transform_iterator(begin, get_value), 
+    std::copy(make_ref_transform_iterator(begin, get_value),
         make_ref_transform_iterator(end, get_value),
         std::inserter(toexpand, toexpand.end()));
 
@@ -1990,7 +1990,7 @@ token_sequence_type expanded;
         {
             string_type outstr(boost::wave::util::impl::as_string(toexpand));
             outstr += "(" + boost::wave::util::impl::as_string(expanded) + ")";
-            BOOST_WAVE_DUMP_CONDITIONAL_EXPRESSIONS_OUT << "#if " << outstr 
+            BOOST_WAVE_DUMP_CONDITIONAL_EXPRESSIONS_OUT << "#if " << outstr
                 << std::endl;
         }
 #endif
@@ -2010,8 +2010,8 @@ token_sequence_type expanded;
         ctx.get_hooks().evaluated_conditional_expression(toexpand, if_status);
     } while (false);
 #else
-    } while (ctx.get_hooks().evaluated_conditional_expression(ctx.derived(), 
-                found_directive, toexpand, if_status) 
+    } while (ctx.get_hooks().evaluated_conditional_expression(ctx.derived(),
+                found_directive, toexpand, if_status)
              && status == grammars::error_noerror);
 #endif
 
@@ -2019,31 +2019,31 @@ token_sequence_type expanded;
     if (grammars::error_noerror != status) {
     // division or other error by zero occurred
         string_type expression = util::impl::as_string(expanded);
-        if (0 == expression.size()) 
+        if (0 == expression.size())
             expression = "<empty expression>";
 
         if (grammars::error_division_by_zero & status) {
-            BOOST_WAVE_THROW_CTX(ctx, preprocess_exception, division_by_zero, 
+            BOOST_WAVE_THROW_CTX(ctx, preprocess_exception, division_by_zero,
                 expression.c_str(), act_pos);
         }
         else if (grammars::error_integer_overflow & status) {
-            BOOST_WAVE_THROW_CTX(ctx, preprocess_exception, integer_overflow, 
+            BOOST_WAVE_THROW_CTX(ctx, preprocess_exception, integer_overflow,
                 expression.c_str(), act_pos);
         }
         else if (grammars::error_character_overflow & status) {
-            BOOST_WAVE_THROW_CTX(ctx, preprocess_exception, 
+            BOOST_WAVE_THROW_CTX(ctx, preprocess_exception,
                 character_literal_out_of_range, expression.c_str(), act_pos);
         }
     }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-//  
+//
 //  on_elif(): handle #elif directives
 //
 ///////////////////////////////////////////////////////////////////////////////
-template <typename ContextT> 
-inline void  
+template <typename ContextT>
+inline void
 pp_iterator_functor<ContextT>::on_elif(
     result_type const& found_directive,
     typename parse_tree_type::const_iterator const &begin,
@@ -2053,7 +2053,7 @@ pp_iterator_functor<ContextT>::on_elif(
 get_token_value<result_type, parse_node_type> get_value;
 token_sequence_type toexpand;
 
-    std::copy(make_ref_transform_iterator(begin, get_value), 
+    std::copy(make_ref_transform_iterator(begin, get_value),
         make_ref_transform_iterator(end, get_value),
         std::inserter(toexpand, toexpand.end()));
 
@@ -2063,7 +2063,7 @@ token_sequence_type toexpand;
     if (ctx.get_if_block_some_part_status()) {
         if (!ctx.enter_elif_block(false)) {
         // #else without matching #if
-            BOOST_WAVE_THROW_CTX(ctx, preprocess_exception, 
+            BOOST_WAVE_THROW_CTX(ctx, preprocess_exception,
                 missing_matching_if, "#elif", act_pos);
             // fall through...
         }
@@ -2072,7 +2072,7 @@ token_sequence_type toexpand;
     typename token_sequence_type::iterator begin2 = toexpand.begin();
 
         impl::skip_to_eol(ctx, begin2, toexpand.end());
-        return;     // one of previous #if/#elif was true, so don't enter this #elif 
+        return;     // one of previous #if/#elif was true, so don't enter this #elif
     }
 
 // preprocess the given sequence into the provided list
@@ -2082,7 +2082,7 @@ token_sequence_type expanded;
 
     do {
         expanded.clear();
-        
+
         typename token_sequence_type::iterator begin2 = toexpand.begin();
         ctx.expand_whole_tokensequence(begin2, toexpand.end(), expanded);
 
@@ -2112,14 +2112,14 @@ token_sequence_type expanded;
         ctx.get_hooks().evaluated_conditional_expression(toexpand, if_status);
     } while (false);
 #else
-    } while (ctx.get_hooks().evaluated_conditional_expression(ctx.derived(), 
-                found_directive, toexpand, if_status) 
+    } while (ctx.get_hooks().evaluated_conditional_expression(ctx.derived(),
+                found_directive, toexpand, if_status)
              && status == grammars::error_noerror);
 #endif
 
-    if (!ctx.enter_elif_block(if_status)) { 
+    if (!ctx.enter_elif_block(if_status)) {
     // #elif without matching #if
-        BOOST_WAVE_THROW_CTX(ctx, preprocess_exception, missing_matching_if, 
+        BOOST_WAVE_THROW_CTX(ctx, preprocess_exception, missing_matching_if,
             "#elif", act_pos);
         return;
     }
@@ -2127,48 +2127,48 @@ token_sequence_type expanded;
     if (grammars::error_noerror != status) {
     // division or other error by zero occurred
         string_type expression = util::impl::as_string(expanded);
-        if (0 == expression.size()) 
+        if (0 == expression.size())
             expression = "<empty expression>";
-            
+
         if (grammars::error_division_by_zero & status) {
-            BOOST_WAVE_THROW_CTX(ctx, preprocess_exception, division_by_zero, 
+            BOOST_WAVE_THROW_CTX(ctx, preprocess_exception, division_by_zero,
                 expression.c_str(), act_pos);
         }
         else if (grammars::error_integer_overflow & status) {
-            BOOST_WAVE_THROW_CTX(ctx, preprocess_exception, 
+            BOOST_WAVE_THROW_CTX(ctx, preprocess_exception,
                 integer_overflow, expression.c_str(), act_pos);
         }
         else if (grammars::error_character_overflow & status) {
-            BOOST_WAVE_THROW_CTX(ctx, preprocess_exception, 
+            BOOST_WAVE_THROW_CTX(ctx, preprocess_exception,
                 character_literal_out_of_range, expression.c_str(), act_pos);
         }
     }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-//  
+//
 //  on_illformed(): handles the illegal directive
 //
 ///////////////////////////////////////////////////////////////////////////////
-template <typename ContextT> 
-inline void  
+template <typename ContextT>
+inline void
 pp_iterator_functor<ContextT>::on_illformed(
     typename result_type::string_type s)
 {
     BOOST_ASSERT(ctx.get_if_block_status());
-    
+
     // some messages have more than one newline at the end
     typename string_type::size_type p = s.find_last_not_of('\n');
     if (string_type::npos != p)
         s = s.substr(0, p+1);
 
     // throw the exception
-    BOOST_WAVE_THROW_CTX(ctx, preprocess_exception, ill_formed_directive, 
+    BOOST_WAVE_THROW_CTX(ctx, preprocess_exception, ill_formed_directive,
         s.c_str(), act_pos);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-//  
+//
 //  on_line(): handle #line directives
 //
 ///////////////////////////////////////////////////////////////////////////////
@@ -2177,7 +2177,7 @@ namespace impl {
 
     template <typename IteratorT, typename StringT>
     bool retrieve_line_info (IteratorT first, IteratorT const &last,
-        unsigned int &line, StringT &file, 
+        unsigned int &line, StringT &file,
         boost::wave::preprocess_exception::error_code& error)
     {
         using namespace boost::wave;
@@ -2195,7 +2195,7 @@ namespace impl {
                 error = preprocess_exception::bad_line_number;
 
         // extract file name (if it is given)
-            while (++first != last && IS_CATEGORY(*first, WhiteSpaceTokenType)) 
+            while (++first != last && IS_CATEGORY(*first, WhiteSpaceTokenType))
                 /**/;   // skip whitespace
 
             if (first != last) {
@@ -2208,13 +2208,13 @@ namespace impl {
 
                 if ('L' == file_lit[0]) {
                     error = preprocess_exception::bad_line_filename;
-                    return false;       // shouldn't be a wide character string 
+                    return false;       // shouldn't be a wide character string
                 }
 
                 file = file_lit.substr(1, file_lit.size()-2);
 
             // test if there is other junk on this line
-                while (++first != last && IS_CATEGORY(*first, WhiteSpaceTokenType)) 
+                while (++first != last && IS_CATEGORY(*first, WhiteSpaceTokenType))
                     /**/;   // skip whitespace
             }
             return first == last;
@@ -2224,8 +2224,8 @@ namespace impl {
     }
 }
 
-template <typename ContextT> 
-inline void  
+template <typename ContextT>
+inline void
 pp_iterator_functor<ContextT>::on_line(
     typename parse_tree_type::const_iterator const &begin,
     typename parse_tree_type::const_iterator const &end)
@@ -2233,13 +2233,13 @@ pp_iterator_functor<ContextT>::on_line(
     BOOST_ASSERT(ctx.get_if_block_status());
 
 // Try to extract the line number and file name from the given token list
-// directly. If that fails, preprocess the whole token sequence and try again 
+// directly. If that fails, preprocess the whole token sequence and try again
 // to extract this information.
 token_sequence_type expanded;
 get_token_value<result_type, parse_node_type> get_value;
 
     typedef typename ref_transform_iterator_generator<
-            get_token_value<result_type, parse_node_type>, 
+            get_token_value<result_type, parse_node_type>,
             typename parse_tree_type::const_iterator
         >::type const_tree_iterator_t;
 
@@ -2257,27 +2257,27 @@ token_sequence_type toexpand;
     if (!impl::retrieve_line_info(first, last, line, file_name, error)) {
     // preprocess the body of this #line message
         typename token_sequence_type::iterator begin2 = toexpand.begin();
-        ctx.expand_whole_tokensequence(begin2, toexpand.end(), 
+        ctx.expand_whole_tokensequence(begin2, toexpand.end(),
             expanded, false);
 
         error = preprocess_exception::no_error;
-        if (!impl::retrieve_line_info(expanded.begin(), expanded.end(), 
+        if (!impl::retrieve_line_info(expanded.begin(), expanded.end(),
             line, file_name, error))
         {
             typename ContextT::string_type msg(
                 boost::wave::util::impl::as_string(expanded));
-            BOOST_WAVE_THROW_VAR_CTX(ctx, preprocess_exception, error, 
+            BOOST_WAVE_THROW_VAR_CTX(ctx, preprocess_exception, error,
                 msg.c_str(), act_pos);
             return;
         }
 
     // call the corresponding pp hook function
-        ctx.get_hooks().found_line_directive(ctx.derived(), expanded, line, 
+        ctx.get_hooks().found_line_directive(ctx.derived(), expanded, line,
             file_name.c_str());
     }
     else {
     // call the corresponding pp hook function
-        ctx.get_hooks().found_line_directive(ctx.derived(), toexpand, line, 
+        ctx.get_hooks().found_line_directive(ctx.derived(), toexpand, line,
             file_name.c_str());
     }
 
@@ -2292,13 +2292,13 @@ token_sequence_type toexpand;
     if (error != preprocess_exception::no_error) {
         typename ContextT::string_type msg(
             boost::wave::util::impl::as_string(expanded));
-        BOOST_WAVE_THROW_VAR_CTX(ctx, preprocess_exception, error, 
+        BOOST_WAVE_THROW_VAR_CTX(ctx, preprocess_exception, error,
             msg.c_str(), act_pos);
         return;
     }
 
 // set new line number/filename only if ok
-    if (!file_name.empty()) {    // reuse current file name 
+    if (!file_name.empty()) {    // reuse current file name
         using boost::wave::util::impl::unescape_lit;
         act_pos.set_file(unescape_lit(file_name).c_str());
     }
@@ -2307,12 +2307,12 @@ token_sequence_type toexpand;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-//  
+//
 //  on_error(): handle #error directives
 //
 ///////////////////////////////////////////////////////////////////////////////
-template <typename ContextT> 
-inline void 
+template <typename ContextT>
+inline void
 pp_iterator_functor<ContextT>::on_error(
     typename parse_tree_type::const_iterator const &begin,
     typename parse_tree_type::const_iterator const &end)
@@ -2324,7 +2324,7 @@ token_sequence_type expanded;
 get_token_value<result_type, parse_node_type> get_value;
 
 typename ref_transform_iterator_generator<
-        get_token_value<result_type, parse_node_type>, 
+        get_token_value<result_type, parse_node_type>,
         typename parse_tree_type::const_iterator
     >::type first = make_ref_transform_iterator(begin, get_value);
 
@@ -2336,32 +2336,32 @@ token_sequence_type toexpand;
         std::inserter(toexpand, toexpand.end()));
 
     typename token_sequence_type::iterator begin2 = toexpand.begin();
-    ctx.expand_whole_tokensequence(begin2, toexpand.end(), expanded, 
+    ctx.expand_whole_tokensequence(begin2, toexpand.end(), expanded,
         false);
     if (!ctx.get_hooks().found_error_directive(ctx.derived(), toexpand))
 #else
 // simply copy the body of this #error message to the issued diagnostic
 // message
-    std::copy(first, make_ref_transform_iterator(end, get_value), 
+    std::copy(first, make_ref_transform_iterator(end, get_value),
         std::inserter(expanded, expanded.end()));
     if (!ctx.get_hooks().found_error_directive(ctx.derived(), expanded))
-#endif 
+#endif
     {
     // report the corresponding error
         BOOST_WAVE_STRINGTYPE msg(boost::wave::util::impl::as_string(expanded));
-        BOOST_WAVE_THROW_CTX(ctx, preprocess_exception, error_directive, 
+        BOOST_WAVE_THROW_CTX(ctx, preprocess_exception, error_directive,
             msg.c_str(), act_pos);
     }
 }
 
 #if BOOST_WAVE_SUPPORT_WARNING_DIRECTIVE != 0
 ///////////////////////////////////////////////////////////////////////////////
-//  
+//
 //  on_warning(): handle #warning directives
 //
 ///////////////////////////////////////////////////////////////////////////////
-template <typename ContextT> 
-inline void 
+template <typename ContextT>
+inline void
 pp_iterator_functor<ContextT>::on_warning(
     typename parse_tree_type::const_iterator const &begin,
     typename parse_tree_type::const_iterator const &end)
@@ -2373,7 +2373,7 @@ token_sequence_type expanded;
 get_token_value<result_type, parse_node_type> get_value;
 
 typename ref_transform_iterator_generator<
-        get_token_value<result_type, parse_node_type>, 
+        get_token_value<result_type, parse_node_type>,
         typename parse_tree_type::const_iterator
     >::type first = make_ref_transform_iterator(begin, get_value);
 
@@ -2385,31 +2385,31 @@ token_sequence_type toexpand;
         std::inserter(toexpand, toexpand.end()));
 
     typename token_sequence_type::iterator begin2 = toexpand.begin();
-    ctx.expand_whole_tokensequence(begin2, toexpand.end(), expanded, 
+    ctx.expand_whole_tokensequence(begin2, toexpand.end(), expanded,
         false);
     if (!ctx.get_hooks().found_warning_directive(ctx.derived(), toexpand))
 #else
 // simply copy the body of this #warning message to the issued diagnostic
 // message
-    std::copy(first, make_ref_transform_iterator(end, get_value), 
+    std::copy(first, make_ref_transform_iterator(end, get_value),
         std::inserter(expanded, expanded.end()));
     if (!ctx.get_hooks().found_warning_directive(ctx.derived(), expanded))
-#endif 
+#endif
     {
     // report the corresponding error
         BOOST_WAVE_STRINGTYPE msg(boost::wave::util::impl::as_string(expanded));
-        BOOST_WAVE_THROW_CTX(ctx, preprocess_exception, warning_directive, 
+        BOOST_WAVE_THROW_CTX(ctx, preprocess_exception, warning_directive,
             msg.c_str(), act_pos);
     }
 }
 #endif // BOOST_WAVE_SUPPORT_WARNING_DIRECTIVE != 0
 
 ///////////////////////////////////////////////////////////////////////////////
-//  
+//
 //  on_pragma(): handle #pragma directives
 //
 ///////////////////////////////////////////////////////////////////////////////
-template <typename ContextT> 
+template <typename ContextT>
 inline bool
 pp_iterator_functor<ContextT>::on_pragma(
     typename parse_tree_type::const_iterator const &begin,
@@ -2426,7 +2426,7 @@ token_sequence_type expanded;
 get_token_value<result_type, parse_node_type> get_value;
 
     typedef typename ref_transform_iterator_generator<
-            get_token_value<result_type, parse_node_type>, 
+            get_token_value<result_type, parse_node_type>,
             typename parse_tree_type::const_iterator
         >::type const_tree_iterator_t;
 
@@ -2436,13 +2436,13 @@ const_tree_iterator_t last = make_ref_transform_iterator(end, get_value);
     expanded.push_back(result_type(T_PP_PRAGMA, "#pragma", act_token.get_position()));
     expanded.push_back(result_type(T_SPACE, " ", act_token.get_position()));
 
-    while (++first != last && IS_CATEGORY(*first, WhiteSpaceTokenType)) 
+    while (++first != last && IS_CATEGORY(*first, WhiteSpaceTokenType))
         expanded.push_back(*first);   // skip whitespace
 
     if (first != last) {
-        if (T_IDENTIFIER == token_id(*first) && 
-            boost::wave::need_c99(ctx.get_language()) && 
-            (*first).get_value() == "STDC") 
+        if (T_IDENTIFIER == token_id(*first) &&
+            boost::wave::need_c99(ctx.get_language()) &&
+            (*first).get_value() == "STDC")
         {
         // do _not_ preprocess the token sequence
             std::copy(first, last, std::inserter(expanded, expanded.end()));
@@ -2455,7 +2455,7 @@ const_tree_iterator_t last = make_ref_transform_iterator(end, get_value);
             std::copy(first, last, std::inserter(toexpand, toexpand.end()));
 
             typename token_sequence_type::iterator begin2 = toexpand.begin();
-            ctx.expand_whole_tokensequence(begin2, toexpand.end(), 
+            ctx.expand_whole_tokensequence(begin2, toexpand.end(),
                 expanded, false);
 #else
         // do _not_ preprocess the token sequence
@@ -2469,7 +2469,7 @@ const_tree_iterator_t last = make_ref_transform_iterator(end, get_value);
     BOOST_ASSERT(unput_queue.empty());
     BOOST_ASSERT(pending_queue.empty());
 
-// try to interpret the expanded #pragma body 
+// try to interpret the expanded #pragma body
     token_sequence_type pending;
     if (interpret_pragma(expanded, pending)) {
     // if there is some replacement text, insert it into the pending queue
@@ -2479,17 +2479,17 @@ const_tree_iterator_t last = make_ref_transform_iterator(end, get_value);
     }
 
 #if BOOST_WAVE_EMIT_PRAGMA_DIRECTIVES != 0
-// Move the resulting token sequence into the pending_queue, so it will be 
+// Move the resulting token sequence into the pending_queue, so it will be
 // returned to the caller.
     if (boost::wave::need_emit_pragma_directives(ctx.get_language())) {
         pending_queue.splice(pending_queue.begin(), expanded);
         return false;       // return the whole #pragma directive
     }
-#endif 
+#endif
     return true;            // skip the #pragma at all
 }
 
-template <typename ContextT> 
+template <typename ContextT>
 inline bool
 pp_iterator_functor<ContextT>::interpret_pragma(
     token_sequence_type const &pragma_body, token_sequence_type &result)
@@ -2498,7 +2498,7 @@ pp_iterator_functor<ContextT>::interpret_pragma(
 
     typename token_sequence_type::const_iterator end = pragma_body.end();
     typename token_sequence_type::const_iterator it = pragma_body.begin();
-    for (++it; it != end && IS_CATEGORY(*it, WhiteSpaceTokenType); ++it) 
+    for (++it; it != end && IS_CATEGORY(*it, WhiteSpaceTokenType); ++it)
         /**/;   // skip whitespace
 
     if (it == end)      // eof reached
@@ -2512,16 +2512,16 @@ pp_iterator_functor<ContextT>::interpret_pragma(
 }   // namespace impl
 
 ///////////////////////////////////////////////////////////////////////////////
-//  
+//
 //  pp_iterator
 //
 //      The boost::wave::pp_iterator template is the iterator, through which
 //      the resulting preprocessed input stream is accessible.
-//  
+//
 ///////////////////////////////////////////////////////////////////////////////
 
 template <typename ContextT>
-class pp_iterator 
+class pp_iterator
 :   public boost::spirit::classic::multi_pass<
         boost::wave::impl::pp_iterator_functor<ContextT>,
         boost::wave::util::functor_input
@@ -2531,14 +2531,14 @@ public:
     typedef boost::wave::impl::pp_iterator_functor<ContextT> input_policy_type;
 
 private:
-    typedef 
+    typedef
         boost::spirit::classic::multi_pass<input_policy_type, boost::wave::util::functor_input>
         base_type;
     typedef pp_iterator<ContextT> self_type;
     typedef boost::wave::util::functor_input functor_input_type;
 
 public:
-    pp_iterator() 
+    pp_iterator()
     {}
 
     template <typename IteratorT>
@@ -2548,9 +2548,9 @@ public:
     {}
 
     bool force_include(char const *path_, bool is_last)
-    { 
-        bool result = this->get_functor().on_include_helper(path_, path_, 
-            false, false); 
+    {
+        bool result = this->get_functor().on_include_helper(path_, path_,
+            false, false);
         if (is_last) {
             this->functor_input_type::
                 template inner<input_policy_type>::advance_input();
diff --git a/include/boost/wave/util/cpp_macromap.hpp b/include/boost/wave/util/cpp_macromap.hpp
index 8b155b8..928bf58 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, 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_predef.hpp b/include/boost/wave/util/cpp_macromap_predef.hpp
index 0725a36..fd6b85a 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, 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 84b5b03..36b1878 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, 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 87f6f77..66c5d78 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, 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/filesystem_compatibility.hpp b/include/boost/wave/util/filesystem_compatibility.hpp
index 5bd924a..4ed90b5 100644
--- a/include/boost/wave/util/filesystem_compatibility.hpp
+++ b/include/boost/wave/util/filesystem_compatibility.hpp
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
-    Copyright (c) 2001-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See accompanying file
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
@@ -25,12 +25,12 @@ namespace boost { namespace wave { namespace util
 // interface wrappers for older Boost versions
     inline boost::filesystem::path initial_path()
     {
-        return boost::filesystem::initial_path(); 
+        return boost::filesystem::initial_path();
     }
 
     inline boost::filesystem::path current_path()
     {
-        return boost::filesystem::current_path(); 
+        return boost::filesystem::current_path();
     }
 
     template <typename String>
@@ -43,18 +43,18 @@ namespace boost { namespace wave { namespace util
 #endif
     }
 
-    inline std::string leaf(boost::filesystem::path const& p) 
-    { 
+    inline std::string leaf(boost::filesystem::path const& p)
+    {
 #if BOOST_FILESYSTEM_VERSION >= 3
-        return p.leaf().string(); 
+        return p.leaf().string();
 #else
-        return p.leaf(); 
+        return p.leaf();
 #endif
     }
 
-    inline boost::filesystem::path branch_path(boost::filesystem::path const& p) 
-    { 
-        return p.branch_path(); 
+    inline boost::filesystem::path branch_path(boost::filesystem::path const& p)
+    {
+        return p.branch_path();
     }
 
     inline boost::filesystem::path normalize(boost::filesystem::path& p)
@@ -62,12 +62,12 @@ namespace boost { namespace wave { namespace util
         return p.normalize();
     }
 
-    inline std::string native_file_string(boost::filesystem::path const& p) 
-    { 
+    inline std::string native_file_string(boost::filesystem::path const& p)
+    {
 #if BOOST_FILESYSTEM_VERSION >= 3
-        return p.string(); 
+        return p.string();
 #else
-        return p.native_file_string(); 
+        return p.native_file_string();
 #endif
     }
 
@@ -75,7 +75,11 @@ namespace boost { namespace wave { namespace util
         boost::filesystem::path const& p)
     {
 #if BOOST_FILESYSTEM_VERSION >= 3
+#if BOOST_VERSION >= 105000
+        return boost::filesystem::complete(p, initial_path());
+#else
         return boost::filesystem3::complete(p, initial_path());
+#endif
 #else
         return boost::filesystem::complete(p, initial_path());
 #endif
@@ -85,7 +89,11 @@ namespace boost { namespace wave { namespace util
         boost::filesystem::path const& p, boost::filesystem::path const& base)
     {
 #if BOOST_FILESYSTEM_VERSION >= 3
+#if BOOST_VERSION >= 105000
+        return boost::filesystem::complete(p, base);
+#else
         return boost::filesystem3::complete(p, base);
+#endif
 #else
         return boost::filesystem::complete(p, base);
 #endif
@@ -95,18 +103,26 @@ namespace boost { namespace wave { namespace util
 
 // interface wrappers if deprecated functions do not exist
     inline boost::filesystem::path initial_path()
-    { 
+    {
 #if BOOST_FILESYSTEM_VERSION >= 3
+#if BOOST_VERSION >= 105000
+        return boost::filesystem::detail::initial_path();
+#else
         return boost::filesystem3::detail::initial_path();
+#endif
 #else
         return boost::filesystem::initial_path<boost::filesystem::path>();
 #endif
     }
 
     inline boost::filesystem::path current_path()
-    { 
+    {
 #if BOOST_FILESYSTEM_VERSION >= 3
+#if BOOST_VERSION >= 105000
+        return boost::filesystem::current_path();
+#else
         return boost::filesystem3::current_path();
+#endif
 #else
         return boost::filesystem::current_path<boost::filesystem::path>();
 #endif
@@ -118,18 +134,18 @@ namespace boost { namespace wave { namespace util
         return boost::filesystem::path(p);
     }
 
-    inline std::string leaf(boost::filesystem::path const& p) 
-    { 
+    inline std::string leaf(boost::filesystem::path const& p)
+    {
 #if BOOST_VERSION >= 104600 && BOOST_FILESYSTEM_VERSION >= 3
         return p.filename().string();
 #else
-        return p.filename(); 
+        return p.filename();
 #endif
     }
 
-    inline boost::filesystem::path branch_path(boost::filesystem::path const& p) 
-    { 
-        return p.parent_path(); 
+    inline boost::filesystem::path branch_path(boost::filesystem::path const& p)
+    {
+        return p.parent_path();
     }
 
     inline boost::filesystem::path normalize(boost::filesystem::path& p)
@@ -137,12 +153,12 @@ namespace boost { namespace wave { namespace util
         return p; // function doesn't exist anymore
     }
 
-    inline std::string native_file_string(boost::filesystem::path const& p) 
-    { 
+    inline std::string native_file_string(boost::filesystem::path const& p)
+    {
 #if BOOST_VERSION >= 104600
-        return p.string(); 
+        return p.string();
 #else
-        return p.file_string(); 
+        return p.file_string();
 #endif
     }
 
@@ -166,7 +182,6 @@ namespace boost { namespace wave { namespace util
 #endif
     }
 #endif
-
 }}}
 
 #endif
diff --git a/include/boost/wave/util/functor_input.hpp b/include/boost/wave/util/functor_input.hpp
index d30a090..6cd7582 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, 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 8485e9c..e572696 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, 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 e787040..e5b9127 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, 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 8673f46..1ea027c 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See accompanying file
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
@@ -30,17 +30,17 @@ namespace util {
 
 ///////////////////////////////////////////////////////////////////////////////
 template <typename IterationContextT>
-class iteration_context_stack 
+class iteration_context_stack
 {
     typedef std::stack<IterationContextT> base_type;
-    
+
 public:
     typedef typename base_type::size_type size_type;
-    
+
     iteration_context_stack()
     :   max_include_nesting_depth(BOOST_WAVE_MAX_INCLUDE_LEVEL_DEPTH)
     {}
-    
+
     void set_max_include_nesting_depth(size_type new_depth)
         {  max_include_nesting_depth = new_depth; }
     size_type get_max_include_nesting_depth() const
@@ -49,22 +49,22 @@ public:
     typename base_type::size_type size() const { return iter_ctx.size(); }
     typename base_type::value_type &top() { return iter_ctx.top(); }
     void pop() { iter_ctx.pop(); }
-    
+
     template <typename Context, typename PositionT>
-    void push(Context& ctx, PositionT const &pos, 
+    void push(Context& ctx, PositionT const &pos,
         typename base_type::value_type const &val)
-    { 
+    {
         if (iter_ctx.size() == max_include_nesting_depth) {
         char buffer[22];    // 21 bytes holds all NUL-terminated unsigned 64-bit numbers
 
             using namespace std;    // for some systems sprintf is in namespace std
             sprintf(buffer, "%d", (int)max_include_nesting_depth);
-            BOOST_WAVE_THROW_CTX(ctx, preprocess_exception, 
+            BOOST_WAVE_THROW_CTX(ctx, preprocess_exception,
                 include_nesting_too_deep, buffer, pos);
         }
-        iter_ctx.push(val); 
+        iter_ctx.push(val);
     }
-        
+
 private:
     size_type max_include_nesting_depth;
     base_type iter_ctx;
diff --git a/include/boost/wave/util/macro_definition.hpp b/include/boost/wave/util/macro_definition.hpp
index 16be858..f488ac3 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, 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 4d15663..a33e8d0 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, 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 876726f..a36b980 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, 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 0eda557..312b0a2 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, 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 a477607..2918dde 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, 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 7477bfe..c60dbda 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, 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 7fc0601..6d1ce1d 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, 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 fa537a6..1c841a7 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, 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_constant.hpp b/include/boost/wave/wave_config_constant.hpp
index 68bdf74..45f83a2 100644
--- a/include/boost/wave/wave_config_constant.hpp
+++ b/include/boost/wave/wave_config_constant.hpp
@@ -4,7 +4,7 @@
     
     http://www.boost.org/
 
-    Copyright (c) 2001-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, 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 3512e0d..7b143ca 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See accompanying file
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
@@ -16,11 +16,11 @@
 //  BOOST_WAVE_VERSION & 0x0000FF is the sub-minor version
 //  BOOST_WAVE_VERSION & 0x00FF00 is the minor version
 //  BOOST_WAVE_VERSION & 0xFF0000 is the major version
-#define BOOST_WAVE_VERSION                 0x020300
+#define BOOST_WAVE_VERSION                 0x020302
 
 //  The following defines contain the same information as above
 #define BOOST_WAVE_VERSION_MAJOR           2
 #define BOOST_WAVE_VERSION_MINOR           3
-#define BOOST_WAVE_VERSION_SUBMINOR        0
+#define BOOST_WAVE_VERSION_SUBMINOR        2
 
 #endif // !defined(WAVE_VERSION_H_9D79ABDB_AC54_4C0A_89B1_F70A2DCFE21E_INCLUDED)
diff --git a/include/boost/wave/whitespace_handling.hpp b/include/boost/wave/whitespace_handling.hpp
index be9725f..6fd1dfd 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-2011 Hartmut Kaiser. 
+    Copyright (c) 2001-2012 Hartmut Kaiser. 
     Distributed under the Boost Software License, 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 7ee3eaf..5e8ff5e 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-2011 Hartmut Kaiser. Distributed under the Boost 
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost 
     Software License, 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 61a862f..092c01e 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-2011 Hartmut Kaiser. Distributed under the Boost 
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost 
     Software License, 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 3b039ed..80fa5ac 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-2011 Hartmut Kaiser. Distributed under the Boost 
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost 
     Software License, 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 544f0b4..0c4fa12 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-2011 Hartmut Kaiser. Distributed under the Boost 
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost 
     Software License, 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 b0fe989..5781f83 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-2011 Hartmut Kaiser. Distributed under the Boost 
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost 
     Software License, 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 a3fbe6d..4875867 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-2011 Hartmut Kaiser. Distributed under the Boost 
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost 
     Software License, 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 7bbb9fd..acec5c4 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-2011 Hartmut Kaiser. Distributed under the Boost 
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost 
     Software License, 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 d688f31..bbdcdd1 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-2011 Hartmut Kaiser. Distributed under the Boost 
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost 
     Software License, 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 170863c..44f5761 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-2011 Hartmut Kaiser. Distributed under the Boost 
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost 
     Software License, 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 5d773a0..042232e 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-2011 Hartmut Kaiser. 
+    Copyright (c) 2001-2012 Hartmut Kaiser. 
     Distributed under the Boost Software License, 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 15107d1..c89c2e9 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-2011 Hartmut Kaiser. Distributed under the Boost 
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost 
     Software License, 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 1307ec2..1fe5ce9 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-2011 Hartmut Kaiser. Distributed under the Boost 
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost 
     Software License, 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 8532237..8a54776 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-2011 Hartmut Kaiser. Distributed under the Boost 
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost 
     Software License, 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/custom_directives/custom_directives.cpp b/samples/custom_directives/custom_directives.cpp
index 33ffaa6..e2eddcd 100644
--- a/samples/custom_directives/custom_directives.cpp
+++ b/samples/custom_directives/custom_directives.cpp
@@ -4,7 +4,7 @@
     
     http://www.boost.org/
 
-    Copyright (c) 2001-2011 Hartmut Kaiser. Distributed under the Boost 
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost 
     Software License, 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/custom_directives/custom_directives.hpp b/samples/custom_directives/custom_directives.hpp
index 399c0e2..c18a8ae 100644
--- a/samples/custom_directives/custom_directives.hpp
+++ b/samples/custom_directives/custom_directives.hpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, 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/emit_custom_line_directives/emit_custom_line_directives.cpp b/samples/emit_custom_line_directives/emit_custom_line_directives.cpp
index f2aba54..3ccbbde 100644
--- a/samples/emit_custom_line_directives/emit_custom_line_directives.cpp
+++ b/samples/emit_custom_line_directives/emit_custom_line_directives.cpp
@@ -4,7 +4,7 @@
     
     http://www.boost.org/
 
-    Copyright (c) 2001-2011 Hartmut Kaiser. Distributed under the Boost 
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost 
     Software License, 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/emit_custom_line_directives/emit_custom_line_directives.hpp b/samples/emit_custom_line_directives/emit_custom_line_directives.hpp
index d353a44..2284a3c 100644
--- a/samples/emit_custom_line_directives/emit_custom_line_directives.hpp
+++ b/samples/emit_custom_line_directives/emit_custom_line_directives.hpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, 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 314663f..ac31001 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-2011 Hartmut Kaiser. Distributed under the Boost 
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost 
     Software License, 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 b81d5b3..597b3f8 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-2011 Hartmut Kaiser. 
+    Copyright (c) 2001-2012 Hartmut Kaiser. 
     Distributed under the Boost Software License, 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 69d77c3..35569d4 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-2011 Hartmut Kaiser. 
+    Copyright (c) 2001-2012 Hartmut Kaiser. 
     Distributed under the Boost Software License, 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 7318c29..01b6079 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, 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 89cc3d7..3c2fa7c 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, 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 4fbfb87..370b1cd 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, 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 b7afe3f..f692341 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, 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 758ad97..48679d5 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, 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 cd1b889..04dd775 100644
--- a/src/instantiate_re2c_lexer.cpp
+++ b/src/instantiate_re2c_lexer.cpp
@@ -4,7 +4,7 @@
 
     http://www.boost.org/
 
-    Copyright (c) 2001-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, 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 138ed6c..9c9014b 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, 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/token_ids.cpp b/src/token_ids.cpp
index 35e7725..17ce836 100644
--- a/src/token_ids.cpp
+++ b/src/token_ids.cpp
@@ -5,7 +5,7 @@
     
     http://www.boost.org/
 
-    Copyright (c) 2001-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, 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/wave_config_constant.cpp b/src/wave_config_constant.cpp
index 86a9f82..f43ee80 100644
--- a/src/wave_config_constant.cpp
+++ b/src/wave_config_constant.cpp
@@ -4,7 +4,7 @@
     
     http://www.boost.org/
 
-    Copyright (c) 2001-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 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 a14ca28..8d3ce37 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 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_lexertl_lexer.cpp b/test/testlexers/test_lexertl_lexer.cpp
index 19fce1f..bef602f 100644
--- a/test/testlexers/test_lexertl_lexer.cpp
+++ b/test/testlexers/test_lexertl_lexer.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 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 ccc837d..344d8c4 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 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 38dfc4a..a0754a3 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 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_xlex_lexer.cpp b/test/testlexers/test_xlex_lexer.cpp
index 2763b5f..12eb764 100644
--- a/test/testlexers/test_xlex_lexer.cpp
+++ b/test/testlexers/test_xlex_lexer.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.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 58dd4a5..8d674ae 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See accompanying file
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
diff --git a/test/testwave/collect_hooks_information.hpp b/test/testwave/collect_hooks_information.hpp
index 5db7864..17f17ad 100644
--- a/test/testwave/collect_hooks_information.hpp
+++ b/test/testwave/collect_hooks_information.hpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 e348f86..89c8a34 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 072134b..315adc6 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 3d963a6..28e01c8 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 391093c..bfcd320 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 37e6bb9..d8e8807 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 81b46b2..0635181 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 f9f1569..57e796f 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 392782f..99034f3 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 aa26130..914ec6b 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 90a0c57..fda84df 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 ec83b97..ed1b7b6 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 c9f7c7d..c42a069 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 979fdea..1746afb 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 3907e17..32df363 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 9e056fe..6a20c5b 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 e11100e..d389e3c 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 536066e..9d025d2 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 938c59e..8e84448 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 924eb6a..1585bcd 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 480aa2b..8c2673a 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 e95dd28..0c3bdcb 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 053e8bd..809cd67 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 82dccbc..a54adbd 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 7aba411..b07cb9c 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 a4b64c8..37a2409 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 064c5cc..df0cdca 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 eca0e90..39ccb3a 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 b2aca29..67def4a 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 e4ba982..2cb1beb 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 d7faae4..bde34e3 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 338f532..876795d 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 26d75ac..e523bb2 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 15a8c61..9b7ccd2 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 e50bc9f..d908c13 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 2bdea91..449dbfd 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 a799c1a..d798f52 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 c7484e9..49b7da1 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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_038.cpp b/test/testwave/testfiles/t_1_038.cpp
index ffa3df5..526f1a2 100644
--- a/test/testwave/testfiles/t_1_038.cpp
+++ b/test/testwave/testfiles/t_1_038.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 1f5e6fd..a300672 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 6b6744c..797f865 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 cae1516..c0f76ba 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 957ba5f..df66a5c 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 75a5f87..80d114a 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 113b2db..918c1ed 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 b1a4fe7..ccd0cbc 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 d1f40d3..6fc6155 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 1013fd2..b72ca45 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 9e86994..bdc92a7 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 3200b7d..8f8dfed 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 3e6005a..67ff1fe 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 a0733fa..e44893f 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 3eb4d08..9a6df37 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 e8eb007..67d7bb4 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 da703d8..43169d0 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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_017.cpp b/test/testwave/testfiles/t_2_017.cpp
index 0f0540c..a69083c 100644
--- a/test/testwave/testfiles/t_2_017.cpp
+++ b/test/testwave/testfiles/t_2_017.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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_018.cpp b/test/testwave/testfiles/t_2_018.cpp
index 8fac503..8ca07c4 100644
--- a/test/testwave/testfiles/t_2_018.cpp
+++ b/test/testwave/testfiles/t_2_018.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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_019.cpp b/test/testwave/testfiles/t_2_019.cpp
index 906d66f..9a4729d 100644
--- a/test/testwave/testfiles/t_2_019.cpp
+++ b/test/testwave/testfiles/t_2_019.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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_019_001.hpp b/test/testwave/testfiles/t_2_019_001.hpp
index e6ff13f..281621c 100644
--- a/test/testwave/testfiles/t_2_019_001.hpp
+++ b/test/testwave/testfiles/t_2_019_001.hpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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_019_002.hpp b/test/testwave/testfiles/t_2_019_002.hpp
index 0822ab6..778b8e0 100644
--- a/test/testwave/testfiles/t_2_019_002.hpp
+++ b/test/testwave/testfiles/t_2_019_002.hpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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_019_003.hpp b/test/testwave/testfiles/t_2_019_003.hpp
index 2d1bcc4..ab9e563 100644
--- a/test/testwave/testfiles/t_2_019_003.hpp
+++ b/test/testwave/testfiles/t_2_019_003.hpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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_020.cpp b/test/testwave/testfiles/t_2_020.cpp
index ef5eb06..7691ffe 100644
--- a/test/testwave/testfiles/t_2_020.cpp
+++ b/test/testwave/testfiles/t_2_020.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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_021.cpp b/test/testwave/testfiles/t_2_021.cpp
index dd2c612..ceef8e8 100644
--- a/test/testwave/testfiles/t_2_021.cpp
+++ b/test/testwave/testfiles/t_2_021.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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_022.cpp b/test/testwave/testfiles/t_2_022.cpp
new file mode 100644
index 0000000..a25f3be
--- /dev/null
+++ b/test/testwave/testfiles/t_2_022.cpp
@@ -0,0 +1,23 @@
+/*=============================================================================
+    Boost.Wave: A Standard compliant C++ preprocessor library
+    http://www.boost.org/
+
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
+    Software License, Version 1.0. (See accompanying file
+    LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+=============================================================================*/
+
+// Verify fix of regression #6838: Adding include file with force_include makes
+// Wave fail to emit #line directive
+
+//O --forceinclude=t_2_022.hpp
+
+//R #line 12 "t_2_022.hpp"
+//R int func() { return 42; }
+//R #line 19 "t_2_022.cpp"
+//R int main() { return func(); }
+int main() { return func(); }
+
+//H 04: t_2_022.hpp
+//H 05: $B(t_2_022.hpp) ($B(t_2_022.hpp))
+//H 06: 
diff --git a/test/testwave/testfiles/t_2_022.hpp b/test/testwave/testfiles/t_2_022.hpp
new file mode 100644
index 0000000..6b7c52f
--- /dev/null
+++ b/test/testwave/testfiles/t_2_022.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Boost.Wave: A Standard compliant C++ preprocessor library
+    http://www.boost.org/
+
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
+    Software License, Version 1.0. (See accompanying file
+    LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+=============================================================================*/
+
+// Verify fix of regression #6838: Adding include file with force_include makes
+// Wave fail to emit #line directive
+int func() { return 42; }
diff --git a/test/testwave/testfiles/t_3_001.cpp b/test/testwave/testfiles/t_3_001.cpp
index 4b96917..1718a5d 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 f8722fc..cb98259 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 52935b1..63c17b5 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 9cd981f..a5a0dc3 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 13c45b0..dbb52f7 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 b2b1c25..71feb43 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 9e1faa8..ec0566a 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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_004.cpp b/test/testwave/testfiles/t_4_004.cpp
index 3d49511..15f66e7 100644
--- a/test/testwave/testfiles/t_4_004.cpp
+++ b/test/testwave/testfiles/t_4_004.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 5988ea9..7a21142 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 13ef188..1e26509 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 3114f81..55d249d 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 64cfb24..e2b1db6 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 a055bc8..87b3ee1 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 ec00ce9..6f03d58 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 8bbf20b..be08d5c 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 e2bfa55..5534d76 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 48ec7af..c934d11 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 e956138..b3141c9 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 0f35aa2..40d4609 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 bbe8923..2805a63 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 7d72cb1..d101074 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 41d4ea4..3245bbd 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 e27f6cb..c955d8f 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 86f0ab7..49e4fd4 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 38f2b9b..f7bcc0f 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 201159d..6a36794 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 981a60d..8683acc 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 111fb8b..e5bbf1a 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 7786e31..877a8a7 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 d1381ba..1edd2d0 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 4e7f31e..fd287db 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 c541437..6450af6 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 edb5d3b..64c9b84 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 284e506..3243fc8 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 6a1bfd4..a70da08 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 dc07f68..84066c5 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 4ff9823..1588879 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 0af0f7b..202529c 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 e4155e4..338467a 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 ef74ff8..7c1453c 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 36a2c74..43f1d39 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 5c8d970..f04f05c 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 61b4d97..672ebd9 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 dbec499..92f609f 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 42ff718..5c5d6bc 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 d71813d..2a48af7 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 f15dcb8..ec93622 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 b1d75d5..e43a593 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 bd28774..b721c89 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 4c188b8..c754d42 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 82e7e7d..3a07b6f 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 35d4077..5c2a685 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 bf2493a..d95d6a0 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 b015621..2a346da 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 b61952d..134c881 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 6af6a53..957bc88 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 0774931..9c8c566 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 3a61379..46e695e 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 873723c..aaa2827 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 5e077d7..5840831 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 9da92e2..9989b95 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 321646d..154c267 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 ae70f3c..4109983 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 7a014e3..e6548b4 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 b5b3cff..af948a5 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 9ea9463..d0865bf 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 45f92d8..5062602 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 37dc5d9..8c158ae 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 0b50acf..3b0cff5 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 4cb80fa..2ecff36 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 40590d7..4c32afa 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 27d07da..4773fe3 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 eeed932..2ed7de7 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 9ad3c5c..e039439 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 2276222..5e44dce 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 f0504bc..f072c9c 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 406c4e0..ec3d57a 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 7f444f7..1617fc0 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 0e891cb..878274b 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 be0bf81..7a30e8e 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 f3df8b4..7eafd38 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 3e01609..ff697cd 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 0c1fce3..f0d0061 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 764b570..f40b520 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 f1cdfc9..118d50e 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 e59e05a..b9f3e54 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 c8c1b53..c224243 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 0cebd53..04c6f94 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 08923ca..6a5d2ba 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 dd5a95f..8261b4c 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 9eddc02..3333ec4 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 a62b34e..0459b8d 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 dbc788a..8ea0b22 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 2a3caec..d39525c 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 129195e..27777b2 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 073a71c..fd2b632 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 55126a4..eecb88f 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 9355b87..c785b93 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 599d435..a168dda 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 6548aa7..36ee920 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 cd27e7f..5e764d4 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 8a4e48e..75adf8e 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 bb373c7..647b419 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 6e906ba..371612b 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 4e98019..237da91 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 c9e3f15..c446129 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 c858ea9..802742f 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 b52cce1..fd60502 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 a4ed550..53a3e85 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 d107b8c..02c12f3 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 4fdb612..07db985 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 e78af8c..6abaf7d 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 3942e92..aff380a 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 ff15e57..4dd9833 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 491aa07..943f398 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 74aa839..84f1e28 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 47c2933..1f55f16 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 5aad7b9..413fe8a 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 0421a40..dafe05b 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 ed91081..d2efa5e 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 ca37ad9..e4c969b 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 641421b..e36b198 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 0d2a570..7ec2ef8 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 f7621fa..25c6f46 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 df06a60..1f15141 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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_063.cpp b/test/testwave/testfiles/t_6_063.cpp
index 50af5f0..776561a 100644
--- a/test/testwave/testfiles/t_6_063.cpp
+++ b/test/testwave/testfiles/t_6_063.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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_063.hpp b/test/testwave/testfiles/t_6_063.hpp
index 6434c3d..bd1faee 100644
--- a/test/testwave/testfiles/t_6_063.hpp
+++ b/test/testwave/testfiles/t_6_063.hpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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_064.cpp b/test/testwave/testfiles/t_6_064.cpp
index 1491846..ebf8918 100644
--- a/test/testwave/testfiles/t_6_064.cpp
+++ b/test/testwave/testfiles/t_6_064.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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_065.cpp b/test/testwave/testfiles/t_6_065.cpp
index 003f4f0..819add3 100644
--- a/test/testwave/testfiles/t_6_065.cpp
+++ b/test/testwave/testfiles/t_6_065.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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_066.cpp b/test/testwave/testfiles/t_6_066.cpp
index 7620b15..4f9868e 100644
--- a/test/testwave/testfiles/t_6_066.cpp
+++ b/test/testwave/testfiles/t_6_066.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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_066.hpp b/test/testwave/testfiles/t_6_066.hpp
index 1e8982c..c0e7d88 100644
--- a/test/testwave/testfiles/t_6_066.hpp
+++ b/test/testwave/testfiles/t_6_066.hpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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_067.cpp b/test/testwave/testfiles/t_6_067.cpp
index 6c1b8e2..b5cdbd5 100644
--- a/test/testwave/testfiles/t_6_067.cpp
+++ b/test/testwave/testfiles/t_6_067.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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_067.hpp b/test/testwave/testfiles/t_6_067.hpp
index 9d9fcee..ae0adec 100644
--- a/test/testwave/testfiles/t_6_067.hpp
+++ b/test/testwave/testfiles/t_6_067.hpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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_068.cpp b/test/testwave/testfiles/t_6_068.cpp
index 4ea1fb9..e24d77c 100644
--- a/test/testwave/testfiles/t_6_068.cpp
+++ b/test/testwave/testfiles/t_6_068.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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_069.cpp b/test/testwave/testfiles/t_6_069.cpp
index d1b7eba..a2edaa0 100644
--- a/test/testwave/testfiles/t_6_069.cpp
+++ b/test/testwave/testfiles/t_6_069.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See accompanying file
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/test/testwave/testfiles/t_7_001.cpp b/test/testwave/testfiles/t_7_001.cpp
index 0a714ea..5ac230b 100644
--- a/test/testwave/testfiles/t_7_001.cpp
+++ b/test/testwave/testfiles/t_7_001.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 5ba4154..0732c71 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 aac5b16..9c0b0ca 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 c7cef8b..845eeb8 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 c31d10e..0a5fc6e 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 0644fcd..f3e414d 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 26004cd..d96b464 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 1eb26d7..c5348e6 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 f8cf614..fa0b557 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 5513058..6022034 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 f784678..d474044 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 7440e36..fb2e06b 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 7c3f4a9..36cf5a8 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 03b9310..6a8e21d 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 113967a..35c80e0 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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 ce2ac91..3c1c212 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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_016.cpp b/test/testwave/testfiles/t_9_016.cpp
index 66420d9..3b41066 100644
--- a/test/testwave/testfiles/t_9_016.cpp
+++ b/test/testwave/testfiles/t_9_016.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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_016.hpp b/test/testwave/testfiles/t_9_016.hpp
index 6a4724b..ef3aaa2 100644
--- a/test/testwave/testfiles/t_9_016.hpp
+++ b/test/testwave/testfiles/t_9_016.hpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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_017.cpp b/test/testwave/testfiles/t_9_017.cpp
index 4466b98..bb1c431 100644
--- a/test/testwave/testfiles/t_9_017.cpp
+++ b/test/testwave/testfiles/t_9_017.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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_018.cpp b/test/testwave/testfiles/t_9_018.cpp
index c6c9529..a6d3818 100644
--- a/test/testwave/testfiles/t_9_018.cpp
+++ b/test/testwave/testfiles/t_9_018.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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_019.cpp b/test/testwave/testfiles/t_9_019.cpp
index a162e71..1141aa9 100644
--- a/test/testwave/testfiles/t_9_019.cpp
+++ b/test/testwave/testfiles/t_9_019.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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_019.hpp b/test/testwave/testfiles/t_9_019.hpp
index 843fedf..39685a2 100644
--- a/test/testwave/testfiles/t_9_019.hpp
+++ b/test/testwave/testfiles/t_9_019.hpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See 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_020.cpp b/test/testwave/testfiles/t_9_020.cpp
index 0d02a61..f78ef77 100644
--- a/test/testwave/testfiles/t_9_020.cpp
+++ b/test/testwave/testfiles/t_9_020.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (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 258345a..65debd7 100644
--- a/test/testwave/testfiles/test.cfg
+++ b/test/testwave/testfiles/test.cfg
@@ -74,6 +74,7 @@ t_2_018.cpp
 t_2_019.cpp
 t_2_020.cpp
 t_2_021.cpp
+t_2_022.cpp
 
 #
 # t_3: Predefined macros
diff --git a/test/testwave/testwave.cpp b/test/testwave/testwave.cpp
index 70fdfdc..e5e481d 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See accompanying file
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
@@ -30,18 +30,18 @@ namespace fs = boost::filesystem;
 
 ///////////////////////////////////////////////////////////////////////////////
 //
-//  The debuglevel command line parameter is used to control the amount of text 
-//  printed by the testwave application. 
+//  The debuglevel command line parameter is used to control the amount of text
+//  printed by the testwave application.
 //
 //  level 0:    prints nothing except serious failures preventing the testwave
-//              executable from running, the return value of the executable is 
+//              executable from running, the return value of the executable is
 //              equal to the number of failed tests
 //  level 1:    prints a short summary only
 //  level 2:    prints the names of the failed tests only
 //  level 3:    prints the expected and real result for failed tests
 //  level 4:    prints the outcome of every test
 //  level 5:    prints the real result even for succeeded tests
-//  level 6:    prints the real hooks information recorded, even for succeeded 
+//  level 6:    prints the real hooks information recorded, even for succeeded
 //              tests
 //
 //  level 9:    prints information about almost everything
@@ -51,7 +51,7 @@ namespace fs = boost::filesystem;
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////////
-int 
+int
 main(int argc, char *argv[])
 {
     int error_count = 0;
@@ -63,9 +63,9 @@ main(int argc, char *argv[])
             ("help,h", "print out program usage (this message)")
             ("version,v", "print the version number")
             ("copyright,c", "print out the copyright statement")
-            ("config-file", po::value<std::vector<std::string> >()->composing(), 
+            ("config-file", po::value<std::vector<std::string> >()->composing(),
                 "specify a config file (alternatively: @arg)")
-            ("hooks", po::value<bool>()->default_value(true), 
+            ("hooks", po::value<bool>()->default_value(true),
                 "test preprocessing hooks")
             ("debug,d", po::value<int>(), "set the debug level (0...9)")
         ;
@@ -74,9 +74,9 @@ main(int argc, char *argv[])
     // recognize positional arguments, will not be shown to the user.
         po::options_description desc_hidden("Hidden options");
         desc_hidden.add_options()
-            ("input", po::value<std::vector<std::string> >()->composing(), 
+            ("input", po::value<std::vector<std::string> >()->composing(),
                 "inputfile")
-        ;        
+        ;
 
     // this is the test application object
         po::variables_map vm;
@@ -89,13 +89,13 @@ main(int argc, char *argv[])
     // parse command line
         // (the (int) cast is to make the True64 compiler happy)
         using namespace boost::program_options::command_line_style;
-        po::parsed_options opts(po::parse_command_line(argc, argv, 
+        po::parsed_options opts(po::parse_command_line(argc, argv,
             cmdline_options, (int)unix_style, cmd_line_utils::at_option_parser));
-        
+
         po::store(opts, vm);
         po::notify(vm);
 
-    // ... act as required 
+    // ... act as required
         if (vm.count("help")) {
             po::options_description desc_help (
                 "Usage: testwave [options] [@config-file(s)] file(s)");
@@ -103,21 +103,21 @@ main(int argc, char *argv[])
             std::cout << desc_help << std::endl;
             return 0;
         }
-        
+
     // debug flag
         if (vm.count("debug")) {
             int debug_level = vm["debug"].as<int>();
             if (debug_level < 0 || debug_level > 9) {
-                std::cerr 
+                std::cerr
                     << "testwave: please use an integer in the range [0..9] "
-                    << "as the parameter to the debug option!" 
+                    << "as the parameter to the debug option!"
                     << std::endl;
             }
             else {
                 app.set_debuglevel(debug_level);
             }
         }
-        
+
         if (vm.count("version")) {
             return app.print_version();
         }
@@ -125,89 +125,89 @@ main(int argc, char *argv[])
         if (vm.count("copyright")) {
             return app.print_copyright();
         }
-        
-    // If there is specified at least one config file, parse it and add the 
+
+    // If there is specified at least one config file, parse it and add the
     // options to the main variables_map
-    // Each of the config files is parsed into a separate variables_map to 
+    // Each of the config files is parsed into a separate variables_map to
     // allow correct paths handling.
         int input_count = 0;
         if (vm.count("config-file")) {
-            std::vector<std::string> const &cfg_files = 
+            std::vector<std::string> const &cfg_files =
                 vm["config-file"].as<std::vector<std::string> >();
 
             if (9 == app.get_debuglevel()) {
-                std::cerr << "found " << (unsigned)cfg_files.size() 
+                std::cerr << "found " << (unsigned)cfg_files.size()
                           << " config-file arguments" << std::endl;
             }
-            
+
             std::vector<std::string>::const_iterator end = cfg_files.end();
-            for (std::vector<std::string>::const_iterator cit = cfg_files.begin(); 
+            for (std::vector<std::string>::const_iterator cit = cfg_files.begin();
                  cit != end; ++cit)
             {
                 if (9 == app.get_debuglevel()) {
                     std::cerr << "reading config_file: " << *cit << std::endl;
                 }
-                
+
             // parse a single config file and store the results, config files
-            // may only contain --input and positional arguments 
+            // may only contain --input and positional arguments
                 po::variables_map cvm;
-                if (!cmd_line_utils::read_config_file(app.get_debuglevel(), 
-                    *cit, desc_hidden, cvm)) 
+                if (!cmd_line_utils::read_config_file(app.get_debuglevel(),
+                    *cit, desc_hidden, cvm))
                 {
                     if (9 == app.get_debuglevel()) {
-                        std::cerr << "failed to read config_file: " << *cit 
+                        std::cerr << "failed to read config_file: " << *cit
                                   << std::endl;
                     }
                     ++config_file_error_count;
                 }
-                
+
                 if (9 == app.get_debuglevel()) {
-                    std::cerr << "succeeded to read config_file: " << *cit 
+                    std::cerr << "succeeded to read config_file: " << *cit
                               << std::endl;
                 }
-                
+
             // correct the paths parsed into this variables_map
                 if (cvm.count("input")) {
-                    std::vector<std::string> const &infiles = 
+                    std::vector<std::string> const &infiles =
                         cvm["input"].as<std::vector<std::string> >();
 
                     if (9 == app.get_debuglevel()) {
-                        std::cerr << "found " << (unsigned)infiles.size() 
+                        std::cerr << "found " << (unsigned)infiles.size()
                                   << " entries" << std::endl;
                     }
 
                     std::vector<std::string>::const_iterator iend = infiles.end();
-                    for (std::vector<std::string>::const_iterator iit = infiles.begin(); 
+                    for (std::vector<std::string>::const_iterator iit = infiles.begin();
                          iit != iend; ++iit)
                     {
                     // correct the file name (pre-pend the config file path)
                         fs::path cfgpath = boost::wave::util::complete_path(
-                            boost::wave::util::create_path(*cit), 
+                            boost::wave::util::create_path(*cit),
                             boost::wave::util::current_path());
-                        fs::path filepath = 
-                            boost::wave::util::branch_path(cfgpath) / 
+                        fs::path filepath =
+                            boost::wave::util::branch_path(cfgpath) /
                                 boost::wave::util::create_path(*iit);
 
                         if (9 == app.get_debuglevel()) {
                             std::cerr << std::string(79, '-') << std::endl;
-                            std::cerr << "executing test: " 
+                            std::cerr << "executing test: "
                                       << boost::wave::util::native_file_string(filepath)
                                       << std::endl;
                         }
 
                     // execute this unit test case
                         if (!app.test_a_file(
-                              boost::wave::util::native_file_string(filepath))) 
+                              boost::wave::util::native_file_string(filepath)))
                         {
                             if (9 == app.get_debuglevel()) {
-                                std::cerr << "failed to execute test: " 
+                                std::cerr << "failed to execute test: "
                                           << boost::wave::util::native_file_string(filepath)
                                           << std::endl;
                             }
                             ++error_count;
                         }
                         else if (9 == app.get_debuglevel()) {
-                            std::cerr << "succeeded to execute test: " 
+                            std::cerr << "succeeded to execute test: "
                                       << boost::wave::util::native_file_string(filepath)
                                       << std::endl;
                         }
@@ -226,14 +226,14 @@ main(int argc, char *argv[])
 
     // extract the arguments from the parsed command line
         std::vector<po::option> arguments;
-        std::remove_copy_if(opts.options.begin(), opts.options.end(), 
+        std::remove_copy_if(opts.options.begin(), opts.options.end(),
             std::back_inserter(arguments), cmd_line_utils::is_argument());
 
         if (9 == app.get_debuglevel()) {
-            std::cerr << "found " << (unsigned)arguments.size() 
+            std::cerr << "found " << (unsigned)arguments.size()
                       << " arguments" << std::endl;
         }
-        
+
     // iterate over remaining arguments
         std::vector<po::option>::const_iterator arg_end = arguments.end();
         for (std::vector<po::option>::const_iterator arg = arguments.begin();
@@ -243,22 +243,22 @@ main(int argc, char *argv[])
 
             if (9 == app.get_debuglevel()) {
                 std::cerr << std::string(79, '-') << std::endl;
-                std::cerr << "executing test: " 
+                std::cerr << "executing test: "
                           << boost::wave::util::native_file_string(filepath)
                           << std::endl;
             }
 
-            if (!app.test_a_file(boost::wave::util::native_file_string(filepath))) 
+            if (!app.test_a_file(boost::wave::util::native_file_string(filepath)))
             {
                 if (9 == app.get_debuglevel()) {
-                    std::cerr << "failed to execute test: " 
+                    std::cerr << "failed to execute test: "
                               << boost::wave::util::native_file_string(filepath)
                               << std::endl;
                 }
                 ++error_count;
             }
             else if (9 == app.get_debuglevel()) {
-                std::cerr << "succeeded to execute test: " 
+                std::cerr << "succeeded to execute test: "
                           << boost::wave::util::native_file_string(filepath)
                           << std::endl;
             }
@@ -271,18 +271,18 @@ main(int argc, char *argv[])
 
     // print a message if no input is given
         if (0 == input_count) {
-            std::cerr 
-                << "testwave: no input file specified, " 
-                << "try --help to get a hint." 
+            std::cerr
+                << "testwave: no input file specified, "
+                << "try --help to get a hint."
                 << std::endl;
             return (std::numeric_limits<int>::max)() - 3;
         }
         else if (app.get_debuglevel() > 0) {
-            std::cout 
-                << "testwave: " << input_count-error_count 
+            std::cout
+                << "testwave: " << input_count-error_count
                 << " of " << input_count << " test(s) succeeded";
             if (0 != error_count) {
-                std::cout 
+                std::cout
                     << " (" << error_count << " test(s) failed)";
             }
             std::cout << "." << std::endl;
diff --git a/test/testwave/testwave_app.cpp b/test/testwave/testwave_app.cpp
index 09e5ab9..d2f9c1a 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See accompanying file
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
@@ -24,7 +24,7 @@
 #include <boost/filesystem/operations.hpp>
 #include <boost/detail/workaround.hpp>
 
-//  include Wave 
+//  include Wave
 
 // always use new hooks
 #define BOOST_WAVE_USE_DEPRECIATED_PREPROCESSING_HOOKS 0
@@ -41,10 +41,10 @@
 #include "collect_hooks_information.hpp"
 
 # ifdef BOOST_NO_STDC_NAMESPACE
-namespace std 
-{ 
+namespace std
+{
     using ::asctime; using ::gmtime; using ::localtime;
-    using ::difftime; using ::time; using ::tm; using ::mktime; using ::system; 
+    using ::difftime; using ::time; using ::tm; using ::mktime; using ::system;
 }
 # endif
 
@@ -61,8 +61,8 @@ namespace {
 
     ///////////////////////////////////////////////////////////////////////////
     template <typename Iterator>
-    inline bool 
-    handle_next_token(Iterator &it, Iterator const& end, 
+    inline bool
+    handle_next_token(Iterator &it, Iterator const& end,
         std::string &result)
     {
         typedef typename Iterator::value_type token_type;
@@ -87,7 +87,7 @@ namespace {
 
     ///////////////////////////////////////////////////////////////////////////
     template <typename Iterator>
-    bool handle_line_directive(Iterator &it, Iterator const& end, 
+    bool handle_line_directive(Iterator &it, Iterator const& end,
         std::string &result)
     {
         typedef typename Iterator::value_type token_type;
@@ -102,7 +102,7 @@ namespace {
         }
 
         using boost::wave::util::impl::unescape_lit;
-        
+
         token_type filename = *it;
         string_type name = filename.get_value();
 
@@ -132,17 +132,17 @@ namespace {
 
 ///////////////////////////////////////////////////////////////////////////
 //
-//  This function compares the real result and the expected one but first 
-//  replaces all occurrences in the expected result of 
+//  This function compares the real result and the expected one but first
+//  replaces all occurrences in the expected result of
 //      $E: to the result of preprocessing the given expression
-//      $F: to the passed full filepath 
+//      $F: to the passed full filepath
 //      $P: to the full path
 //      $B: to the full path (same as $P, but using forward slash '/' on Windows)
 //      $V: to the current Boost version number
 //
 ///////////////////////////////////////////////////////////////////////////
-bool 
-testwave_app::got_expected_result(std::string const& filename, 
+bool
+testwave_app::got_expected_result(std::string const& filename,
     std::string const& result, std::string& expected)
 {
     using boost::wave::util::impl::escape_lit;
@@ -159,31 +159,31 @@ testwave_app::got_expected_result(std::string const& filename,
                     if ('(' == expected[pos1+2]) {
                         std::size_t p = expected.find_first_of(")", pos1+1);
                         if (std::string::npos == p) {
-                            std::cerr 
+                            std::cerr
                                 << "testwave: unmatched parenthesis in $E"
                                     " directive" << std::endl;
                             return false;
                         }
                         std::string source = expected.substr(pos1+3, p-pos1-3);
                         std::string result, error, hooks;
-                        bool pp_result = preprocess_file(filename, source, 
+                        bool pp_result = preprocess_file(filename, source,
                             result, error, hooks, true);
                         if (!pp_result) {
-                            std::cerr 
-                                << "testwave: preprocessing error in $E directive: " 
+                            std::cerr
+                                << "testwave: preprocessing error in $E directive: "
                                 << error << std::endl;
                             return false;
                         }
-                        full_result = full_result + 
+                        full_result = full_result +
                             expected.substr(pos, pos1-pos) + result;
-                        pos1 = expected.find_first_of ("$", 
+                        pos1 = expected.find_first_of ("$",
                             pos = pos1 + 4 + source.size());
                     }
                 }
                 break;
 
             case 'F':       // insert base file name
-                full_result = full_result + 
+                full_result = full_result +
                     expected.substr(pos, pos1-pos) + escape_lit(filename);
                 pos1 = expected.find_first_of ("$", pos = pos1 + 2);
                 break;
@@ -193,7 +193,7 @@ testwave_app::got_expected_result(std::string const& filename,
                 {
                     fs::path fullpath (
                         boost::wave::util::complete_path(
-                            boost::wave::util::create_path(filename), 
+                            boost::wave::util::create_path(filename),
                             boost::wave::util::current_path())
                         );
 
@@ -201,13 +201,13 @@ testwave_app::got_expected_result(std::string const& filename,
                     // the $P(basename) syntax is used
                         std::size_t p = expected.find_first_of(")", pos1+1);
                         if (std::string::npos == p) {
-                            std::cerr 
+                            std::cerr
                                 << "testwave: unmatched parenthesis in $P"
                                     " directive" << std::endl;
                             return false;
                         }
                         std::string base = expected.substr(pos1+3, p-pos1-3);
-                        fullpath = boost::wave::util::branch_path(fullpath) / 
+                        fullpath = boost::wave::util::branch_path(fullpath) /
                             boost::wave::util::create_path(base);
                         full_result += expected.substr(pos, pos1-pos);
                         if ('P' == expected[pos1+1]) {
@@ -233,7 +233,7 @@ testwave_app::got_expected_result(std::string const& filename,
 #endif
                             full_result += escape_lit(p);
                         }
-                        pos1 = expected.find_first_of ("$", 
+                        pos1 = expected.find_first_of ("$",
                             pos = pos1 + 4 + base.size());
                     }
                     else {
@@ -257,11 +257,11 @@ testwave_app::got_expected_result(std::string const& filename,
                 break;
 
             case 'R':       // insert relative file name
-            case 'S':       // same as 'R', but forward slashes on Windows 
+            case 'S':       // same as 'R', but forward slashes on Windows
                 {
                     fs::path relpath;
                     boost::wave::util::as_relative_to(
-                        boost::wave::util::create_path(filename), 
+                        boost::wave::util::create_path(filename),
                         boost::wave::util::current_path(),
                         relpath);
 
@@ -269,13 +269,13 @@ testwave_app::got_expected_result(std::string const& filename,
                     // the $R(basename) syntax is used
                         std::size_t p = expected.find_first_of(")", pos1+1);
                         if (std::string::npos == p) {
-                            std::cerr 
+                            std::cerr
                                 << "testwave: unmatched parenthesis in $R"
                                     " directive" << std::endl;
                             return false;
                         }
                         std::string base = expected.substr(pos1+3, p-pos1-3);
-                        relpath = boost::wave::util::branch_path(relpath) / 
+                        relpath = boost::wave::util::branch_path(relpath) /
                             boost::wave::util::create_path(base);
                         full_result += expected.substr(pos, pos1-pos);
                         if ('R' == expected[pos1+1]) {
@@ -293,7 +293,7 @@ testwave_app::got_expected_result(std::string const& filename,
 #endif
                             full_result += escape_lit(p);
                         }
-                        pos1 = expected.find_first_of ("$", 
+                        pos1 = expected.find_first_of ("$",
                             pos = pos1 + 4 + base.size());
                     }
                     else {
@@ -317,11 +317,11 @@ testwave_app::got_expected_result(std::string const& filename,
                 break;
 
             case 'V':       // insert Boost version
-                full_result = full_result + 
+                full_result = full_result +
                     expected.substr(pos, pos1-pos) + BOOST_LIB_VERSION;
                 pos1 = expected.find_first_of ("$", pos = pos1 + 2);
                 break;
-                
+
             default:
                 full_result = full_result +
                     expected.substr(pos, pos1-pos);
@@ -342,28 +342,30 @@ testwave_app::got_expected_result(std::string const& filename,
 
 ///////////////////////////////////////////////////////////////////////////////
 testwave_app::testwave_app(po::variables_map const& vm)
-:   debuglevel(1), desc_options("Preprocessor configuration options"), 
+:   debuglevel(1), desc_options("Preprocessor configuration options"),
     global_vm(vm)
 {
     desc_options.add_options()
-        ("include,I", po::value<cmd_line_utils::include_paths>()->composing(), 
+        ("include,I", po::value<cmd_line_utils::include_paths>()->composing(),
             "specify an additional include directory")
-        ("sysinclude,S", po::value<std::vector<std::string> >()->composing(), 
+        ("sysinclude,S", po::value<std::vector<std::string> >()->composing(),
             "specify an additional system include directory")
-        ("define,D", po::value<std::vector<std::string> >()->composing(), 
+        ("forceinclude,F", po::value<std::vector<std::string> >()->composing(),
+            "force inclusion of the given file")
+        ("define,D", po::value<std::vector<std::string> >()->composing(),
             "specify a macro to define (as macro[=[value]])")
-        ("predefine,P", po::value<std::vector<std::string> >()->composing(), 
+        ("predefine,P", po::value<std::vector<std::string> >()->composing(),
             "specify a macro to predefine (as macro[=[value]])")
-        ("undefine,U", po::value<std::vector<std::string> >()->composing(), 
+        ("undefine,U", po::value<std::vector<std::string> >()->composing(),
             "specify a macro to undefine")
-        ("nesting,n", po::value<int>(), 
+        ("nesting,n", po::value<int>(),
             "specify a new maximal include nesting depth")
         ("long_long", "enable long long support in C++ mode")
         ("preserve", "preserve comments")
 #if BOOST_WAVE_SUPPORT_VARIADICS_PLACEMARKERS != 0
         ("variadics", "enable certain C99 extensions in C++ mode")
         ("c99", "enable C99 mode (implies --variadics)")
-#endif 
+#endif
 #if BOOST_WAVE_SUPPORT_PRAGMA_ONCE != 0
         ("noguard,G", "disable include guard detection")
 #endif
@@ -376,24 +378,24 @@ testwave_app::testwave_app(po::variables_map const& vm)
 
 ///////////////////////////////////////////////////////////////////////////////
 //
-//  Test the given file (i.e. preprocess the file and compare the result 
+//  Test the given file (i.e. preprocess the file and compare the result
 //  against the embedded 'R' comments, if an error occurs compare the error
 //  message against the given 'E' comments, if no error occurred, compare the
 //  generated hooks result against the given 'H' comments).
 //
 ///////////////////////////////////////////////////////////////////////////////
-bool 
+bool
 testwave_app::test_a_file(std::string filename)
 {
 // read the input file into a string
     std::string instr;
-    if (!read_file(filename, instr)) 
+    if (!read_file(filename, instr))
         return false;     // error was reported already
 
     bool test_hooks = true;
     if (global_vm.count("hooks"))
         test_hooks = variables_map_as(global_vm["hooks"], (bool *)NULL);
-    
+
 // extract expected output, preprocess the data and compare results
     std::string expected, expected_hooks;
     if (extract_expected_output(filename, instr, expected, expected_hooks)) {
@@ -407,21 +409,21 @@ testwave_app::test_a_file(std::string filename)
             if (!extract_special_information(filename, instr, 'E', expected_error))
                 return false;
 
-            if (!expected_error.empty() && 
+            if (!expected_error.empty() &&
                 !got_expected_result(filename, error, expected_error))
             {
             // we expected an error but got none (or a different one)
                 if (debuglevel > 2) {
-                    std::cerr 
+                    std::cerr
                         << filename << ": failed" << std::endl
                         << "result: " << std::endl << result << std::endl;
 
                     if (!error.empty()) {
-                        std::cerr << "expected result: " << std::endl 
+                        std::cerr << "expected result: " << std::endl
                                   << expected << std::endl;
                     }
                     if (!expected_error.empty()) {
-                        std::cerr << "expected error: " << std::endl 
+                        std::cerr << "expected error: " << std::endl
                                   << expected_error << std::endl;
                     }
                 }
@@ -433,7 +435,7 @@ testwave_app::test_a_file(std::string filename)
             else if (!got_expected_result(filename, result, expected)) {
             //  no preprocessing error encountered
                 if (debuglevel > 2) {
-                    std::cerr 
+                    std::cerr
                         << filename << ": failed" << std::endl
                         << "result: " << std::endl << result << std::endl
                         << "expected: " << std::endl << expected << std::endl;
@@ -446,13 +448,13 @@ testwave_app::test_a_file(std::string filename)
             else {
             // preprocessing succeeded, check hook information, if appropriate
                 if (test_hooks && !expected_hooks.empty() &&
-                    !got_expected_result(filename, hooks, expected_hooks)) 
+                    !got_expected_result(filename, hooks, expected_hooks))
                 {
                     if (debuglevel > 2) {
                         std::cerr << filename << ": failed" << std::endl
-                                  << "hooks result: " << std::endl << hooks 
+                                  << "hooks result: " << std::endl << hooks
                                   << std::endl;
-                        std::cerr << "expected hooks result: " << std::endl 
+                        std::cerr << "expected hooks result: " << std::endl
                                   << expected_hooks << std::endl;
                     }
                     else if (debuglevel > 1) {
@@ -461,17 +463,17 @@ testwave_app::test_a_file(std::string filename)
                     retval = false;
                 }
             }
-            
+
             // print success message, if appropriate
             if (retval) {
                 if (debuglevel > 5) {
-                    std::cerr 
+                    std::cerr
                         << filename << ": succeeded" << std::endl
                         << "result: " << std::endl << result << std::endl
                         << "hooks result: " << std::endl << hooks << std::endl;
                 }
                 else if (debuglevel > 4) {
-                    std::cerr 
+                    std::cerr
                         << filename << ": succeeded" << std::endl
                         << "result: " << std::endl << result << std::endl;
                 }
@@ -481,21 +483,21 @@ testwave_app::test_a_file(std::string filename)
                 printed_result = true;
             }
         }
-        
+
         if (!pp_result) {
         //  there was a preprocessing error, was it expected?
             std::string expected_error;
             if (!extract_special_information(filename, instr, 'E', expected_error))
                 return false;
-                
+
             if (!got_expected_result(filename, error, expected_error)) {
             // the error was unexpected
                 if (debuglevel > 2) {
-                    std::cerr 
+                    std::cerr
                         << filename << ": failed" << std::endl;
 
                     if (!expected_error.empty()) {
-                        std::cerr 
+                        std::cerr
                             << "error result: " << std::endl << error << std::endl
                             << "expected error: " << std::endl
                             << expected_error << std::endl;
@@ -509,24 +511,24 @@ testwave_app::test_a_file(std::string filename)
                 }
                 retval = false;
             }
-            
+
             if (retval) {
                 if (debuglevel > 5) {
-                    std::cerr 
-                        << filename << ": succeeded (caught expected error)" 
-                        << std::endl << "error result: " << std::endl << error 
+                    std::cerr
+                        << filename << ": succeeded (caught expected error)"
+                        << std::endl << "error result: " << std::endl << error
                         << std::endl;
-                        
+
                     if (!printed_result) {
-                        std::cerr 
-                            << "hooks result: " << std::endl << hooks 
+                        std::cerr
+                            << "hooks result: " << std::endl << hooks
                             << std::endl;
                     }
                 }
                 else if (debuglevel > 4) {
-                    std::cerr 
-                        << filename << ": succeeded (caught expected error)" 
-                        << std::endl << "error result: " << std::endl << error 
+                    std::cerr
+                        << filename << ": succeeded (caught expected error)"
+                        << std::endl << "error result: " << std::endl << error
                         << std::endl;
                 }
                 else if (debuglevel > 3) {
@@ -538,7 +540,7 @@ testwave_app::test_a_file(std::string filename)
         return retval;
     }
     else {
-        std::cerr 
+        std::cerr
             << filename << ": no information about expected results found"
             << std::endl;
     }
@@ -550,13 +552,13 @@ testwave_app::test_a_file(std::string filename)
 //  print the current version of this program
 //
 ///////////////////////////////////////////////////////////////////////////////
-int 
+int
 testwave_app::print_version()
 {
 // get time of last compilation of this file
 boost::wave::util::time_conversion_helper compilation_time(__DATE__ " " __TIME__);
 
-// calculate the number of days since Feb 12 2005 
+// calculate the number of days since Feb 12 2005
 // (the day the testwave project was started)
 std::tm first_day;
 
@@ -566,11 +568,11 @@ std::tm first_day;
     first_day.tm_mday = 12;         // 12
     first_day.tm_year = 105;        // 2005
 
-long seconds = long(std::difftime(compilation_time.get_time(), 
+long seconds = long(std::difftime(compilation_time.get_time(),
     std::mktime(&first_day)));
 
-    std::cout 
-        << TESTWAVE_VERSION_MAJOR << '.' 
+    std::cout
+        << TESTWAVE_VERSION_MAJOR << '.'
         << TESTWAVE_VERSION_MINOR << '.'
         << TESTWAVE_VERSION_SUBMINOR << '.'
         << seconds/(3600*24)        // get number of days from seconds
@@ -583,7 +585,7 @@ long seconds = long(std::difftime(compilation_time.get_time(),
 //  print the copyright statement
 //
 ///////////////////////////////////////////////////////////////////////////////
-int 
+int
 testwave_app::print_copyright()
 {
     char const *copyright[] = {
@@ -591,15 +593,15 @@ testwave_app::print_copyright()
         "Testwave: A test driver for the Boost.Wave C++ preprocessor library",
         "http://www.boost.org/",
         "",
-        "Copyright (c) 2001-2011 Hartmut Kaiser, Distributed under the Boost",
+        "Copyright (c) 2001-2012 Hartmut Kaiser, Distributed under the 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
     };
-    
+
     for (int i = 0; 0 != copyright[i]; ++i)
         std::cout << copyright[i] << std::endl;
-        
+
     return 0;                       // exit app
 }
 
@@ -608,36 +610,36 @@ testwave_app::print_copyright()
 //  Read the given file into a string
 //
 ///////////////////////////////////////////////////////////////////////////////
-bool 
+bool
 testwave_app::read_file(std::string const& filename, std::string& instr)
 {
 // open the given file and report error, if appropriate
     std::ifstream instream(filename.c_str());
     if (!instream.is_open()) {
-        std::cerr << "testwave: could not open input file: " 
+        std::cerr << "testwave: could not open input file: "
                   << filename << std::endl;
         return false;
     }
     else if (9 == debuglevel) {
-        std::cerr << "read_file: succeeded to open input file: " 
+        std::cerr << "read_file: succeeded to open input file: "
                   << filename << std::endl;
     }
     instream.unsetf(std::ios::skipws);
 
 // read the input file into a string
-    
+
 #if defined(BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS)
 // this is known to be very slow for large files on some systems
     std::copy (std::istream_iterator<char>(instream),
-        std::istream_iterator<char>(), 
+        std::istream_iterator<char>(),
         std::inserter(instr, instr.end()));
 #else
     instr = std::string(std::istreambuf_iterator<char>(instream.rdbuf()),
         std::istreambuf_iterator<char>());
-#endif 
-    
+#endif
+
     if (9 == debuglevel) {
-        std::cerr << "read_file: succeeded to read input file: " 
+        std::cerr << "read_file: succeeded to read input file: "
                   << filename << std::endl;
     }
     return true;
@@ -649,7 +651,7 @@ namespace {
     std::string const& trim_whitespace(std::string& value)
     {
         std::string::size_type first = value.find_first_not_of(" \t");
-        if (std::string::npos == first) 
+        if (std::string::npos == first)
             value.clear();
         else {
             std::string::size_type last = value.find_last_not_of(" \t");
@@ -665,12 +667,12 @@ namespace {
 //  Extract special information from comments marked with the given letter
 //
 ///////////////////////////////////////////////////////////////////////////////
-bool 
-testwave_app::extract_special_information(std::string const& filename, 
+bool
+testwave_app::extract_special_information(std::string const& filename,
     std::string const& instr, char flag, std::string& content)
 {
     if (9 == debuglevel) {
-        std::cerr << "extract_special_information: extracting special information ('" 
+        std::cerr << "extract_special_information: extracting special information ('"
                   << flag << "') from input file: " << filename << std::endl;
     }
 
@@ -678,15 +680,15 @@ testwave_app::extract_special_information(std::string const& filename,
     typedef boost::wave::cpplexer::lex_token<> token_type;
     typedef boost::wave::cpplexer::lex_iterator<token_type> lexer_type;
     typedef token_type::position_type position_type;
-    
-    boost::wave::language_support const lang_opts = 
+
+    boost::wave::language_support const lang_opts =
         (boost::wave::language_support)(
-            boost::wave::support_option_variadics | 
+            boost::wave::support_option_variadics |
             boost::wave::support_option_long_long |
             boost::wave::support_option_no_character_validation |
             boost::wave::support_option_convert_trigraphs |
             boost::wave::support_option_insert_whitespace);
-    
+
     position_type pos(filename.c_str());
     lexer_type it = lexer_type(instr.begin(), instr.end(), pos, lang_opts);
     lexer_type end = lexer_type();
@@ -702,29 +704,29 @@ testwave_app::extract_special_information(std::string const& filename,
                     if (value.size() > 3 && '(' == value[3]) {
                         std::size_t p = value.find_first_of(")");
                         if (std::string::npos == p) {
-                            std::cerr 
+                            std::cerr
                                 << "testwave: missing closing parenthesis in '"
                                 << flag << "()' directive" << std::endl;
                             return false;
                         }
                         std::string source = value.substr(4, p-4);
                         std::string result, error, hooks;
-                        bool pp_result = preprocess_file(filename, source, 
+                        bool pp_result = preprocess_file(filename, source,
                             result, error, hooks, true);
                         if (!pp_result) {
-                            std::cerr 
+                            std::cerr
                                 << "testwave: preprocessing error in '" << flag
                                 << "()' directive: " << error << std::endl;
                             return false;
                         }
-                        
-                        // include this text into the extracted information 
+
+                        // include this text into the extracted information
                         // only if the result is not zero
                         using namespace std;    // some system have atoi in namespace std
                         if (0 != atoi(result.c_str())) {
                             std::string thiscontent(value.substr(p+1));
                             if (9 == debuglevel) {
-                                std::cerr << "extract_special_information: extracted: " 
+                                std::cerr << "extract_special_information: extracted: "
                                           << thiscontent << std::endl;
                             }
                             trim_whitespace(thiscontent);
@@ -734,7 +736,7 @@ testwave_app::extract_special_information(std::string const& filename,
                     else {
                         std::string thiscontent(value.substr(3, value.size()-5));
                         if (9 == debuglevel) {
-                            std::cerr << "extract_special_information: extracted: " 
+                            std::cerr << "extract_special_information: extracted: "
                                       << thiscontent << std::endl;
                         }
                         trim_whitespace(thiscontent);
@@ -748,29 +750,29 @@ testwave_app::extract_special_information(std::string const& filename,
                     if (value.size() > 3 && '(' == value[3]) {
                         std::size_t p = value.find_first_of(")");
                         if (std::string::npos == p) {
-                            std::cerr 
+                            std::cerr
                                 << "testwave: missing closing parenthesis in '"
                                 << flag << "()' directive" << std::endl;
                             return false;
                         }
                         std::string source = value.substr(4, p-4);
                         std::string result, error, hooks;
-                        bool pp_result = preprocess_file(filename, source, 
+                        bool pp_result = preprocess_file(filename, source,
                             result, error, hooks, true);
                         if (!pp_result) {
-                            std::cerr 
+                            std::cerr
                                 << "testwave: preprocessing error in '" << flag
                                 << "()' directive: " << error << std::endl;
                             return false;
                         }
-                        
-                        // include this text into the extracted information 
+
+                        // include this text into the extracted information
                         // only if the result is not zero
                         using namespace std;    // some system have atoi in namespace std
                         if (0 != atoi(result.c_str())) {
                             std::string thiscontent(value.substr((' ' == value[p+1]) ? p+2 : p+1));
                             if (9 == debuglevel) {
-                                std::cerr << "extract_special_information: extracted: " 
+                                std::cerr << "extract_special_information: extracted: "
                                           << thiscontent << std::endl;
                             }
                             trim_whitespace(thiscontent);
@@ -780,7 +782,7 @@ testwave_app::extract_special_information(std::string const& filename,
                     else {
                         std::string thiscontent(value.substr((' ' == value[3]) ? 4 : 3));
                         if (9 == debuglevel) {
-                            std::cerr << "extract_special_information: extracted: " 
+                            std::cerr << "extract_special_information: extracted: "
                                       << thiscontent;
                         }
                         trim_whitespace(content);
@@ -792,14 +794,14 @@ testwave_app::extract_special_information(std::string const& filename,
     }
     catch (boost::wave::cpplexer::lexing_exception const &e) {
     // some lexing error
-        std::cerr 
+        std::cerr
             << e.file_name() << "(" << e.line_no() << "): "
             << e.description() << std::endl;
         return false;
     }
 
     if (9 == debuglevel) {
-        std::cerr << "extract_special_information: succeeded extracting special information ('" 
+        std::cerr << "extract_special_information: succeeded extracting special information ('"
                   << flag << "')" << std::endl;
     }
     return true;
@@ -814,8 +816,8 @@ testwave_app::extract_special_information(std::string const& filename,
 //  through the parameter 'expected'.
 //
 ///////////////////////////////////////////////////////////////////////////////
-inline bool 
-testwave_app::extract_expected_output(std::string const& filename, 
+inline bool
+testwave_app::extract_expected_output(std::string const& filename,
     std::string const& instr, std::string& expected, std::string& expectedhooks)
 {
     return extract_special_information(filename, instr, 'R', expected) &&
@@ -825,41 +827,41 @@ testwave_app::extract_expected_output(std::string const& filename,
 ///////////////////////////////////////////////////////////////////////////////
 //
 //  Extracts the required preprocessing options from the given input data and
-//  initialises the given Wave context object accordingly. 
-//  We allow the same (applicable) options to be used as are valid for the wave 
+//  initialises the given Wave context object accordingly.
+//  We allow the same (applicable) options to be used as are valid for the wave
 //  driver executable.
 //
 ///////////////////////////////////////////////////////////////////////////////
 template <typename Context>
-bool 
-testwave_app::extract_options(std::string const& filename, 
-    std::string const& instr, Context& ctx, bool single_line)
+bool
+testwave_app::extract_options(std::string const& filename,
+    std::string const& instr, Context& ctx, bool single_line,
+    po::variables_map& vm)
 {
     if (9 == debuglevel) {
         std::cerr << "extract_options: extracting options" << std::endl;
     }
 
-//  extract the required information from the comments flagged by a 
+//  extract the required information from the comments flagged by a
 //  capital 'O'
     std::string options;
     if (!extract_special_information(filename, instr, 'O', options))
         return false;
 
-    try {        
+    try {
     //  parse the configuration information into a program_options_description
     //  object
-        po::variables_map local_vm;
-        cmd_line_utils::read_config_options(debuglevel, options, desc_options, local_vm);
-        initialise_options(ctx, local_vm, single_line);
+        cmd_line_utils::read_config_options(debuglevel, options, desc_options, vm);
+        initialise_options(ctx, vm, single_line);
     }
     catch (std::exception const &e) {
-        std::cerr << filename << ": exception caught: " << e.what() 
+        std::cerr << filename << ": exception caught: " << e.what()
                   << std::endl;
         return false;
     }
-    
+
     if (9 == debuglevel) {
-        std::cerr << "extract_options: succeeded extracting options" 
+        std::cerr << "extract_options: succeeded extracting options"
                   << std::endl;
     }
 
@@ -867,7 +869,7 @@ testwave_app::extract_options(std::string const& filename,
 }
 
 template <typename Context>
-bool 
+bool
 testwave_app::initialise_options(Context& ctx, po::variables_map const& vm,
     bool single_line)
 {
@@ -891,8 +893,8 @@ testwave_app::initialise_options(Context& ctx, po::variables_map const& vm,
         }
         ctx.set_language(
             boost::wave::language_support(
-                boost::wave::support_c99 
-              | boost::wave::support_option_emit_line_directives 
+                boost::wave::support_c99
+              | boost::wave::support_option_emit_line_directives
 #if BOOST_WAVE_SUPPORT_PRAGMA_ONCE != 0
               | boost::wave::support_option_include_guard_detection
 #endif
@@ -919,9 +921,9 @@ testwave_app::initialise_options(Context& ctx, po::variables_map const& vm,
         ctx.set_language(
             boost::wave::language_support(
                 boost::wave::support_cpp0x
-              |  boost::wave::support_option_convert_trigraphs 
-              |  boost::wave::support_option_long_long 
-              |  boost::wave::support_option_emit_line_directives 
+              |  boost::wave::support_option_convert_trigraphs
+              |  boost::wave::support_option_long_long
+              |  boost::wave::support_option_emit_line_directives
 #if BOOST_WAVE_SUPPORT_PRAGMA_ONCE != 0
               |  boost::wave::support_option_include_guard_detection
 #endif
@@ -940,7 +942,7 @@ testwave_app::initialise_options(Context& ctx, po::variables_map const& vm,
         }
         ctx.set_language(boost::wave::enable_long_long(ctx.get_language()));
     }
-    
+
 // enable preserving comments mode, if appropriate
     if (vm.count("preserve")) {
         if (9 == debuglevel) {
@@ -949,7 +951,7 @@ testwave_app::initialise_options(Context& ctx, po::variables_map const& vm,
         ctx.set_language(
             boost::wave::enable_preserve_comments(ctx.get_language()));
     }
-    
+
 // disable automatic include guard detection
     if (vm.count("noguard")) {
         if (9 == debuglevel) {
@@ -958,7 +960,7 @@ testwave_app::initialise_options(Context& ctx, po::variables_map const& vm,
         ctx.set_language(
             boost::wave::enable_include_guard_detection(ctx.get_language(), false));
     }
-    
+
 // enable trigraph conversion
     if (9 == debuglevel) {
         std::cerr << "initialise_options: option: convert_trigraphs" << std::endl;
@@ -973,35 +975,35 @@ testwave_app::initialise_options(Context& ctx, po::variables_map const& vm,
         ctx.set_language(boost::wave::enable_single_line(ctx.get_language()));
         ctx.set_language(boost::wave::enable_emit_line_directives(ctx.get_language(), false));
     }
-    
+
 //  add include directories to the system include search paths
     if (vm.count("sysinclude")) {
-    std::vector<std::string> const& syspaths = 
+    std::vector<std::string> const& syspaths =
         variables_map_as(vm["sysinclude"], (std::vector<std::string> *)NULL);
-    
+
         std::vector<std::string>::const_iterator end = syspaths.end();
-        for (std::vector<std::string>::const_iterator cit = syspaths.begin(); 
+        for (std::vector<std::string>::const_iterator cit = syspaths.begin();
               cit != end; ++cit)
         {
             if (9 == debuglevel) {
-                std::cerr << "initialise_options: option: -S" << *cit 
+                std::cerr << "initialise_options: option: -S" << *cit
                           << std::endl;
             }
             ctx.add_sysinclude_path((*cit).c_str());
         }
     }
-    
+
 //  add include directories to the user include search paths
     if (vm.count("include")) {
-        cmd_line_utils::include_paths const &ip = 
+        cmd_line_utils::include_paths const &ip =
             variables_map_as(vm["include"], (cmd_line_utils::include_paths*)NULL);
         std::vector<std::string>::const_iterator end = ip.paths.end();
 
-        for (std::vector<std::string>::const_iterator cit = ip.paths.begin(); 
+        for (std::vector<std::string>::const_iterator cit = ip.paths.begin();
               cit != end; ++cit)
         {
             if (9 == debuglevel) {
-                std::cerr << "initialise_options: option: -I" << *cit 
+                std::cerr << "initialise_options: option: -I" << *cit
                           << std::endl;
             }
             ctx.add_include_path((*cit).c_str());
@@ -1014,46 +1016,46 @@ testwave_app::initialise_options(Context& ctx, po::variables_map const& vm,
             }
             ctx.set_sysinclude_delimiter();
         }
-        
+
     // add system include directories to the include path
         std::vector<std::string>::const_iterator sysend = ip.syspaths.end();
-        for (std::vector<std::string>::const_iterator syscit = ip.syspaths.begin(); 
+        for (std::vector<std::string>::const_iterator syscit = ip.syspaths.begin();
               syscit != sysend; ++syscit)
         {
             if (9 == debuglevel) {
-                std::cerr << "initialise_options: option: -S" << *syscit 
+                std::cerr << "initialise_options: option: -S" << *syscit
                           << std::endl;
             }
             ctx.add_sysinclude_path((*syscit).c_str());
         }
     }
 
-//  add additional defined macros 
+//  add additional defined macros
     if (vm.count("define")) {
-        std::vector<std::string> const &macros = 
+        std::vector<std::string> const &macros =
             variables_map_as(vm["define"], (std::vector<std::string>*)NULL);
         std::vector<std::string>::const_iterator end = macros.end();
-        for (std::vector<std::string>::const_iterator cit = macros.begin(); 
+        for (std::vector<std::string>::const_iterator cit = macros.begin();
               cit != end; ++cit)
         {
             if (9 == debuglevel) {
-                std::cerr << "initialise_options: option: -D" << *cit 
+                std::cerr << "initialise_options: option: -D" << *cit
                           << std::endl;
             }
             ctx.add_macro_definition(*cit, true);
         }
     }
 
-//  add additional predefined macros 
+//  add additional predefined macros
     if (vm.count("predefine")) {
-        std::vector<std::string> const &predefmacros = 
+        std::vector<std::string> const &predefmacros =
             variables_map_as(vm["predefine"], (std::vector<std::string>*)NULL);
         std::vector<std::string>::const_iterator end = predefmacros.end();
-        for (std::vector<std::string>::const_iterator cit = predefmacros.begin(); 
+        for (std::vector<std::string>::const_iterator cit = predefmacros.begin();
               cit != end; ++cit)
         {
             if (9 == debuglevel) {
-                std::cerr << "initialise_options: option: -P" << *cit 
+                std::cerr << "initialise_options: option: -P" << *cit
                           << std::endl;
             }
             ctx.add_macro_definition(*cit, true);
@@ -1062,14 +1064,14 @@ testwave_app::initialise_options(Context& ctx, po::variables_map const& vm,
 
 //  undefine specified macros
     if (vm.count("undefine")) {
-        std::vector<std::string> const &undefmacros = 
+        std::vector<std::string> const &undefmacros =
             variables_map_as(vm["undefine"], (std::vector<std::string>*)NULL);
         std::vector<std::string>::const_iterator end = undefmacros.end();
-        for (std::vector<std::string>::const_iterator cit = undefmacros.begin(); 
+        for (std::vector<std::string>::const_iterator cit = undefmacros.begin();
               cit != end; ++cit)
         {
             if (9 == debuglevel) {
-                std::cerr << "initialise_options: option: -U" << *cit 
+                std::cerr << "initialise_options: option: -U" << *cit
                           << std::endl;
             }
             ctx.remove_macro_definition(*cit);
@@ -1080,19 +1082,19 @@ testwave_app::initialise_options(Context& ctx, po::variables_map const& vm,
     if (vm.count("nesting")) {
         int max_depth = variables_map_as(vm["nesting"], (int*)NULL);
         if (max_depth < 1 || max_depth > 100000) {
-            std::cerr << "testwave: bogus maximal include nesting depth: " 
+            std::cerr << "testwave: bogus maximal include nesting depth: "
                 << max_depth << std::endl;
             return false;
         }
         else if (9 == debuglevel) {
-            std::cerr << "initialise_options: option: -n" << max_depth 
+            std::cerr << "initialise_options: option: -n" << max_depth
                       << std::endl;
         }
         ctx.set_max_include_nesting_depth(max_depth);
     }
 
     if (9 == debuglevel) {
-        std::cerr << "initialise_options: succeeded to initialize options" 
+        std::cerr << "initialise_options: succeeded to initialize options"
                   << std::endl;
     }
     return true;
@@ -1101,7 +1103,7 @@ testwave_app::initialise_options(Context& ctx, po::variables_map const& vm,
 ///////////////////////////////////////////////////////////////////////////////
 //  construct a SIZEOF macro definition string and predefine this macro
 template <typename Context>
-inline bool 
+inline bool
 testwave_app::add_sizeof_definition(Context& ctx, char const *name, int value)
 {
     BOOST_WAVETEST_OSSTREAM strm;
@@ -1109,12 +1111,12 @@ testwave_app::add_sizeof_definition(Context& ctx, char const *name, int value)
 
     std::string macro(BOOST_WAVETEST_GETSTRING(strm));
     if (!ctx.add_macro_definition(macro, true)) {
-        std::cerr << "testwave: failed to predefine macro: " << macro 
+        std::cerr << "testwave: failed to predefine macro: " << macro
                   << std::endl;
         return false;
     }
     else if (9 == debuglevel) {
-        std::cerr << "add_sizeof_definition: predefined macro: " << macro 
+        std::cerr << "add_sizeof_definition: predefined macro: " << macro
                   << std::endl;
     }
     return true;
@@ -1122,28 +1124,28 @@ testwave_app::add_sizeof_definition(Context& ctx, char const *name, int value)
 
 //  construct a MIN macro definition string and predefine this macro
 template <typename T, typename Context>
-inline bool 
+inline bool
 testwave_app::add_min_definition(Context& ctx, char const *name)
 {
     BOOST_WAVETEST_OSSTREAM strm;
     if (!std::numeric_limits<T>::is_signed) {
-        strm << "__TESTWAVE_" << name << "_MIN__=" 
-              << "0x" << std::hex 
+        strm << "__TESTWAVE_" << name << "_MIN__="
+              << "0x" << std::hex
               << (std::numeric_limits<T>::min)() << "U";
     }
     else {
-        strm << "__TESTWAVE_" << name << "_MIN__=( " 
+        strm << "__TESTWAVE_" << name << "_MIN__=( "
               << (std::numeric_limits<T>::min)()+1 << "-1)";
     }
-    
+
     std::string macro(BOOST_WAVETEST_GETSTRING(strm));
     if (!ctx.add_macro_definition(macro, true)) {
-        std::cerr << "testwave: failed to predefine macro: " << macro 
+        std::cerr << "testwave: failed to predefine macro: " << macro
                   << std::endl;
         return false;
     }
     else if (9 == debuglevel) {
-        std::cerr << "add_min_definition: predefined macro: " << macro 
+        std::cerr << "add_min_definition: predefined macro: " << macro
                   << std::endl;
     }
     return true;
@@ -1151,28 +1153,28 @@ testwave_app::add_min_definition(Context& ctx, char const *name)
 
 //  construct a MAX macro definition string and predefine this macro
 template <typename T, typename Context>
-inline bool 
+inline bool
 testwave_app::add_max_definition(Context& ctx, char const *name)
 {
     BOOST_WAVETEST_OSSTREAM strm;
     if (!std::numeric_limits<T>::is_signed) {
-        strm << "__TESTWAVE_" << name << "_MAX__=" 
-              << "0x" << std::hex 
+        strm << "__TESTWAVE_" << name << "_MAX__="
+              << "0x" << std::hex
               << (std::numeric_limits<T>::max)() << "U";
     }
     else {
-        strm << "__TESTWAVE_" << name << "_MAX__=" 
+        strm << "__TESTWAVE_" << name << "_MAX__="
               << (std::numeric_limits<T>::max)();
     }
-    
+
     std::string macro(BOOST_WAVETEST_GETSTRING(strm));
     if (!ctx.add_macro_definition(macro, true)) {
-        std::cerr << "testwave: failed to predefine macro: " << macro 
+        std::cerr << "testwave: failed to predefine macro: " << macro
                   << std::endl;
         return false;
     }
     else if (9 == debuglevel) {
-        std::cerr << "add_max_definition: predefined macro: " << macro 
+        std::cerr << "add_max_definition: predefined macro: " << macro
                   << std::endl;
     }
     return true;
@@ -1180,17 +1182,17 @@ testwave_app::add_max_definition(Context& ctx, char const *name)
 
 //  Predefine __TESTWAVE_HAS_STRICT_LEXER__
 template <typename Context>
-inline bool 
+inline bool
 testwave_app::add_strict_lexer_definition(Context& ctx)
 {
     std::string macro("__TESTWAVE_HAS_STRICT_LEXER__=1");
     if (!ctx.add_macro_definition(macro, true)) {
-        std::cerr << "testwave: failed to predefine macro: " << macro 
+        std::cerr << "testwave: failed to predefine macro: " << macro
                   << std::endl;
         return false;
     }
     else if (9 == debuglevel) {
-        std::cerr << "add_strict_lexer_definition: predefined macro: " << macro 
+        std::cerr << "add_strict_lexer_definition: predefined macro: " << macro
                   << std::endl;
     }
     return true;
@@ -1200,12 +1202,12 @@ testwave_app::add_strict_lexer_definition(Context& ctx)
 //
 //  Add special predefined macros to the context object.
 //
-//  This adds a lot of macros to the test environment, which allows to adjust 
+//  This adds a lot of macros to the test environment, which allows to adjust
 //  the test cases for different platforms.
 //
 ///////////////////////////////////////////////////////////////////////////////
 template <typename Context>
-bool 
+bool
 testwave_app::add_predefined_macros(Context& ctx)
 {
     // add the __TESTWAVE_SIZEOF_<type>__ macros
@@ -1217,11 +1219,11 @@ testwave_app::add_predefined_macros(Context& ctx)
 #endif
         !add_sizeof_definition(ctx, "LONG", sizeof(long)))
     {
-        std::cerr << "testwave: failed to add a predefined macro (SIZEOF)." 
+        std::cerr << "testwave: failed to add a predefined macro (SIZEOF)."
                   << std::endl;
         return false;
     }
-    
+
     // add the __TESTWAVE_<type>_MIN__ macros
     if (/*!add_min_definition<char>(ctx, "CHAR") ||*/
         /*!add_min_definition<unsigned char>(ctx, "UCHAR") ||*/
@@ -1236,10 +1238,10 @@ testwave_app::add_predefined_macros(Context& ctx)
         !add_min_definition<long>(ctx, "LONG") ||
         !add_min_definition<unsigned long>(ctx, "ULONG"))
     {
-        std::cerr << "testwave: failed to add a predefined macro (MIN)." 
+        std::cerr << "testwave: failed to add a predefined macro (MIN)."
                   << std::endl;
     }
-    
+
     // add the __TESTWAVE_<type>_MAX__ macros
     if (/*!add_max_definition<char>(ctx, "CHAR") ||*/
         /*!add_max_definition<unsigned char>(ctx, "UCHAR") ||*/
@@ -1254,7 +1256,7 @@ testwave_app::add_predefined_macros(Context& ctx)
         !add_max_definition<long>(ctx, "LONG") ||
         !add_max_definition<unsigned long>(ctx, "ULONG"))
     {
-        std::cerr << "testwave: failed to add a predefined macro (MAX)." 
+        std::cerr << "testwave: failed to add a predefined macro (MAX)."
                   << std::endl;
     }
 
@@ -1267,31 +1269,31 @@ testwave_app::add_predefined_macros(Context& ctx)
 
 ///////////////////////////////////////////////////////////////////////////////
 //
-//  Preprocess the given input data and return the generated output through 
+//  Preprocess the given input data and return the generated output through
 //  the parameter 'result'.
 //
 ///////////////////////////////////////////////////////////////////////////////
-bool 
-testwave_app::preprocess_file(std::string filename, std::string const& instr, 
+bool
+testwave_app::preprocess_file(std::string filename, std::string const& instr,
     std::string& result, std::string& error, std::string& hooks,
     bool single_line)
 {
-//  create the wave::context object and initialize it from the file to 
+//  create the wave::context object and initialize it from the file to
 //  preprocess (may contain options inside of special comments)
     typedef boost::wave::cpplexer::lex_token<> token_type;
     typedef boost::wave::cpplexer::lex_iterator<token_type> lexer_type;
     typedef boost::wave::context<
         std::string::const_iterator, lexer_type,
         boost::wave::iteration_context_policies::load_file_to_string,
-        collect_hooks_information<token_type> > 
+        collect_hooks_information<token_type> >
     context_type;
 
     if (9 == debuglevel) {
-        std::cerr << "preprocess_file: preprocessing input file: " << filename 
+        std::cerr << "preprocess_file: preprocessing input file: " << filename
                   << std::endl;
     }
 
-    try {    
+    try {
     //  create preprocessing context
         context_type ctx(instr.begin(), instr.end(), filename.c_str(),
             collect_hooks_information<token_type>(hooks));
@@ -1300,21 +1302,44 @@ testwave_app::preprocess_file(std::string filename, std::string const& instr,
         if (!initialise_options(ctx, global_vm, single_line))
             return false;
 
-    //  extract the options from the input data and initialize the context 
-        if (!extract_options(filename, instr, ctx, single_line))
+    //  extract the options from the input data and initialize the context
+        boost::program_options::variables_map local_vm;
+        if (!extract_options(filename, instr, ctx, single_line, local_vm))
             return false;
 
     //  add special predefined macros
         if (!add_predefined_macros(ctx))
             return false;
-        
-    //  preprocess the input, loop over all generated tokens collecting the 
-    //  generated text 
+
+    //  preprocess the input, loop over all generated tokens collecting the
+    //  generated text
+        context_type::iterator_type it = ctx.begin();
         context_type::iterator_type end = ctx.end();
-        for (context_type::iterator_type it = ctx.begin(); it != end; ++it) 
+
+        if (local_vm.count("forceinclude")) {
+        // add the filenames to force as include files in _reverse_ order
+        // the second parameter 'is_last' of the force_include function should
+        // be set to true for the last (first given) file.
+            std::vector<std::string> const &force =
+                local_vm["forceinclude"].as<std::vector<std::string> >();
+            std::vector<std::string>::const_reverse_iterator rend = force.rend();
+            for (std::vector<std::string>::const_reverse_iterator cit = force.rbegin();
+                 cit != rend; /**/)
+            {
+                std::string forceinclude(*cit);
+                if (9 == debuglevel) {
+                    std::cerr << "preprocess_file: option: forceinclude ("
+                              << forceinclude << ")" << std::endl;
+                }
+                it.force_include(forceinclude.c_str(), ++cit == rend);
+            }
+        }
+
+    // perform actual preprocessing
+        for (/**/; it != end; ++it)
         {
             using namespace boost::wave;
-            
+
             if (T_PP_LINE == token_id(*it)) {
             // special handling of the whole #line directive is required to
             // allow correct file name matching
@@ -1322,8 +1347,8 @@ testwave_app::preprocess_file(std::string filename, std::string const& instr,
                     return false;   // unexpected eof
             }
             else {
-                // add the value of the current token 
-                result = result + (*it).get_value().c_str();  
+                // add the value of the current token
+                result = result + (*it).get_value().c_str();
             }
         }
         error.clear();
@@ -1332,10 +1357,10 @@ testwave_app::preprocess_file(std::string filename, std::string const& instr,
     // some lexer error
         BOOST_WAVETEST_OSSTREAM strm;
         std::string filename = e.file_name();
-        strm 
+        strm
             << handle_filepath(filename) << "(" << e.line_no() << "): "
             << e.description() << std::endl;
-            
+
         error = BOOST_WAVETEST_GETSTRING(strm);
         return false;
     }
@@ -1343,16 +1368,16 @@ testwave_app::preprocess_file(std::string filename, std::string const& instr,
     // some preprocessing error
         BOOST_WAVETEST_OSSTREAM strm;
         std::string filename = e.file_name();
-        strm 
+        strm
             << handle_filepath(filename) << "(" << e.line_no() << "): "
             << e.description() << std::endl;
-            
+
         error = BOOST_WAVETEST_GETSTRING(strm);
         return false;
     }
-    
+
     if (9 == debuglevel) {
-        std::cerr << "preprocess_file: succeeded to preprocess input file: " 
+        std::cerr << "preprocess_file: succeeded to preprocess input file: "
                   << filename << std::endl;
     }
 
diff --git a/test/testwave/testwave_app.hpp b/test/testwave/testwave_app.hpp
index 6450ca3..68ab6db 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See accompanying file
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
@@ -23,25 +23,25 @@ class testwave_app
 {
 public:
     testwave_app(boost::program_options::variables_map const& vm);
-    
-    //  Test the given file (i.e. preprocess the file and compare the result 
+
+    //  Test the given file (i.e. preprocess the file and compare the result
     //  against the embedded 'R' comments, if an error occurs compare the error
     //  message against the given 'E' comments).
     bool test_a_file(std::string filename);
-    
+
     //  print the current version of this program
     int print_version();
-    
+
     //  print the copyright statement
     int print_copyright();
 
     // access the common options used for the command line and the config
     // options inside the test files
     boost::program_options::options_description const& common_options() const
-    { 
-        return desc_options; 
+    {
+        return desc_options;
     }
-    
+
     void set_debuglevel(int debuglevel_)
     {
         debuglevel = debuglevel_;
@@ -50,67 +50,68 @@ public:
     {
         return debuglevel;
     }
-    
+
 protected:
     //  Read the given file into a string
     bool read_file(std::string const& filename, std::string& instr);
 
     //  Extract special information from comments marked with the given letter
-    bool extract_special_information(std::string const& filename, 
+    bool extract_special_information(std::string const& filename,
         std::string const& instr, char flag, std::string& content);
 
-    //  Extract the expected output and expected hooks information from the 
+    //  Extract the expected output and expected hooks information from the
     //  given input data.
     //  The expected output has to be provided inside of special comments which
-    //  start with a capital 'R' ('H' for the hooks information). All such 
+    //  start with a capital 'R' ('H' for the hooks information). All such
     //  comments are concatenated and returned through the parameter 'expected'
     //  ('expectedhooks' for hooks information).
-    bool extract_expected_output(std::string const& filename, 
-        std::string const& instr, std::string& expected, 
+    bool extract_expected_output(std::string const& filename,
+        std::string const& instr, std::string& expected,
         std::string& expectedhooks);
-        
-    //  Extracts the required preprocessing options from the given input data 
-    //  and initializes the given Wave context object accordingly. 
-    //  We allow the same (applicable) options to be used as are valid for the 
+
+    //  Extracts the required preprocessing options from the given input data
+    //  and initializes the given Wave context object accordingly.
+    //  We allow the same (applicable) options to be used as are valid for the
     //  wave driver executable.
     template <typename Context>
-    bool extract_options(std::string const& filename, 
-        std::string const& instr, Context& ctx, bool single_line);
+    bool extract_options(std::string const& filename,
+        std::string const& instr, Context& ctx, bool single_line,
+        boost::program_options::variables_map& vm);
 
-    //  transfers the options collected in the vm parameter into the given 
+    //  transfers the options collected in the vm parameter into the given
     //  context
     template <typename Context>
-    bool initialise_options(Context& ctx, 
+    bool initialise_options(Context& ctx,
         boost::program_options::variables_map const& vm, bool single_line);
 
-    //  Preprocess the given input data and return the generated output through 
+    //  Preprocess the given input data and return the generated output through
     //  the parameter 'result'.
-    bool preprocess_file(std::string filename, std::string const& instr, 
-        std::string& result, std::string& error, std::string& hooks, 
+    bool preprocess_file(std::string filename, std::string const& instr,
+        std::string& result, std::string& error, std::string& hooks,
         bool single_line = false);
 
     //  Add special predefined macros to the context object
     template <typename Context>
     bool add_predefined_macros(Context& ctx);
 
-    //  This function compares the real result and the expected one but first 
-    //  replaces all occurrences in the expected result of 
+    //  This function compares the real result and the expected one but first
+    //  replaces all occurrences in the expected result of
     //      $E: to the result of preprocessing the given expression
-    //      $F: to the passed full filepath 
+    //      $F: to the passed full filepath
     //      $P: to the full path
     //      $R: to the relative path
     //      $V: to the current Boost version number
-    bool got_expected_result(std::string const& filename, 
+    bool got_expected_result(std::string const& filename,
         std::string const& result, std::string& expected);
 
     //  construct a SIZEOF macro definition string and predefine this macro
     template <typename Context>
     bool add_sizeof_definition(Context& ctx, char const *name, int value);
-    
+
     //  construct a MIN macro definition string and predefine this macro
     template <typename T, typename Context>
     bool add_min_definition(Context& ctx, char const *name);
-    
+
     //  construct a MAX macro definition string and predefine this macro
     template <typename T, typename Context>
     bool add_max_definition(Context& ctx, char const *name);
diff --git a/test/testwave/testwave_app_dll.cpp b/test/testwave/testwave_app_dll.cpp
index fc13812..ccc1948 100644
--- a/test/testwave/testwave_app_dll.cpp
+++ b/test/testwave/testwave_app_dll.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.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_dll.cpp b/test/testwave/testwave_dll.cpp
index 0039445..ac671b3 100644
--- a/test/testwave/testwave_dll.cpp
+++ b/test/testwave/testwave_dll.cpp
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
-    Copyright (c) 2001-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, 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 91270dc..6a1d010 100644
--- a/tool/cpp.cpp
+++ b/tool/cpp.cpp
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
-    Copyright (c) 2001-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See accompanying file
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
@@ -60,7 +60,7 @@ typedef boost::archive::text_oarchive oarchive;
 //  Include lexer specifics, import lexer names
 #if BOOST_WAVE_SEPARATE_LEXER_INSTANTIATION == 0
 #include <boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp>
-#endif 
+#endif
 
 ///////////////////////////////////////////////////////////////////////////////
 //  Include the grammar definitions, if these shouldn't be compiled separately
@@ -72,7 +72,7 @@ typedef boost::archive::text_oarchive oarchive;
 #include <boost/wave/grammars/cpp_expression_grammar.hpp>
 #include <boost/wave/grammars/cpp_predef_macros_grammar.hpp>
 #include <boost/wave/grammars/cpp_defined_grammar.hpp>
-#endif 
+#endif
 
 ///////////////////////////////////////////////////////////////////////////////
 //  Import required names
@@ -91,7 +91,7 @@ using std::istreambuf_iterator;
 
 ///////////////////////////////////////////////////////////////////////////////
 //
-//  This application uses the lex_iterator and lex_token types predefined 
+//  This application uses the lex_iterator and lex_token types predefined
 //  with the Wave library, but it is possible to use your own types.
 //
 //  You may want to have a look at the other samples to see how this is
@@ -100,14 +100,14 @@ using std::istreambuf_iterator;
     typedef boost::wave::cpplexer::lex_iterator<token_type>
         lex_iterator_type;
 
-//  The C++ preprocessor iterators shouldn't be constructed directly. They 
-//  are to be generated through a boost::wave::context<> object. This 
-//  boost::wave::context object is additionally to be used to initialize and 
+//  The C++ preprocessor iterators shouldn't be constructed directly. They
+//  are to be generated through a boost::wave::context<> object. This
+//  boost::wave::context object is additionally to be used to initialize and
 //  define different parameters of the actual preprocessing.
     typedef boost::wave::context<
             std::string::iterator, lex_iterator_type,
             boost::wave::iteration_context_policies::load_file_to_string,
-            trace_macro_expansion<token_type> > 
+            trace_macro_expansion<token_type> >
         context_type;
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -138,7 +138,7 @@ int print_copyright()
         "Wave: A Standard conformant C++ preprocessor based on the Boost.Wave library",
         "http://www.boost.org/",
         "",
-        "Copyright (c) 2001-2011 Hartmut Kaiser, Distributed under the Boost",
+        "Copyright (c) 2001-2012 Hartmut Kaiser, Distributed under the 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
@@ -152,7 +152,7 @@ int print_copyright()
 
 ///////////////////////////////////////////////////////////////////////////////
 // forward declarations only
-namespace cmd_line_utils 
+namespace cmd_line_utils
 {
     class include_paths;
 }
@@ -173,12 +173,12 @@ namespace fs = boost::filesystem;
 ///////////////////////////////////////////////////////////////////////////////
 namespace cmd_line_utils {
 
-    // Additional command line parser which interprets '@something' as an 
+    // Additional command line parser which interprets '@something' as an
     // option "config-file" with the value "something".
-    inline pair<std::string, std::string> 
+    inline pair<std::string, std::string>
     at_option_parser(std::string const&s)
     {
-        if ('@' == s[0]) 
+        if ('@' == s[0])
             return std::make_pair(std::string("config-file"), s.substr(1));
         else
             return pair<std::string, std::string>();
@@ -194,7 +194,7 @@ namespace cmd_line_utils {
         bool seen_separator;        // command line contains a '-I-' option
 
         // Function which validates additional tokens from command line.
-        static void 
+        static void
         validate(boost::any &v, vector<std::string> const &tokens)
         {
             if (v.empty())
@@ -208,11 +208,11 @@ namespace cmd_line_utils {
             if (t == "-") {
             // found -I- option, so switch behaviour
                 p->seen_separator = true;
-            } 
+            }
             else if (p->seen_separator) {
             // store this path as a system path
-                p->syspaths.push_back(t); 
-            } 
+                p->syspaths.push_back(t);
+            }
             else {
             // store this path as an user path
                 p->paths.push_back(t);
@@ -222,7 +222,7 @@ namespace cmd_line_utils {
 
     // Read all options from a given config file, parse and add them to the
     // given variables_map
-    bool read_config_file_options(std::string const &filename, 
+    bool read_config_file_options(std::string const &filename,
         po::options_description const &desc, po::variables_map &vm,
         bool may_fail = false)
     {
@@ -230,7 +230,7 @@ namespace cmd_line_utils {
 
         if (!ifs.is_open()) {
             if (!may_fail) {
-                cerr << filename 
+                cerr << filename
                     << ": command line warning: config file not found"
                     << endl;
             }
@@ -243,7 +243,7 @@ namespace cmd_line_utils {
         while (std::getline(ifs, line)) {
         // skip empty lines
             std::string::size_type pos = line.find_first_not_of(" \t");
-            if (pos == std::string::npos) 
+            if (pos == std::string::npos)
                 continue;
 
         // skip comment lines
@@ -294,7 +294,7 @@ namespace cmd_line_utils {
 namespace boost { namespace program_options {
 
     void validate(boost::any &v, std::vector<std::string> const &s,
-        cmd_line_utils::include_paths *, long) 
+        cmd_line_utils::include_paths *, long)
     {
         cmd_line_utils::include_paths::validate(v, s);
     }
@@ -315,8 +315,8 @@ namespace {
         ~auto_stop_watch()
         {
             if (print_time) {
-                outstrm << "Elapsed time: " 
-                      << this->format_elapsed_time() 
+                outstrm << "Elapsed time: "
+                      << this->format_elapsed_time()
                       << std::endl;
             }
         }
@@ -325,14 +325,14 @@ namespace {
         {
             print_time = print_time_;
         }
-        
+
     private:
         bool print_time;
         std::ostream &outstrm;
     };
 
     ///////////////////////////////////////////////////////////////////////////
-    inline std::string 
+    inline std::string
     report_iostate_error(std::ios::iostate state)
     {
         BOOST_ASSERT(state & (std::ios::badbit | std::ios::failbit | std::ios::eofbit));
@@ -356,7 +356,7 @@ namespace {
     //  Retrieve the position of a macro definition
     template <typename Context>
     inline bool
-    get_macro_position(Context &ctx, 
+    get_macro_position(Context &ctx,
         typename Context::token_type::string_type const& name,
         typename Context::position_type &pos)
     {
@@ -365,19 +365,19 @@ namespace {
         std::vector<typename Context::token_type> parameters;
         typename Context::token_sequence_type definition;
 
-        return ctx.get_macro_definition(name, has_parameters, is_predefined, 
+        return ctx.get_macro_definition(name, has_parameters, is_predefined,
             pos, parameters, definition);
     }
 
     ///////////////////////////////////////////////////////////////////////////
     //  Generate some meaningful error messages
-    template <typename Exception>        
-    inline int 
+    template <typename Exception>
+    inline int
     report_error_message(Exception const &e)
     {
         // default error reporting
-        cerr 
-            << e.file_name() << ":" << e.line_no() << ":" << e.column_no() 
+        cerr
+            << e.file_name() << ":" << e.line_no() << ":" << e.column_no()
             << ": " << e.description() << endl;
 
         // errors count as one
@@ -386,7 +386,7 @@ namespace {
     }
 
     template <typename Context>
-    inline int 
+    inline int
     report_error_message(Context &ctx, boost::wave::cpp_exception const &e)
     {
         // default error reporting
@@ -399,16 +399,16 @@ namespace {
                 // 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 << ": " 
+                    cerr
+                        << pos << ": "
                         << preprocess_exception::severity_text(e.get_severity())
-                        << ": this is the location of the previous definition." 
+                        << ": this is the location of the previous definition."
                         << endl;
                 }
                 else {
-                    cerr 
-                        << e.file_name() << ":" << e.line_no() << ":" 
-                        << e.column_no() << ": " 
+                    cerr
+                        << e.file_name() << ":" << e.line_no() << ":"
+                        << e.column_no() << ": "
                         << preprocess_exception::severity_text(e.get_severity())
                         << ": not able to retrieve the location of the previous "
                         << "definition." << endl;
@@ -425,7 +425,7 @@ namespace {
 
     ///////////////////////////////////////////////////////////////////////////
     //  Read one logical line of text
-    inline bool 
+    inline bool
     read_a_line (std::istream &instream, std::string &instring)
     {
         bool eol = true;
@@ -436,7 +436,7 @@ namespace {
                 return false;       // nothing to do
 
             eol = true;
-            if (line.find_last_of('\\') == line.size()-1) 
+            if (line.find_last_of('\\') == line.size()-1)
                 eol = false;
 
             instring += line + '\n';
@@ -447,7 +447,7 @@ namespace {
     ///////////////////////////////////////////////////////////////////////////
     //  Load and save the internal tables of the wave::context object
     template <typename Context>
-    inline void 
+    inline void
     load_state(po::variables_map const &vm, Context &ctx)
     {
 #if BOOST_WAVE_SERIALIZATION != 0
@@ -455,7 +455,7 @@ namespace {
             if (vm.count("state") > 0) {
                 fs::path state_file (
                     boost::wave::util::create_path(vm["state"].as<std::string>()));
-                if (state_file == "-") 
+                if (state_file == "-")
                     state_file = boost::wave::util::create_path("wave.state");
 
                 std::ios::openmode mode = std::ios::in;
@@ -468,7 +468,7 @@ namespace {
                     using namespace boost::serialization;
                     iarchive ia(ifs);
                     std::string version;
-                    
+
                     ia >> make_nvp("version", version);  // load version
                     if (version == CPP_VERSION_FULL_STR)
                         ia >> make_nvp("state", ctx);    // load the internal tables from disc
@@ -481,18 +481,18 @@ namespace {
             }
         }
         catch (boost::archive::archive_exception const& e) {
-            cerr << "wave: error while loading state: " 
+            cerr << "wave: error while loading state: "
                  << e.what() << endl;
         }
         catch (boost::wave::preprocess_exception const& e) {
-            cerr << "wave: error while loading state: " 
+            cerr << "wave: error while loading state: "
                  << e.description() << endl;
         }
 #endif
     }
 
     template <typename Context>
-    inline void 
+    inline void
     save_state(po::variables_map const &vm, Context const &ctx)
     {
 #if BOOST_WAVE_SERIALIZATION != 0
@@ -500,7 +500,7 @@ namespace {
             if (vm.count("state") > 0) {
                 fs::path state_file (boost::wave::util::create_path(
                     vm["state"].as<std::string>()));
-                if (state_file == "-") 
+                if (state_file == "-")
                     state_file = boost::wave::util::create_path("wave.state");
 
                 std::ios::openmode mode = std::ios::out;
@@ -510,7 +510,7 @@ namespace {
 #endif
                 ofstream ofs(state_file.string().c_str(), mode);
                 if (!ofs.is_open()) {
-                    cerr << "wave: could not open state file for writing: " 
+                    cerr << "wave: could not open state file for writing: "
                          << state_file.string() << endl;
                     // this is non-fatal
                 }
@@ -524,7 +524,7 @@ namespace {
             }
         }
         catch (boost::archive::archive_exception const& e) {
-            cerr << "wave: error while writing state: " 
+            cerr << "wave: error while writing state: "
                  << e.what() << endl;
         }
 #endif
@@ -543,7 +543,7 @@ namespace {
             fs::create_directories(boost::wave::util::branch_path(macronames_file));
             macronames_out.open(macronames_file.string().c_str());
             if (!macronames_out.is_open()) {
-                cerr << "wave: could not open file for macro name listing: " 
+                cerr << "wave: could not open file for macro name listing: "
                      << macronames_file.string() << endl;
                 return false;
             }
@@ -557,7 +557,7 @@ namespace {
     // simply list all defined macros and its definitions
         typedef context_type::const_name_iterator name_iterator;
         name_iterator end = ctx.macro_names_end();
-        for (name_iterator it = ctx.macro_names_begin(); it != end; ++it) 
+        for (name_iterator it = ctx.macro_names_begin(); it != end; ++it)
         {
             typedef std::vector<context_type::token_type> parameters_type;
 
@@ -612,7 +612,7 @@ namespace {
             fs::create_directories(boost::wave::util::branch_path(macrocounts_file));
             macrocounts_out.open(macrocounts_file.string().c_str());
             if (!macrocounts_out.is_open()) {
-                cerr << "wave: could not open file for macro invocation count listing: " 
+                cerr << "wave: could not open file for macro invocation count listing: "
                      << macrocounts_file.string() << endl;
                 return false;
             }
@@ -640,8 +640,8 @@ namespace {
 
 ///////////////////////////////////////////////////////////////////////////////
 //  do the actual preprocessing
-int 
-do_actual_work (std::string file_name, std::istream &instream, 
+int
+do_actual_work (std::string file_name, std::istream &instream,
     po::variables_map const &vm, bool input_is_stdin)
 {
 // current file position is saved for exception handling
@@ -659,15 +659,15 @@ int error_count = 0;
 #if defined(BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS)
             // this is known to be very slow for large files on some systems
             copy (std::istream_iterator<char>(instream),
-                  std::istream_iterator<char>(), 
+                  std::istream_iterator<char>(),
                   std::inserter(instring, instring.end()));
 #else
             instring = std::string(std::istreambuf_iterator<char>(instream.rdbuf()),
                                    std::istreambuf_iterator<char>());
-#endif 
+#endif
         }
 
-    // The preprocessing of the input stream is done on the fly behind the 
+    // The preprocessing of the input stream is done on the fly behind the
     // scenes during iteration over the context_type::iterator_type stream.
     std::ofstream output;
     std::ofstream traceout;
@@ -685,7 +685,7 @@ int error_count = 0;
                 fs::create_directories(boost::wave::util::branch_path(trace_file));
                 traceout.open(trace_file.string().c_str());
                 if (!traceout.is_open()) {
-                    cerr << "wave: could not open trace file: " << trace_file 
+                    cerr << "wave: could not open trace file: " << trace_file
                          << endl;
                     return -1;
                 }
@@ -701,7 +701,7 @@ int error_count = 0;
 
     // Open the stream where to output the list of included file names
         if (vm.count("listincludes")) {
-        // try to open the file, where to put the include list 
+        // try to open the file, where to put the include list
         fs::path includes_file(boost::wave::util::create_path(
             vm["listincludes"].as<std::string>()));
 
@@ -709,7 +709,7 @@ int error_count = 0;
                 fs::create_directories(boost::wave::util::branch_path(includes_file));
                 includelistout.open(includes_file.string().c_str());
                 if (!includelistout.is_open()) {
-                    cerr << "wave: could not open include list file: " 
+                    cerr << "wave: could not open include list file: "
                          << includes_file.string() << endl;
                     return -1;
                 }
@@ -726,7 +726,7 @@ int error_count = 0;
 
     // Open the stream where to output the list of included file names
         if (vm.count("listguards")) {
-        // try to open the file, where to put the include list 
+        // try to open the file, where to put the include list
         fs::path listguards_file(boost::wave::util::create_path(
             vm["listguards"].as<std::string>()));
 
@@ -734,7 +734,7 @@ int error_count = 0;
                 fs::create_directories(boost::wave::util::branch_path(listguards_file));
                 listguardsout.open(listguards_file.string().c_str());
                 if (!listguardsout.is_open()) {
-                    cerr << "wave: could not open include guard list file: " 
+                    cerr << "wave: could not open include guard list file: "
                          << listguards_file.string() << endl;
                     return -1;
                 }
@@ -775,31 +775,31 @@ int error_count = 0;
                 break;
 
             default:
-                cerr << "wave: bogus preserve whitespace option value: " 
+                cerr << "wave: bogus preserve whitespace option value: "
                      << preserve << ", should be 0, 1, 2, or 3" << endl;
                 return -1;
             }
         }
 
-    // Since the #pragma wave system() directive may cause a potential security 
+    // Since the #pragma wave system() directive may cause a potential security
     // threat, it has to be enabled explicitly by --extended or -x
     bool enable_system_command = false;
 
-        if (vm.count("extended")) 
+        if (vm.count("extended"))
             enable_system_command = true;
 
-    // This this the central piece of the Wave library, it provides you with 
+    // This this the central piece of the Wave library, it provides you with
     // the iterators to get the preprocessed tokens and allows to configure
     // the preprocessing stage in advance.
     bool allow_output = true;   // will be manipulated from inside the hooks object
     std::string default_outfile;  // will be used from inside the hooks object
-    trace_macro_expansion<token_type> hooks(preserve_whitespace, 
-        preserve_bol_whitespace, output, traceout, includelistout, 
-        listguardsout, enable_trace, enable_system_command, allow_output, 
+    trace_macro_expansion<token_type> hooks(preserve_whitespace,
+        preserve_bol_whitespace, output, traceout, includelistout,
+        listguardsout, enable_trace, enable_system_command, allow_output,
         default_outfile);
 
     // enable macro invocation count, if appropriate
-        if (vm.count("macrocounts")) 
+        if (vm.count("macrocounts"))
             hooks.enable_macro_counting();
 
     context_type ctx (instring.begin(), instring.end(), file_name.c_str(), hooks);
@@ -816,9 +816,9 @@ int error_count = 0;
 #endif
             ctx.set_language(
                 boost::wave::language_support(
-                    boost::wave::support_c99 
-                 |  boost::wave::support_option_convert_trigraphs 
-                 |  boost::wave::support_option_emit_line_directives 
+                    boost::wave::support_c99
+                 |  boost::wave::support_option_convert_trigraphs
+                 |  boost::wave::support_option_emit_line_directives
 #if BOOST_WAVE_SUPPORT_PRAGMA_ONCE != 0
                  |  boost::wave::support_option_include_guard_detection
 #endif
@@ -843,9 +843,9 @@ int error_count = 0;
             ctx.set_language(
                 boost::wave::language_support(
                     boost::wave::support_cpp0x
-                 |  boost::wave::support_option_convert_trigraphs 
-                 |  boost::wave::support_option_long_long 
-                 |  boost::wave::support_option_emit_line_directives 
+                 |  boost::wave::support_option_convert_trigraphs
+                 |  boost::wave::support_option_long_long
+                 |  boost::wave::support_option_emit_line_directives
 #if BOOST_WAVE_SUPPORT_PRAGMA_ONCE != 0
                  |  boost::wave::support_option_include_guard_detection
 #endif
@@ -882,15 +882,15 @@ int error_count = 0;
         if (vm.count("line")) {
             int lineopt = vm["line"].as<int>();
             if (0 != lineopt && 1 != lineopt && 2 != lineopt) {
-                cerr << "wave: bogus value for --line command line option: " 
+                cerr << "wave: bogus value for --line command line option: "
                     << lineopt << endl;
                 return -1;
             }
             ctx.set_language(
-                boost::wave::enable_emit_line_directives(ctx.get_language(), 
+                boost::wave::enable_emit_line_directives(ctx.get_language(),
                     lineopt != 0));
 
-            if (2 == lineopt) 
+            if (2 == lineopt)
                 ctx.get_hooks().enable_relative_names_in_line_directives(true);
         }
 
@@ -898,12 +898,12 @@ int error_count = 0;
         if (vm.count("disambiguate")) {
             int disambiguateopt = vm["disambiguate"].as<int>();
             if (0 != disambiguateopt && 1 != disambiguateopt) {
-                cerr << "wave: bogus value for --disambiguate command line option: " 
+                cerr << "wave: bogus value for --disambiguate command line option: "
                     << disambiguateopt << endl;
                 return -1;
             }
             ctx.set_language(
-                boost::wave::enable_insert_whitespace(ctx.get_language(), 
+                boost::wave::enable_insert_whitespace(ctx.get_language(),
                     disambiguateopt != 0));
         }
 
@@ -912,7 +912,7 @@ int error_count = 0;
           vector<std::string> syspaths = vm["sysinclude"].as<vector<std::string> >();
 
             vector<std::string>::const_iterator end = syspaths.end();
-            for (vector<std::string>::const_iterator cit = syspaths.begin(); 
+            for (vector<std::string>::const_iterator cit = syspaths.begin();
                  cit != end; ++cit)
             {
                 ctx.add_sysinclude_path(cmd_line_utils::trim_quotes(*cit).c_str());
@@ -921,46 +921,46 @@ int error_count = 0;
 
     // add include directories to the include search paths
         if (vm.count("include")) {
-            cmd_line_utils::include_paths const &ip = 
+            cmd_line_utils::include_paths const &ip =
                 vm["include"].as<cmd_line_utils::include_paths>();
             vector<std::string>::const_iterator end = ip.paths.end();
 
-            for (vector<std::string>::const_iterator cit = ip.paths.begin(); 
+            for (vector<std::string>::const_iterator cit = ip.paths.begin();
                  cit != end; ++cit)
             {
                 ctx.add_include_path(cmd_line_utils::trim_quotes(*cit).c_str());
             }
 
         // if -I- was given on the command line, this has to be propagated
-            if (ip.seen_separator) 
+            if (ip.seen_separator)
                 ctx.set_sysinclude_delimiter();
 
         // add system include directories to the include path
             vector<std::string>::const_iterator sysend = ip.syspaths.end();
-            for (vector<std::string>::const_iterator syscit = ip.syspaths.begin(); 
+            for (vector<std::string>::const_iterator syscit = ip.syspaths.begin();
                  syscit != sysend; ++syscit)
             {
                 ctx.add_sysinclude_path(cmd_line_utils::trim_quotes(*syscit).c_str());
             }
         }
 
-    // add additional defined macros 
+    // add additional defined macros
         if (vm.count("define")) {
           vector<std::string> const &macros = vm["define"].as<vector<std::string> >();
             vector<std::string>::const_iterator end = macros.end();
-            for (vector<std::string>::const_iterator cit = macros.begin(); 
+            for (vector<std::string>::const_iterator cit = macros.begin();
                  cit != end; ++cit)
             {
                 ctx.add_macro_definition(*cit);
             }
         }
 
-    // add additional predefined macros 
+    // add additional predefined macros
         if (vm.count("predefine")) {
-            vector<std::string> const &predefmacros = 
+            vector<std::string> const &predefmacros =
                 vm["predefine"].as<vector<std::string> >();
             vector<std::string>::const_iterator end = predefmacros.end();
-            for (vector<std::string>::const_iterator cit = predefmacros.begin(); 
+            for (vector<std::string>::const_iterator cit = predefmacros.begin();
                  cit != end; ++cit)
             {
                 ctx.add_macro_definition(*cit, true);
@@ -969,10 +969,10 @@ int error_count = 0;
 
     // undefine specified macros
         if (vm.count("undefine")) {
-            vector<std::string> const &undefmacros = 
+            vector<std::string> const &undefmacros =
                 vm["undefine"].as<vector<std::string> >();
             vector<std::string>::const_iterator end = undefmacros.end();
-            for (vector<std::string>::const_iterator cit = undefmacros.begin(); 
+            for (vector<std::string>::const_iterator cit = undefmacros.begin();
                  cit != end; ++cit)
             {
                 ctx.remove_macro_definition(*cit, true);
@@ -982,10 +982,10 @@ int error_count = 0;
 #if BOOST_WAVE_USE_DEPRECIATED_PREPROCESSING_HOOKS == 0
     // suppress expansion of specified macros
         if (vm.count("noexpand")) {
-            vector<std::string> const &noexpandmacros = 
+            vector<std::string> const &noexpandmacros =
                 vm["noexpand"].as<vector<std::string> >();
             vector<std::string>::const_iterator end = noexpandmacros.end();
-            for (vector<std::string>::const_iterator cit = noexpandmacros.begin(); 
+            for (vector<std::string>::const_iterator cit = noexpandmacros.begin();
                  cit != end; ++cit)
             {
                 ctx.get_hooks().add_noexpandmacro(*cit);
@@ -997,7 +997,7 @@ int error_count = 0;
         if (vm.count("nesting")) {
             int max_depth = vm["nesting"].as<int>();
             if (max_depth < 1 || max_depth > 100000) {
-                cerr << "wave: bogus maximal include nesting depth: " 
+                cerr << "wave: bogus maximal include nesting depth: "
                     << max_depth << endl;
                 return -1;
             }
@@ -1019,7 +1019,7 @@ int error_count = 0;
                 fs::create_directories(boost::wave::util::branch_path(out_file));
                 output.open(out_file.string().c_str());
                 if (!output.is_open()) {
-                    cerr << "wave: could not open output file: " 
+                    cerr << "wave: could not open output file: "
                          << out_file.string() << endl;
                     return -1;
                 }
@@ -1031,7 +1031,7 @@ int error_count = 0;
         fs::path out_file (boost::wave::util::create_path(file_name));
         std::string basename (boost::wave::util::leaf(out_file));
         std::string::size_type pos = basename.find_last_of(".");
-        
+
             if (std::string::npos != pos)
                 basename = basename.substr(0, pos);
             out_file = boost::wave::util::branch_path(out_file) / (basename + ".i");
@@ -1039,14 +1039,14 @@ int error_count = 0;
             fs::create_directories(boost::wave::util::branch_path(out_file));
             output.open(out_file.string().c_str());
             if (!output.is_open()) {
-                cerr << "wave: could not open output file: " 
+                cerr << "wave: could not open output file: "
                      << out_file.string() << endl;
                 return -1;
             }
             default_outfile = out_file.string();
         }
 
-    //  we assume the session to be interactive if input is stdin and output is 
+    //  we assume the session to be interactive if input is stdin and output is
     //  stdout and the output is not inhibited
     bool is_interactive = input_is_stdin && !output.is_open() && allow_output;
 
@@ -1060,15 +1060,15 @@ int error_count = 0;
     context_type::iterator_type first = ctx.begin();
     context_type::iterator_type last = ctx.end();
 
-    // preprocess the required include files 
+    // preprocess the required include files
         if (vm.count("forceinclude")) {
         // add the filenames to force as include files in _reverse_ order
         // the second parameter 'is_last' of the force_include function should
         // be set to true for the last (first given) file.
-            vector<std::string> const &force = 
-                vm["forceinclude"].as<vector<std::string> >();
-            vector<std::string>::const_reverse_iterator rend = force.rend();
-            for (vector<std::string>::const_reverse_iterator cit = force.rbegin(); 
+            std::vector<std::string> const &force =
+                vm["forceinclude"].as<std::vector<std::string> >();
+            std::vector<std::string>::const_reverse_iterator rend = force.rend();
+            for (std::vector<std::string>::const_reverse_iterator cit = force.rbegin();
                  cit != rend; /**/)
             {
                 std::string filename(*cit);
@@ -1091,11 +1091,11 @@ int error_count = 0;
     // loop over the input lines if reading from stdin, otherwise this loop
     // will be executed once
         do {
-        // loop over all generated tokens outputting the generated text 
+        // loop over all generated tokens outputting the generated text
         bool finished = false;
 
             if (input_is_stdin) {
-                if (is_interactive) 
+                if (is_interactive)
                     cout << ">>> ";     // prompt if is interactive
 
             // read next line and continue
@@ -1149,8 +1149,8 @@ int error_count = 0;
                 }
                 catch (boost::wave::cpplexer::lexing_exception const &e) {
                 // some preprocessing error
-                    if (is_interactive || 
-                        boost::wave::cpplexer::is_recoverable(e)) 
+                    if (is_interactive ||
+                        boost::wave::cpplexer::is_recoverable(e))
                     {
                         error_count += report_error_message(e);
                         need_to_advanve = true;   // advance to the next token
@@ -1162,7 +1162,7 @@ int error_count = 0;
             } while (!finished);
         } while (input_is_stdin);
 
-        if (is_interactive) 
+        if (is_interactive)
             save_state(vm, ctx);    // write the internal tables to disc
 
     // list all defined macros at the end of the preprocessing
@@ -1187,7 +1187,7 @@ int error_count = 0;
     }
     catch (std::exception const &e) {
     // use last recognized token to retrieve the error position
-        cerr 
+        cerr
             << current_position << ": "
             << "exception caught: " << e.what()
             << endl;
@@ -1195,7 +1195,7 @@ int error_count = 0;
     }
     catch (...) {
     // use last recognized token to retrieve the error position
-        cerr 
+        cerr
             << current_position << ": "
             << "unexpected exception caught." << endl;
         return 4;
@@ -1211,7 +1211,7 @@ main (int argc, char *argv[])
     // test Wave compilation configuration
     if (!BOOST_WAVE_TEST_CONFIGURATION()) {
         cout << "wave: warning: the library this application was linked against was compiled "
-             << endl 
+             << endl
              << "               using a different configuration (see wave_config.hpp)."
              << endl;
     }
@@ -1225,7 +1225,7 @@ main (int argc, char *argv[])
             ("help,h", "print out program usage (this message)")
             ("version,v", "print the version number")
             ("copyright", "print out the copyright statement")
-            ("config-file", po::value<vector<std::string> >()->composing(), 
+            ("config-file", po::value<vector<std::string> >()->composing(),
                 "specify a config file (alternatively: @filepath)")
         ;
 
@@ -1233,35 +1233,35 @@ main (int argc, char *argv[])
     po::options_description desc_generic ("Options allowed additionally in a config file");
 
         desc_generic.add_options()
-            ("output,o", po::value<std::string>(), 
+            ("output,o", po::value<std::string>(),
                 "specify a file [arg] to use for output instead of stdout or "
                 "disable output [-]")
-            ("autooutput,E", 
+            ("autooutput,E",
                 "output goes into a file named <input_basename>.i")
-            ("include,I", po::value<cmd_line_utils::include_paths>()->composing(), 
+            ("include,I", po::value<cmd_line_utils::include_paths>()->composing(),
                 "specify an additional include directory")
-            ("sysinclude,S", po::value<vector<std::string> >()->composing(), 
+            ("sysinclude,S", po::value<vector<std::string> >()->composing(),
                 "specify an additional system include directory")
-            ("forceinclude,F", po::value<vector<std::string> >()->composing(),
+            ("forceinclude,F", po::value<std::vector<std::string> >()->composing(),
                 "force inclusion of the given file")
-            ("define,D", po::value<vector<std::string> >()->composing(), 
+            ("define,D", po::value<std::vector<std::string> >()->composing(),
                 "specify a macro to define (as macro[=[value]])")
-            ("predefine,P", po::value<vector<std::string> >()->composing(), 
+            ("predefine,P", po::value<std::vector<std::string> >()->composing(),
                 "specify a macro to predefine (as macro[=[value]])")
-            ("undefine,U", po::value<vector<std::string> >()->composing(), 
+            ("undefine,U", po::value<std::vector<std::string> >()->composing(),
                 "specify a macro to undefine")
 #if BOOST_WAVE_USE_DEPRECIATED_PREPROCESSING_HOOKS == 0
-            ("noexpand,N", po::value<vector<std::string> >()->composing(), 
+            ("noexpand,N", po::value<std::vector<std::string> >()->composing(),
                 "specify a macro name, which should not be expanded")
 #endif
-            ("nesting,n", po::value<int>(), 
+            ("nesting,n", po::value<int>(),
                 "specify a new maximal include nesting depth")
         ;
 
     po::options_description desc_ext ("Extended options (allowed everywhere)");
 
         desc_ext.add_options()
-            ("traceto,t", po::value<std::string>(), 
+            ("traceto,t", po::value<std::string>(),
                 "output macro expansion tracing information to a file [arg] "
                 "or to stderr [-]")
             ("timer", "output overall elapsed computing time to stderr")
@@ -1269,29 +1269,29 @@ main (int argc, char *argv[])
 #if BOOST_WAVE_SUPPORT_VARIADICS_PLACEMARKERS != 0
             ("variadics", "enable certain C99 extensions in C++ mode")
             ("c99", "enable C99 mode (implies --variadics)")
-#endif 
+#endif
 #if BOOST_WAVE_SUPPORT_CPP0X != 0
             ("c++0x", "enable C++0x mode (implies --variadics and --long_long)")
-#endif 
-            ("listincludes,l", po::value<std::string>(), 
+#endif
+            ("listincludes,l", po::value<std::string>(),
                 "list names of included files to a file [arg] or to stdout [-]")
-            ("macronames,m", po::value<std::string>(), 
+            ("macronames,m", po::value<std::string>(),
                 "list all defined macros to a file [arg] or to stdout [-]")
-            ("macrocounts,c", po::value<std::string>(), 
+            ("macrocounts,c", po::value<std::string>(),
                 "list macro invocation counts to a file [arg] or to stdout [-]")
-            ("preserve,p", po::value<int>()->default_value(0), 
+            ("preserve,p", po::value<int>()->default_value(0),
                 "preserve whitespace\n"
                             "0: no whitespace is preserved (default),\n"
-                            "1: begin of line whitespace is preserved,\n" 
-                            "2: comments and begin of line whitespace is preserved,\n" 
+                            "1: begin of line whitespace is preserved,\n"
+                            "2: comments and begin of line whitespace is preserved,\n"
                             "3: all whitespace is preserved")
-            ("line,L", po::value<int>()->default_value(1), 
+            ("line,L", po::value<int>()->default_value(1),
                 "control the generation of #line directives\n"
                             "0: no #line directives are generated,\n"
                             "1: #line directives will be emitted (default),\n"
                             "2: #line directives will be emitted using relative\n"
                             "   filenames")
-            ("disambiguate", po::value<int>()->default_value(1), 
+            ("disambiguate", po::value<int>()->default_value(1),
                 "control whitespace insertion to disambiguate\n"
                 "consecutive tokens\n"
                             "0: no additional whitespace is generated,\n"
@@ -1299,12 +1299,12 @@ main (int argc, char *argv[])
             ("extended,x", "enable the #pragma wave system() directive")
 #if BOOST_WAVE_SUPPORT_PRAGMA_ONCE != 0
             ("noguard,G", "disable include guard detection")
-            ("listguards,g", po::value<std::string>(), 
+            ("listguards,g", po::value<std::string>(),
                 "list names of files flagged as 'include once' to a file [arg] "
                 "or to stdout [-]")
 #endif
 #if BOOST_WAVE_SERIALIZATION != 0
-            ("state,s", po::value<std::string>(), 
+            ("state,s", po::value<std::string>(),
                 "load and save state information from/to the given file [arg] "
                 "or 'wave.state' [-] (interactive mode only)")
 #endif
@@ -1320,29 +1320,29 @@ main (int argc, char *argv[])
     // parse command line and store results
         using namespace boost::program_options::command_line_style;
 
-    po::parsed_options opts(po::parse_command_line(argc, argv, 
+    po::parsed_options opts(po::parse_command_line(argc, argv,
             desc_overall_cmdline, unix_style, cmd_line_utils::at_option_parser));
     po::variables_map vm;
 
         po::store(opts, vm);
         po::notify(vm);
 
-//     // Try to find a wave.cfg in the same directory as the executable was 
+//     // Try to find a wave.cfg in the same directory as the executable was
 //     // started from. If this exists, treat it as a wave config file
 //     fs::path filename(argv[0]);
-// 
+//
 //         filename = filename.branch_path() / "wave.cfg";
-//         cmd_line_utils::read_config_file_options(filename.string(), 
+//         cmd_line_utils::read_config_file_options(filename.string(),
 //             desc_overall_cfgfile, vm, true);
 
     // extract the arguments from the parsed command line
     vector<po::option> arguments;
 
-        std::remove_copy_if(opts.options.begin(), opts.options.end(), 
+        std::remove_copy_if(opts.options.begin(), opts.options.end(),
             back_inserter(arguments), cmd_line_utils::is_argument());
 
-    // try to find a config file somewhere up the filesystem hierarchy 
-    // starting with the input file path. This allows to use a general wave.cfg 
+    // try to find a config file somewhere up the filesystem hierarchy
+    // starting with the input file path. This allows to use a general wave.cfg
     // file for all files in a certain project.
         if (arguments.size() > 0 && arguments[0].value[0] != "-") {
         // construct full path of input file
@@ -1351,12 +1351,12 @@ main (int argc, char *argv[])
 
         // chop of file name
             input_dir = boost::wave::util::branch_path(
-                boost::wave::util::normalize(input_dir)); 
+                boost::wave::util::normalize(input_dir));
 
-        // walk up the hierarchy, trying to find a file wave.cfg 
+        // walk up the hierarchy, trying to find a file wave.cfg
             while (!input_dir.empty()) {
                 fs::path filename = input_dir / "wave.cfg";
-                if (cmd_line_utils::read_config_file_options(filename.string(), 
+                if (cmd_line_utils::read_config_file_options(filename.string(),
                     desc_overall_cfgfile, vm, true))
                 {
                     break;    // break on the first cfg file found
@@ -1365,22 +1365,22 @@ main (int argc, char *argv[])
             }
         }
 
-    // if there is specified at least one config file, parse it and add the 
+    // if there is specified at least one config file, parse it and add the
     // options to the main variables_map
         if (vm.count("config-file")) {
-            vector<std::string> const &cfg_files = 
+            vector<std::string> const &cfg_files =
                 vm["config-file"].as<vector<std::string> >();
             vector<std::string>::const_iterator end = cfg_files.end();
-            for (vector<std::string>::const_iterator cit = cfg_files.begin(); 
+            for (vector<std::string>::const_iterator cit = cfg_files.begin();
                  cit != end; ++cit)
             {
             // parse a single config file and store the results
-                cmd_line_utils::read_config_file_options(*cit, 
+                cmd_line_utils::read_config_file_options(*cit,
                     desc_overall_cfgfile, vm);
             }
         }
 
-    // ... act as required 
+    // ... act as required
         if (vm.count("help")) {
         po::options_description desc_help (
             "Usage: wave [options] [@config-file(s)] [file]");
@@ -1401,7 +1401,7 @@ main (int argc, char *argv[])
 
     // if there is no input file given, then take input from stdin
         if (0 == arguments.size() || 0 == arguments[0].value.size() ||
-            arguments[0].value[0] == "-") 
+            arguments[0].value[0] == "-")
         {
         // preprocess the given input from stdin
             return do_actual_work("<stdin>", std::cin, vm, true);
diff --git a/tool/cpp.hpp b/tool/cpp.hpp
index d92dcc8..f2253f3 100644
--- a/tool/cpp.hpp
+++ b/tool/cpp.hpp
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
-    Copyright (c) 2001-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, 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 aed8630..e6e4f63 100644
--- a/tool/cpp_config.hpp
+++ b/tool/cpp_config.hpp
@@ -4,7 +4,7 @@
     
     http://www.boost.org/
 
-    Copyright (c) 2001-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, 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 5ce2ac1..43330c2 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See accompanying file
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
@@ -19,7 +19,7 @@
 
 #define CPP_VERSION_FULL_STR        BOOST_PP_STRINGIZE(CPP_VERSION_FULL)
 
-#define CPP_VERSION_DATE            20110507L
-#define CPP_VERSION_DATE_STR        "20110507"
+#define CPP_VERSION_DATE            20120523L
+#define CPP_VERSION_DATE_STR        "20120523"
 
 #endif // !defined(CPP_VERSION_HPP_CE4FE67F_63F9_468D_8364_C855F89D3C5D_INCLUDED)
diff --git a/tool/stop_watch.hpp b/tool/stop_watch.hpp
index 2342ccc..e328546 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, 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 7679a2e..9296d09 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-2011 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2012 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See accompanying file
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/