Boost logo

Boost-Commit :

From: eric_at_[hidden]
Date: 2007-11-26 11:26:03


Author: eric_niebler
Date: 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
New Revision: 41399
URL: http://svn.boost.org/trac/boost/changeset/41399

Log:
Merged revisions 41268-41398 via svnmerge from
https://svn.boost.org/svn/boost/trunk

........
  r41270 | dgregor | 2007-11-20 21:50:21 -0800 (Tue, 20 Nov 2007) | 1 line
  
  Fixes #1456
........
  r41271 | johnmaddock | 2007-11-21 01:39:00 -0800 (Wed, 21 Nov 2007) | 1 line
  
  Added super/subscript styling as per boost-docs mailing list discussion.
........
  r41272 | johnmaddock | 2007-11-21 01:46:36 -0800 (Wed, 21 Nov 2007) | 1 line
  
  Fix << iostream operator for the NTL bindings.
........
  r41273 | anthonyw | 2007-11-21 02:44:22 -0800 (Wed, 21 Nov 2007) | 1 line
  
  changed platform split to allow bjam to track includes and check dependencies
........
  r41274 | schoepflin | 2007-11-21 03:00:18 -0800 (Wed, 21 Nov 2007) | 2 lines
  
  Added myself to the platform maintainers file.
........
  r41276 | bgubenko | 2007-11-21 03:43:00 -0800 (Wed, 21 Nov 2007) | 1 line
  
  fix typo in the marking of function_types library tests
........
  r41277 | johnmaddock | 2007-11-21 04:09:28 -0800 (Wed, 21 Nov 2007) | 1 line
  
  Change warning suppression, to suppress warnings for VC8 as well.
........
  r41278 | johnmaddock | 2007-11-21 06:03:16 -0800 (Wed, 21 Nov 2007) | 1 line
  
  Apply warning fix for VC8 and later only: earlier versions warn about the warning suppression :-(
........
  r41279 | schoepflin | 2007-11-21 07:21:53 -0800 (Wed, 21 Nov 2007) | 2 lines
  
  Marked function_types failures depending on stdcall as expected on Tru64/CXX.
........
  r41280 | igaztanaga | 2007-11-21 08:18:29 -0800 (Wed, 21 Nov 2007) | 1 line
  
  Added offset_ptr test
........
  r41281 | igaztanaga | 2007-11-21 08:19:19 -0800 (Wed, 21 Nov 2007) | 1 line
  
  Fixed offset_ptr issues with volatile values.
........
  r41282 | igaztanaga | 2007-11-21 08:39:48 -0800 (Wed, 21 Nov 2007) | 1 line
  
  Changed precalculated sqrt(2) values selection to use enable_if.
........
  r41284 | igaztanaga | 2007-11-21 09:32:20 -0800 (Wed, 21 Nov 2007) | 1 line
  
  Added performance Jamfile to the project
........
  r41285 | hkaiser | 2007-11-21 09:53:37 -0800 (Wed, 21 Nov 2007) | 1 line
  
  Wave: Fixed #line statements in generated files not to contain Windows paths anymore.
........
  r41286 | marshall | 2007-11-21 11:20:15 -0800 (Wed, 21 Nov 2007) | 1 line
  
  Bug fixes #284, #836, #991
........
  r41287 | grafik | 2007-11-21 11:29:55 -0800 (Wed, 21 Nov 2007) | 1 line
  
  Fix search for Boost.Build so that it only finds the approved version.
........
  r41288 | djowel | 2007-11-21 14:24:37 -0800 (Wed, 21 Nov 2007) | 1 line
  
  updated the master css
........
  r41289 | matias | 2007-11-21 20:55:54 -0800 (Wed, 21 Nov 2007) | 1 line
  
  Explicit failure markup for Bimap
........
  r41290 | matias | 2007-11-21 21:18:38 -0800 (Wed, 21 Nov 2007) | 1 line
  
  remove wrong placed typename
........
  r41297 | joaquin | 2007-11-21 23:59:28 -0800 (Wed, 21 Nov 2007) | 1 line
  
  included an exe filename modifying rule to avoid interference problems with Vista UAC (fixes #1429)
........
  r41299 | djowel | 2007-11-22 00:39:46 -0800 (Thu, 22 Nov 2007) | 1 line
  
  bug fix
........
  r41300 | schoepflin | 2007-11-22 01:32:15 -0800 (Thu, 22 Nov 2007) | 3 lines
  
  Marked failures for kolmogorov_max_flow_test and max_flow_test in the graph
  library as expected for cxx and acc.
........
  r41301 | johnmaddock | 2007-11-22 01:59:38 -0800 (Thu, 22 Nov 2007) | 1 line
  
  Added try...catch around TSS initialisation.
........
  r41302 | johnmaddock | 2007-11-22 02:38:48 -0800 (Thu, 22 Nov 2007) | 1 line
  
  Fixes #501 #1334.
........
  r41303 | bgubenko | 2007-11-22 03:33:09 -0800 (Thu, 22 Nov 2007) | 1 line
  
  fix typo in r41302 causing validation error
........
  r41304 | rogeeff | 2007-11-22 11:44:12 -0800 (Thu, 22 Nov 2007) | 1 line
  
  Try to make it work in release build
........
  r41305 | rogeeff | 2007-11-22 11:56:58 -0800 (Thu, 22 Nov 2007) | 1 line
  
  new file
........
  r41308 | rogeeff | 2007-11-22 12:56:07 -0800 (Thu, 22 Nov 2007) | 2 lines
  
  negative chars test added
  some statements added to the online_test
........
  r41310 | rogeeff | 2007-11-22 13:57:16 -0800 (Thu, 22 Nov 2007) | 1 line
  
  issue with class base test cases addressed
........
  r41311 | anthonyw | 2007-11-22 14:01:30 -0800 (Thu, 22 Nov 2007) | 1 line
  
  Removed thread::self in favour of allowing interruption through a thread::id; no longer requires DuplicateHandle
........
  r41312 | rogeeff | 2007-11-22 14:06:59 -0800 (Thu, 22 Nov 2007) | 1 line
  
  comments cleanup
........
  r41313 | grafik | 2007-11-22 18:57:42 -0800 (Thu, 22 Nov 2007) | 1 line
  
  Produce less regression reports to reduce the cycle time for test reporting.
........
  r41314 | grafik | 2007-11-22 18:58:14 -0800 (Thu, 22 Nov 2007) | 1 line
  
  Produce less regression reports to reduce the cycle time for test reporting.
........
  r41315 | joaquin | 2007-11-22 23:57:15 -0800 (Thu, 22 Nov 2007) | 1 line
  
  added .exe suffix missing at rev 41297
........
  r41317 | johnmaddock | 2007-11-23 09:05:25 -0800 (Fri, 23 Nov 2007) | 1 line
  
  Remove the log files, we don't need these in SVN Trunk.
........
  r41318 | grafik | 2007-11-23 12:43:38 -0800 (Fri, 23 Nov 2007) | 1 line
  
  Add --skip-script-download option to run.py to avoid repeated regression script downloads. Thanks to _m_ for the changes.
........
  r41319 | bemandawes | 2007-11-23 14:55:48 -0800 (Fri, 23 Nov 2007) | 1 line
  
  Add the instructions formerly in the (now deleted) runner sub-directory
........
  r41320 | anthonyw | 2007-11-23 15:09:36 -0800 (Fri, 23 Nov 2007) | 1 line
  
  Integrate TSS with thread data; test to ensure cleanup done for native threads as well as boost::thread-launched threads now runs for pthread API as well as win32 API
........
  r41324 | grafik | 2007-11-23 18:16:50 -0800 (Fri, 23 Nov 2007) | 1 line
  
  Allow use of "conditional" to multiply a condition that already has the full condition in it.
........
  r41325 | igaztanaga | 2007-11-24 01:44:30 -0800 (Sat, 24 Nov 2007) | 1 line
  
  Marked msvc-8.0-wm5 as unusable
........
  r41326 | niels_dekker | 2007-11-24 03:51:03 -0800 (Sat, 24 Nov 2007) | 1 line
  
  Checked the result of value_init test function, hoping to pinpoint exactly for what particular type T value_initialized<T> might fail, on some platforms
........
  r41327 | johnmaddock | 2007-11-24 04:25:25 -0800 (Sat, 24 Nov 2007) | 1 line
  
  Apply patches for building regex on WinCE see: http://lists.boost.org/Archives/boost/2007/11/130839.php
........
  r41328 | bemandawes | 2007-11-24 05:15:03 -0800 (Sat, 24 Nov 2007) | 1 line
  
  Bring required compilers list closer into sync with actual testers and list discussion
........
  r41330 | bemandawes | 2007-11-24 06:59:08 -0800 (Sat, 24 Nov 2007) | 1 line
  
  Remove mingw plus some compilers no longer being tested from required list
........
  r41331 | nasonov | 2007-11-24 07:22:52 -0800 (Sat, 24 Nov 2007) | 1 line
  
  minor changes
........
  r41333 | bemandawes | 2007-11-24 08:39:30 -0800 (Sat, 24 Nov 2007) | 1 line
  
  Change long name inspection to follow ISO 9660:1997, thus replacing all length requirements with a single 207 maximum path length requirement.
........
  r41338 | garcia | 2007-11-24 10:19:22 -0800 (Sat, 24 Nov 2007) | 2 lines
  
  A bunch of review dates have been added.
........
  r41339 | johnmaddock | 2007-11-24 10:34:17 -0800 (Sat, 24 Nov 2007) | 1 line
  
  Changed meaning of "at_end" needs copy-constructor fix.
........
  r41341 | noel_belcourt | 2007-11-24 11:09:56 -0800 (Sat, 24 Nov 2007) | 6 lines
  
  Replace mpi wrappers with native pathscale compilers.
  Fixed how we invoke f77 (pathf90 -f77).
  
  Thanks to Alain Miniussi for reporting this.
........
  r41342 | igaztanaga | 2007-11-24 11:47:58 -0800 (Sat, 24 Nov 2007) | 1 line
  
  Added workaround for systems without SEM_FAILED and semaphores based on filesystem
........
  r41343 | rogeeff | 2007-11-24 11:49:24 -0800 (Sat, 24 Nov 2007) | 5 lines
  
  switch to nasic_cstring.hpp instead of fwd header
  added failed expression to the system error
  system_error is caught and reported in cpp_main.ipp
  64 bit compatibility issue in debug.ipp fixed
  missing headers in algorithm.hpp added
........
  r41344 | davedeakins | 2007-11-24 12:30:50 -0800 (Sat, 24 Nov 2007) | 1 line
  
  Define the BOOST_NO_SWPRINTF macro for WinCE. WinCE's CRT does not have a conforming swprintf signature.
........
  r41348 | igaztanaga | 2007-11-24 16:55:14 -0800 (Sat, 24 Nov 2007) | 1 line
  
  Marked pathscale and vacpp as unusable for Interprocess/Intrusive
........
  r41350 | davedeakins | 2007-11-24 20:30:02 -0800 (Sat, 24 Nov 2007) | 1 line
  
  A few corrections to the WinCE patches
........
  r41352 | dave | 2007-11-25 01:02:01 -0800 (Sun, 25 Nov 2007) | 2 lines
  
  Attempt SunPro workaround
........
  r41353 | guwi17 | 2007-11-25 05:34:20 -0800 (Sun, 25 Nov 2007) | 6 lines
  
  - fix and close #1237
  - symmetric resize used wrong internal resize method
  -- Dese und die folgenden Zeilen werden ignoriert --
  
  M symmetric.hpp
........
  r41355 | bemandawes | 2007-11-25 05:56:09 -0800 (Sun, 25 Nov 2007) | 1 line
  
  Remove extra ) from prior commit
........
  r41356 | danieljames | 2007-11-25 06:10:05 -0800 (Sun, 25 Nov 2007) | 2 lines
  
  Deleting the BoostCon* files. Fixes #1256
........
  r41357 | bemandawes | 2007-11-25 07:08:28 -0800 (Sun, 25 Nov 2007) | 1 line
  
  clear # 1230, mbstate uninitialized
........
  r41358 | igaztanaga | 2007-11-25 07:18:04 -0800 (Sun, 25 Nov 2007) | 1 line
  
  Marked intel-linux-8.* as unusable for Interprocess and Intrusive
........
  r41359 | johnmaddock | 2007-11-25 07:47:58 -0800 (Sun, 25 Nov 2007) | 1 line
  
  Oops, previous commit messed up POSIX timing code, now fixed.
........
  r41361 | johnmaddock | 2007-11-25 08:26:36 -0800 (Sun, 25 Nov 2007) | 1 line
  
  Redirection file.
........
  r41362 | grafik | 2007-11-25 09:06:17 -0800 (Sun, 25 Nov 2007) | 1 line
  
  Move buildbot support to sandbox until we decide what to do with it.
........
  r41363 | grafik | 2007-11-25 09:12:42 -0800 (Sun, 25 Nov 2007) | 1 line
  
  Some cleanup of tools documentation. Add boostbook redir file. Delete duplicate time_string.hpp. Repoint regression instructions to web site.
........
  r41364 | johnmaddock | 2007-11-25 09:23:25 -0800 (Sun, 25 Nov 2007) | 1 line
  
  Fix date.
........
  r41378 | bemandawes | 2007-11-25 11:56:10 -0800 (Sun, 25 Nov 2007) | 1 line
  
  remove hp_cxx-71_006_tru64 as required.
........
  r41380 | grafik | 2007-11-25 12:10:10 -0800 (Sun, 25 Nov 2007) | 1 line
  
  Add --build-type option to root build. Two choices possible at the moment "minimal" and "complete". With minimal as the default we only build the common release variant. The old behavior of building many variants is available with "complete".
........
  r41381 | fcacciola | 2007-11-25 12:26:14 -0800 (Sun, 25 Nov 2007) | 1 line
  
  Cast to base added to avoid a call to the convertir constructor/assignment (see Tickes 1419 and 1420)
........
  r41383 | burbelgruff | 2007-11-25 13:16:46 -0800 (Sun, 25 Nov 2007) | 1 line
  
  Revert to old sizeof based solution for retrieving the type from a typeof hack. This is in order to overcome problems with the code analysis module introduced in Visual Studio 2005.
........
  r41384 | davedeakins | 2007-11-25 13:53:26 -0800 (Sun, 25 Nov 2007) | 1 line
  
  Added a primitive tmpnam function for WinCE (which does not supply any kind of tmpnam in its CRT)
........
  r41385 | nasonov | 2007-11-25 14:28:16 -0800 (Sun, 25 Nov 2007) | 3 lines
  
  Pass unsigned type to lcast_put_unsigned.
........
  r41387 | nasonov | 2007-11-25 15:08:50 -0800 (Sun, 25 Nov 2007) | 2 lines
  
  Support for string with non-default char_traits and allocator.
........
  r41391 | davedeakins | 2007-11-25 22:36:55 -0800 (Sun, 25 Nov 2007) | 1 line
  
  Nearly all test for the intrusive library pass on the MSVC8/WM5 platform.
........
  r41394 | joaquin | 2007-11-26 03:52:03 -0800 (Mon, 26 Nov 2007) | 1 line
  
  added missing traits template arg to a lexical_stream instantiation
........
  r41395 | anthonyw | 2007-11-26 04:17:45 -0800 (Mon, 26 Nov 2007) | 1 line
  
  workaround for Borland compiler
........
  r41396 | anthonyw | 2007-11-26 05:29:15 -0800 (Mon, 26 Nov 2007) | 1 line
  
  Don't compare native_handle_t against 0 --- do appropriate checks in create_native_thread for platforms where pthread_t is not comparable
........
  r41397 | joaquin | 2007-11-26 05:48:36 -0800 (Mon, 26 Nov 2007) | 1 line
  
  ADL-based swap call moved to an utility function (after mistaken attempt at rev 41220 to solve name-hiding issues)
........
  r41398 | anthonyw | 2007-11-26 07:44:07 -0800 (Mon, 26 Nov 2007) | 1 line
  
  fixed import/export declarations so new once code works with pthread-win32
........

Added:
   branches/proto/v3/boost/interprocess/detail/tmp_dir_helpers.hpp
      - copied unchanged from r41398, /trunk/boost/interprocess/detail/tmp_dir_helpers.hpp
   branches/proto/v3/boost/multi_index/detail/adl_swap.hpp
      - copied unchanged from r41398, /trunk/boost/multi_index/detail/adl_swap.hpp
   branches/proto/v3/libs/interprocess/proj/vc7ide/offset_ptr_test.vcproj
      - copied unchanged from r41398, /trunk/libs/interprocess/proj/vc7ide/offset_ptr_test.vcproj
   branches/proto/v3/libs/interprocess/test/offset_ptr_test.cpp
      - copied unchanged from r41398, /trunk/libs/interprocess/test/offset_ptr_test.cpp
   branches/proto/v3/libs/test/test/auto-link-test/auto_link_with_utf.cpp
      - copied unchanged from r41398, /trunk/libs/test/test/auto-link-test/auto_link_with_utf.cpp
   branches/proto/v3/tools/bcp/index.html
      - copied unchanged from r41398, /trunk/tools/bcp/index.html
   branches/proto/v3/tools/boostbook/index.html
      - copied unchanged from r41398, /trunk/tools/boostbook/index.html
Removed:
   branches/proto/v3/boost/test/detail/wrap_io_saver.hpp
   branches/proto/v3/libs/math/performance/gcc-3.4-w32.log
   branches/proto/v3/libs/math/performance/gcc-4.2-linux.log
   branches/proto/v3/libs/math/performance/gcc-4.2-long-double-linux.log
   branches/proto/v3/libs/math/performance/intel-10-linux.log
   branches/proto/v3/libs/math/performance/intel-10-w32.log
   branches/proto/v3/libs/math/performance/msvc-8-debug.log
   branches/proto/v3/libs/math/performance/msvc-8.log
   branches/proto/v3/libs/thread/src/pthread/tss.cpp
   branches/proto/v3/more/BoostCon07.html
   branches/proto/v3/more/BoostCon07_session_call.html
   branches/proto/v3/tools/buildbot/
   branches/proto/v3/tools/common/
Properties modified:
   branches/proto/v3/ (props changed)
Text files modified:
   branches/proto/v3/Jamroot | 63
   branches/proto/v3/boost/bimap/relation/support/member_with_tag.hpp | 2
   branches/proto/v3/boost/config/compiler/visualc.hpp | 8
   branches/proto/v3/boost/fusion/view/transform_view/detail/value_at_impl.hpp | 10
   branches/proto/v3/boost/interprocess/containers/vector.hpp | 12
   branches/proto/v3/boost/interprocess/detail/iterators.hpp | 2
   branches/proto/v3/boost/interprocess/detail/workaround.hpp | 10
   branches/proto/v3/boost/interprocess/offset_ptr.hpp | 5
   branches/proto/v3/boost/interprocess/shared_memory_object.hpp | 73
   branches/proto/v3/boost/interprocess/sync/posix/semaphore_wrapper.hpp | 61
   branches/proto/v3/boost/intrusive/detail/utilities.hpp | 24
   branches/proto/v3/boost/lexical_cast.hpp | 299
   branches/proto/v3/boost/math/bindings/rr.hpp | 2
   branches/proto/v3/boost/mpi/detail/ignore_skeleton_oarchive.hpp | 4
   branches/proto/v3/boost/multi_index/detail/auto_space.hpp | 25
   branches/proto/v3/boost/multi_index_container.hpp | 10
   branches/proto/v3/boost/numeric/ublas/symmetric.hpp | 3
   branches/proto/v3/boost/optional/optional.hpp | 4
   branches/proto/v3/boost/pool/pool.hpp | 52
   branches/proto/v3/boost/python/object_protocol.hpp | 23
   branches/proto/v3/boost/regex/v4/fileiter.hpp | 4
   branches/proto/v3/boost/test/auto_unit_test.hpp | 12
   branches/proto/v3/boost/test/debug.hpp | 8
   branches/proto/v3/boost/test/debug_config.hpp | 6
   branches/proto/v3/boost/test/detail/config.hpp | 2
   branches/proto/v3/boost/test/detail/enable_warnings.hpp | 26
   branches/proto/v3/boost/test/detail/fwd_decl.hpp | 14
   branches/proto/v3/boost/test/detail/global_typedef.hpp | 14
   branches/proto/v3/boost/test/detail/log_level.hpp | 19
   branches/proto/v3/boost/test/detail/suppress_warnings.hpp | 25
   branches/proto/v3/boost/test/detail/unit_test_parameters.hpp | 8
   branches/proto/v3/boost/test/detail/workaround.hpp | 14
   branches/proto/v3/boost/test/exception_safety.hpp | 25
   branches/proto/v3/boost/test/execution_monitor.hpp | 40
   branches/proto/v3/boost/test/floating_point_comparison.hpp | 48
   branches/proto/v3/boost/test/framework.hpp | 2
   branches/proto/v3/boost/test/impl/compiler_log_formatter.ipp | 24
   branches/proto/v3/boost/test/impl/cpp_main.ipp | 27
   branches/proto/v3/boost/test/impl/debug.ipp | 11
   branches/proto/v3/boost/test/impl/exception_safety.ipp | 33
   branches/proto/v3/boost/test/impl/execution_monitor.ipp | 15
   branches/proto/v3/boost/test/impl/framework.ipp | 2
   branches/proto/v3/boost/test/impl/interaction_based.ipp | 33
   branches/proto/v3/boost/test/impl/logged_expectations.ipp | 27
   branches/proto/v3/boost/test/impl/plain_report_formatter.ipp | 26
   branches/proto/v3/boost/test/impl/progress_monitor.ipp | 14
   branches/proto/v3/boost/test/impl/results_collector.ipp | 23
   branches/proto/v3/boost/test/impl/results_reporter.ipp | 25
   branches/proto/v3/boost/test/impl/test_main.ipp | 17
   branches/proto/v3/boost/test/impl/test_tools.ipp | 2
   branches/proto/v3/boost/test/impl/unit_test_log.ipp | 29
   branches/proto/v3/boost/test/impl/unit_test_main.ipp | 21
   branches/proto/v3/boost/test/impl/unit_test_monitor.ipp | 38
   branches/proto/v3/boost/test/impl/unit_test_parameters.ipp | 9
   branches/proto/v3/boost/test/impl/unit_test_suite.ipp | 8
   branches/proto/v3/boost/test/impl/xml_log_formatter.ipp | 24
   branches/proto/v3/boost/test/impl/xml_report_formatter.ipp | 17
   branches/proto/v3/boost/test/included/prg_exec_monitor.hpp | 20
   branches/proto/v3/boost/test/included/test_exec_monitor.hpp | 30
   branches/proto/v3/boost/test/included/unit_test.hpp | 30
   branches/proto/v3/boost/test/interaction_based.hpp | 20
   branches/proto/v3/boost/test/logged_expectations.hpp | 14
   branches/proto/v3/boost/test/minimal.hpp | 27
   branches/proto/v3/boost/test/mock_object.hpp | 18
   branches/proto/v3/boost/test/output/compiler_log_formatter.hpp | 18
   branches/proto/v3/boost/test/output/plain_report_formatter.hpp | 11
   branches/proto/v3/boost/test/output/xml_log_formatter.hpp | 15
   branches/proto/v3/boost/test/output/xml_report_formatter.hpp | 11
   branches/proto/v3/boost/test/output_test_stream.hpp | 27
   branches/proto/v3/boost/test/parameterized_test.hpp | 29
   branches/proto/v3/boost/test/predicate_result.hpp | 32
   branches/proto/v3/boost/test/prg_exec_monitor.hpp | 17
   branches/proto/v3/boost/test/progress_monitor.hpp | 20
   branches/proto/v3/boost/test/results_collector.hpp | 30
   branches/proto/v3/boost/test/results_reporter.hpp | 14
   branches/proto/v3/boost/test/test_case_template.hpp | 32
   branches/proto/v3/boost/test/test_exec_monitor.hpp | 17
   branches/proto/v3/boost/test/test_observer.hpp | 19
   branches/proto/v3/boost/test/test_tools.hpp | 9
   branches/proto/v3/boost/test/unit_test.hpp | 30
   branches/proto/v3/boost/test/unit_test_log.hpp | 43
   branches/proto/v3/boost/test/unit_test_log_formatter.hpp | 39
   branches/proto/v3/boost/test/unit_test_monitor.hpp | 14
   branches/proto/v3/boost/test/unit_test_suite.hpp | 2
   branches/proto/v3/boost/test/unit_test_suite_impl.hpp | 31
   branches/proto/v3/boost/test/utils/algorithm.hpp | 30
   branches/proto/v3/boost/test/utils/assign_op.hpp | 11
   branches/proto/v3/boost/test/utils/basic_cstring/basic_cstring.hpp | 44
   branches/proto/v3/boost/test/utils/basic_cstring/basic_cstring_fwd.hpp | 23
   branches/proto/v3/boost/test/utils/basic_cstring/bcs_char_traits.hpp | 20
   branches/proto/v3/boost/test/utils/basic_cstring/compare.hpp | 26
   branches/proto/v3/boost/test/utils/basic_cstring/io.hpp | 26
   branches/proto/v3/boost/test/utils/callback.hpp | 29
   branches/proto/v3/boost/test/utils/class_properties.hpp | 41
   branches/proto/v3/boost/test/utils/custom_manip.hpp | 17
   branches/proto/v3/boost/test/utils/fixed_mapping.hpp | 30
   branches/proto/v3/boost/test/utils/foreach.hpp | 20
   branches/proto/v3/boost/test/utils/iterator/ifstream_line_iterator.hpp | 32
   branches/proto/v3/boost/test/utils/iterator/input_iterator_facade.hpp | 26
   branches/proto/v3/boost/test/utils/iterator/istream_line_iterator.hpp | 26
   branches/proto/v3/boost/test/utils/iterator/token_iterator.hpp | 40
   branches/proto/v3/boost/test/utils/named_params.hpp | 8
   branches/proto/v3/boost/test/utils/nullstream.hpp | 23
   branches/proto/v3/boost/test/utils/rtti.hpp | 14
   branches/proto/v3/boost/test/utils/runtime/argument.hpp | 14
   branches/proto/v3/boost/test/utils/runtime/cla/argument_factory.hpp | 11
   branches/proto/v3/boost/test/utils/runtime/cla/argv_traverser.cpp | 11
   branches/proto/v3/boost/test/utils/runtime/cla/argv_traverser.hpp | 11
   branches/proto/v3/boost/test/utils/runtime/cla/argv_traverser.ipp | 17
   branches/proto/v3/boost/test/utils/runtime/cla/basic_parameter.hpp | 11
   branches/proto/v3/boost/test/utils/runtime/cla/char_parameter.cpp | 11
   branches/proto/v3/boost/test/utils/runtime/cla/char_parameter.hpp | 11
   branches/proto/v3/boost/test/utils/runtime/cla/char_parameter.ipp | 14
   branches/proto/v3/boost/test/utils/runtime/cla/detail/argument_value_usage.hpp | 11
   branches/proto/v3/boost/test/utils/runtime/cla/dual_name_parameter.cpp | 11
   branches/proto/v3/boost/test/utils/runtime/cla/dual_name_parameter.hpp | 11
   branches/proto/v3/boost/test/utils/runtime/cla/dual_name_parameter.ipp | 11
   branches/proto/v3/boost/test/utils/runtime/cla/fwd.hpp | 11
   branches/proto/v3/boost/test/utils/runtime/cla/id_policy.cpp | 11
   branches/proto/v3/boost/test/utils/runtime/cla/id_policy.hpp | 11
   branches/proto/v3/boost/test/utils/runtime/cla/id_policy.ipp | 11
   branches/proto/v3/boost/test/utils/runtime/cla/iface/argument_factory.hpp | 11
   branches/proto/v3/boost/test/utils/runtime/cla/iface/id_policy.hpp | 11
   branches/proto/v3/boost/test/utils/runtime/cla/modifier.hpp | 11
   branches/proto/v3/boost/test/utils/runtime/cla/named_parameter.cpp | 11
   branches/proto/v3/boost/test/utils/runtime/cla/named_parameter.hpp | 11
   branches/proto/v3/boost/test/utils/runtime/cla/named_parameter.ipp | 14
   branches/proto/v3/boost/test/utils/runtime/cla/parameter.hpp | 11
   branches/proto/v3/boost/test/utils/runtime/cla/parser.cpp | 11
   branches/proto/v3/boost/test/utils/runtime/cla/parser.hpp | 14
   branches/proto/v3/boost/test/utils/runtime/cla/parser.ipp | 11
   branches/proto/v3/boost/test/utils/runtime/cla/positional_parameter.hpp | 11
   branches/proto/v3/boost/test/utils/runtime/cla/typed_parameter.hpp | 11
   branches/proto/v3/boost/test/utils/runtime/cla/validation.cpp | 11
   branches/proto/v3/boost/test/utils/runtime/cla/validation.hpp | 11
   branches/proto/v3/boost/test/utils/runtime/cla/validation.ipp | 12
   branches/proto/v3/boost/test/utils/runtime/cla/value_generator.hpp | 11
   branches/proto/v3/boost/test/utils/runtime/cla/value_handler.hpp | 11
   branches/proto/v3/boost/test/utils/runtime/config.hpp | 18
   branches/proto/v3/boost/test/utils/runtime/configuration.hpp | 11
   branches/proto/v3/boost/test/utils/runtime/env/environment.cpp | 11
   branches/proto/v3/boost/test/utils/runtime/env/environment.hpp | 17
   branches/proto/v3/boost/test/utils/runtime/env/environment.ipp | 23
   branches/proto/v3/boost/test/utils/runtime/env/fwd.hpp | 11
   branches/proto/v3/boost/test/utils/runtime/env/modifier.hpp | 11
   branches/proto/v3/boost/test/utils/runtime/env/variable.hpp | 14
   branches/proto/v3/boost/test/utils/runtime/file/config_file.cpp | 11
   branches/proto/v3/boost/test/utils/runtime/file/config_file.hpp | 11
   branches/proto/v3/boost/test/utils/runtime/file/config_file_iterator.cpp | 11
   branches/proto/v3/boost/test/utils/runtime/file/config_file_iterator.hpp | 14
   branches/proto/v3/boost/test/utils/runtime/fwd.hpp | 11
   branches/proto/v3/boost/test/utils/runtime/interpret_argument_value.hpp | 11
   branches/proto/v3/boost/test/utils/runtime/parameter.hpp | 11
   branches/proto/v3/boost/test/utils/runtime/trace.hpp | 11
   branches/proto/v3/boost/test/utils/runtime/validation.hpp | 11
   branches/proto/v3/boost/test/utils/trivial_singleton.hpp | 21
   branches/proto/v3/boost/test/utils/wrap_stringstream.hpp | 38
   branches/proto/v3/boost/test/utils/xml_printer.hpp | 36
   branches/proto/v3/boost/thread/condition_variable.hpp | 8
   branches/proto/v3/boost/thread/detail/config.hpp | 5
   branches/proto/v3/boost/thread/detail/platform.hpp | 9
   branches/proto/v3/boost/thread/mutex.hpp | 8
   branches/proto/v3/boost/thread/once.hpp | 8
   branches/proto/v3/boost/thread/pthread/condition_variable.hpp | 6
   branches/proto/v3/boost/thread/pthread/condition_variable_fwd.hpp | 6
   branches/proto/v3/boost/thread/pthread/once.hpp | 6
   branches/proto/v3/boost/thread/pthread/thread_data.hpp | 4
   branches/proto/v3/boost/thread/pthread/tss.hpp | 183
   branches/proto/v3/boost/thread/recursive_mutex.hpp | 8
   branches/proto/v3/boost/thread/shared_mutex.hpp | 8
   branches/proto/v3/boost/thread/thread.hpp | 9
   branches/proto/v3/boost/thread/tss.hpp | 8
   branches/proto/v3/boost/thread/win32/condition_variable.hpp | 11
   branches/proto/v3/boost/thread/win32/thread.hpp | 101
   branches/proto/v3/boost/token_functions.hpp | 10
   branches/proto/v3/boost/token_iterator.hpp | 4
   branches/proto/v3/boost/type_traits/is_abstract.hpp | 4
   branches/proto/v3/boost/type_traits/is_base_and_derived.hpp | 4
   branches/proto/v3/boost/type_traits/is_convertible.hpp | 5
   branches/proto/v3/boost/type_traits/is_function.hpp | 4
   branches/proto/v3/boost/type_traits/is_member_function_pointer.hpp | 4
   branches/proto/v3/boost/typeof/msvc/typeof_impl.hpp | 13
   branches/proto/v3/doc/html/boostbook.css | 26
   branches/proto/v3/doc/src/boostbook.css | 192
   branches/proto/v3/libs/conversion/lexical_cast_test.cpp | 245
   branches/proto/v3/libs/filesystem/src/path.cpp | 4
   branches/proto/v3/libs/interprocess/proj/vc7ide/Interprocess.sln | 8
   branches/proto/v3/libs/interprocess/proj/vc7ide/interprocesslib.vcproj | 3
   branches/proto/v3/libs/interprocess/test/expand_bwd_test_template.hpp | 4
   branches/proto/v3/libs/interprocess/test/named_creation_template.hpp | 8
   branches/proto/v3/libs/interprocess/test/vector_test.cpp | 12
   branches/proto/v3/libs/intrusive/proj/vc7ide/_intrusivelib/_intrusivelib.vcproj | 9
   branches/proto/v3/libs/intrusive/test/Jamfile.v2 | 3
   branches/proto/v3/libs/multi_index/test/Jamfile.v2 | 26
   branches/proto/v3/libs/platform_maintainers.txt | 2
   branches/proto/v3/libs/regex/example/timer/regex_timer.cpp | 18
   branches/proto/v3/libs/regex/src/cregex.cpp | 2
   branches/proto/v3/libs/regex/src/fileiter.cpp | 71
   branches/proto/v3/libs/regex/src/posix_api.cpp | 4
   branches/proto/v3/libs/regex/src/w32_regex_traits.cpp | 182
   branches/proto/v3/libs/regex/src/wide_posix_api.cpp | 10
   branches/proto/v3/libs/regex/test/c_compiler_checks/posix_api_check.c | 14
   branches/proto/v3/libs/regex/test/c_compiler_checks/posix_api_check.cpp | 14
   branches/proto/v3/libs/regex/test/regress/main.cpp | 9
   branches/proto/v3/libs/regex/test/regress/test_locale.cpp | 44
   branches/proto/v3/libs/serialization/test/test_tools.hpp | 20
   branches/proto/v3/libs/test/test/online_test.cpp | 2
   branches/proto/v3/libs/test/test/prg_exec_fail3.cpp | 14
   branches/proto/v3/libs/test/test/test_files/test_tools_test.pattern | 139
   branches/proto/v3/libs/test/test/test_tools_test.cpp | 4
   branches/proto/v3/libs/thread/build/Jamfile.v2 | 6
   branches/proto/v3/libs/thread/src/pthread/once.cpp | 7
   branches/proto/v3/libs/thread/src/pthread/thread.cpp | 137
   branches/proto/v3/libs/thread/src/win32/thread.cpp | 69
   branches/proto/v3/libs/thread/test/test_once.cpp | 1
   branches/proto/v3/libs/thread/test/test_tss.cpp | 99
   branches/proto/v3/libs/tokenizer/examples.cpp | 10
   branches/proto/v3/libs/utility/value_init_test.cpp | 21
   branches/proto/v3/libs/wave/samples/waveidl/idllexer/idl_re.cpp | 5478 +++++++++---------
   branches/proto/v3/libs/wave/src/cpplexer/re2clex/cpp_re.inc | 11474 +++++++++++++++++++--------------------
   branches/proto/v3/libs/wave/src/cpplexer/re2clex/strict_cpp_re.inc | 11462 +++++++++++++++++++--------------------
   branches/proto/v3/more/formal_review_schedule.html | 12
   branches/proto/v3/status/explicit-failures-markup.xml | 47
   branches/proto/v3/tools/build/v2/build/project.jam | 10
   branches/proto/v3/tools/build/v2/tools/pathscale.jam | 8
   branches/proto/v3/tools/inspect/inspect.cpp | 2
   branches/proto/v3/tools/inspect/long_name_check.cpp | 72
   branches/proto/v3/tools/inspect/long_name_check.hpp | 4
   branches/proto/v3/tools/regression/doc/index.html | 5
   branches/proto/v3/tools/regression/src/regression.py | 23
   branches/proto/v3/tools/regression/src/run.py | 53
   branches/proto/v3/tools/regression/xsl_reports/build_results.sh | 3
   232 files changed, 16183 insertions(+), 17540 deletions(-)

Modified: branches/proto/v3/Jamroot
==============================================================================
--- branches/proto/v3/Jamroot (original)
+++ branches/proto/v3/Jamroot 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,6 +1,6 @@
 # Copyright Vladimir Prus 2002-2006.
 # Copyright Dave Abrahams 2005-2006.
-# Copyright Rene Rivera 2005-2006.
+# Copyright Rene Rivera 2005-2007.
 # Copyright Douglas Gregor 2005.
 #
 # Distributed under the Boost Software License, Version 1.0.
@@ -39,6 +39,20 @@
 #
 # Other Options:
 #
+# --build-type=<type> Build the specified pre-defined set of variations
+# of the libraries. Note, that which variants get
+# built depends on what each library supports.
+#
+# minimal (default) - Builds the single
+# "release" version of the libraries. This
+# release corresponds to specifying:
+# "release <threading>multi <link>shared
+# <runtime-link>shared" as the Boost.Build
+# variant to build.
+#
+# complete - Attempts to build all possible
+# variations.
+#
 # --builddir=DIR Build in this location instead of building
 # within the distribution tree. Recommended!
 #
@@ -109,25 +123,38 @@
 
 constant BOOST_VERSION_TAG : $(version-tag:J="_") ;
 
-local default-build ;
-if $(__file__:D) = ""
-{
- default-build =
- debug release
- <threading>single <threading>multi
- <link>shared <link>static
- ;
-
- if [ os.name ] = NT
- {
- default-build += <runtime-link>shared <runtime-link>static ;
- }
+# Option to choose how many variants to build. The default is "minimal",
+# which builds only the "release <threading>multi <link>shared" variant.
+local build-type = [ MATCH "^--build-type=(.*)" : [ modules.peek : ARGV ] ] ;
+build-type ?= minimal ;
+if ! ( $(build-type) in minimal complete )
+{
+ build-type = minimal ;
 }
-else
+
+# Specify the build variants keyed on the build-type.
+local default-build,minimal =
+ release
+ <threading>multi
+ <link>shared
+ <runtime-link>shared
+ ;
+local default-build,complete =
+ debug release
+ <threading>single <threading>multi
+ <link>shared <link>static
+ <runtime-link>shared <runtime-link>static
+ ;
+
+# Set the default build.
+local default-build = $(default-build,$(build-type)) ;
+
+# We only use the default build when building at the root to
+# avoid having it impact the default regression testing of "debug".
+# TODO: Consider having a "testing" build type instead of this check.
+if $(__file__:D) != ""
 {
- default-build =
- debug
- ;
+ default-build = debug ;
 }
 
 

Modified: branches/proto/v3/boost/bimap/relation/support/member_with_tag.hpp
==============================================================================
--- branches/proto/v3/boost/bimap/relation/support/member_with_tag.hpp (original)
+++ branches/proto/v3/boost/bimap/relation/support/member_with_tag.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -94,7 +94,7 @@
 template< class Relation >
 struct member_with_tag
 <
- BOOST_DEDUCED_TYPENAME member_at::info, Relation, void
+ member_at::info, Relation, void
>
 {
     typedef member_at::info type;

Modified: branches/proto/v3/boost/config/compiler/visualc.hpp
==============================================================================
--- branches/proto/v3/boost/config/compiler/visualc.hpp (original)
+++ branches/proto/v3/boost/config/compiler/visualc.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -70,6 +70,11 @@
 # define BOOST_NO_SWPRINTF
 #endif
 
+#if defined(UNDER_CE)
+// Windows CE does not have a conforming signature for swprintf
+# define BOOST_NO_SWPRINTF
+#endif
+
 #if _MSC_VER <= 1400 // 1400 == VC++ 8.0
 # define BOOST_NO_MEMBER_TEMPLATE_FRIENDS
 #endif
@@ -82,9 +87,10 @@
 # define BOOST_NO_INTRINSIC_WCHAR_T
 #endif
 
-#ifdef _WIN32_WCE
+#if defined(_WIN32_WCE) || defined(UNDER_CE)
 # define BOOST_NO_THREADEX
 # define BOOST_NO_GETSYSTEMTIMEASFILETIME
+# define BOOST_NO_SWPRINTF
 #endif
 
 //

Modified: branches/proto/v3/boost/fusion/view/transform_view/detail/value_at_impl.hpp
==============================================================================
--- branches/proto/v3/boost/fusion/view/transform_view/detail/value_at_impl.hpp (original)
+++ branches/proto/v3/boost/fusion/view/transform_view/detail/value_at_impl.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -2,7 +2,7 @@
     Copyright (c) 2001-2006 Joel de Guzman
     Copyright (c) 2005-2006 Dan Marsden
 
- Distributed under the Boost Software License, Version 1.0. (See accompanying
+ Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #if !defined(BOOST_FUSION_VALUE_AT_IMPL_20061101_0745)
@@ -10,7 +10,7 @@
 
 #include <boost/mpl/apply.hpp>
 #include <boost/fusion/view/transform_view/detail/apply_transform_result.hpp>
-#include <boost/fusion/sequence/intrinsic/at.hpp>
+#include <boost/fusion/sequence/intrinsic/value_at.hpp>
 
 namespace boost { namespace fusion {
     struct transform_view_tag;
@@ -29,7 +29,7 @@
             {
                 typedef typename Seq::transform_type F;
                 typedef detail::apply_transform_result<F> transform_type;
- typedef typename boost::fusion::result_of::at<typename Seq::sequence_type, N>::type value_type;
+ typedef typename boost::fusion::result_of::value_at<typename Seq::sequence_type, N>::type value_type;
                 typedef typename mpl::apply<transform_type, value_type>::type type;
             };
         };
@@ -42,8 +42,8 @@
             {
                 typedef typename Seq::transform_type F;
                 typedef detail::apply_transform_result<F> transform_type;
- typedef typename boost::fusion::result_of::at<typename Seq::sequence1_type, N>::type value1_type;
- typedef typename boost::fusion::result_of::at<typename Seq::sequence2_type, N>::type value2_type;
+ typedef typename boost::fusion::result_of::value_at<typename Seq::sequence1_type, N>::type value1_type;
+ typedef typename boost::fusion::result_of::value_at<typename Seq::sequence2_type, N>::type value2_type;
                 typedef typename mpl::apply<transform_type, value1_type, value2_type>::type type;
             };
         };

Modified: branches/proto/v3/boost/interprocess/containers/vector.hpp
==============================================================================
--- branches/proto/v3/boost/interprocess/containers/vector.hpp (original)
+++ branches/proto/v3/boost/interprocess/containers/vector.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -408,8 +408,8 @@
    typedef typename base_t::alloc_version alloc_version;
 
    typedef constant_iterator<T, difference_type> cvalue_iterator;
- typedef repeat_iterator<T, difference_type> rp_iterator;
- typedef detail::move_iterator<rp_iterator> repeat_move_it;
+ typedef repeat_iterator<T, difference_type> repeat_it;
+ typedef detail::move_iterator<repeat_it> repeat_move_it;
    //This is the anti-exception array destructor
    //to deallocate values already constructed
    typedef typename detail::if_c
@@ -961,8 +961,8 @@
       //Just call more general insert(pos, size, value) and return iterator
       size_type n = position - begin();
       this->insert(position
- ,repeat_move_it(rp_iterator(mx.get(), 1))
- ,repeat_move_it(rp_iterator()));
+ ,repeat_move_it(repeat_it(mx.get(), 1))
+ ,repeat_move_it(repeat_it()));
       return iterator(this->members_.m_start + n);
    }
    #else
@@ -971,8 +971,8 @@
       //Just call more general insert(pos, size, value) and return iterator
       size_type n = position - begin();
       this->insert(position
- ,repeat_move_it(rp_iterator(mx, 1))
- ,repeat_move_it(rp_iterator()));
+ ,repeat_move_it(repeat_it(mx, 1))
+ ,repeat_move_it(repeat_it()));
       return iterator(this->members_.m_start + n);
    }
    #endif

Modified: branches/proto/v3/boost/interprocess/detail/iterators.hpp
==============================================================================
--- branches/proto/v3/boost/interprocess/detail/iterators.hpp (original)
+++ branches/proto/v3/boost/interprocess/detail/iterators.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -241,7 +241,7 @@
    repeat_iterator()
       : m_ptr(0), m_num(0){}
 
- repeat_iterator& operator++()
+ this_type& operator++()
    { increment(); return *this; }
    
    this_type operator++(int)

Modified: branches/proto/v3/boost/interprocess/detail/workaround.hpp
==============================================================================
--- branches/proto/v3/boost/interprocess/detail/workaround.hpp (original)
+++ branches/proto/v3/boost/interprocess/detail/workaround.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -78,6 +78,16 @@
       #endif
    #endif
 
+ #ifdef BOOST_INTERPROCESS_POSIX_SEMAPHORES
+ //Some systems have filesystem-based shared memory, so the
+ //portable "/semname" format does not work due to permission issues
+ //For those systems we need to form a path to a temporary directory:
+ // hp-ux tru64 vms
+ #if defined(__hpux) || defined(__osf__) || defined(__vms)
+ #define BOOST_INTERPROCESS_FILESYSTEM_BASED_POSIX_SEMAPHORES
+ #endif
+ #endif
+
 #endif
 
 #if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 2)

Modified: branches/proto/v3/boost/interprocess/offset_ptr.hpp
==============================================================================
--- branches/proto/v3/boost/interprocess/offset_ptr.hpp (original)
+++ branches/proto/v3/boost/interprocess/offset_ptr.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -63,14 +63,15 @@
    #if defined(_MSC_VER) && (_MSC_VER >= 1400)
    __declspec(noinline)
    #endif
- void set_offset(const void *ptr)
+ void set_offset(const volatile void *ptr)
    {
+ const char *p = static_cast<const char*>(const_cast<const void*>(ptr));
       //offset == 1 && ptr != 0 is not legal for this pointer
       if(!ptr){
          m_offset = 1;
       }
       else{
- m_offset = detail::char_ptr_cast(ptr) - detail::char_ptr_cast(this);
+ m_offset = p - detail::char_ptr_cast(this);
          BOOST_ASSERT(m_offset != 1);
       }
    }

Modified: branches/proto/v3/boost/interprocess/shared_memory_object.hpp
==============================================================================
--- branches/proto/v3/boost/interprocess/shared_memory_object.hpp (original)
+++ branches/proto/v3/boost/interprocess/shared_memory_object.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -19,6 +19,7 @@
 #include <boost/interprocess/interprocess_fwd.hpp>
 #include <boost/interprocess/exceptions.hpp>
 #include <boost/interprocess/detail/os_file_functions.hpp>
+#include <boost/interprocess/detail/tmp_dir_helpers.hpp>
 #include <cstddef>
 #include <string>
 #include <cstdio> //std::remove
@@ -30,7 +31,7 @@
 # include <unistd.h> //ftruncate, close
 # include <sys/stat.h> //mode_t, S_IRWXG, S_IRWXO, S_IRWXU,
 #else
-# include<boost/interprocess/detail/os_file_functions.hpp>
+//
 #endif
 
 //!\file
@@ -140,14 +141,6 @@
    //!Closes a previously opened file mapping. Never throws.
    void priv_close();
 
- //!Create a temporary file name
- static void priv_tmp_filename(const char *name, std::string &tmp_name);
-
- //!Create a temporary file name
- static void priv_create_tmp_dir_and_get_filename(const char *name, std::string &tmp_name);
-
- static void priv_add_leading_slash(const char *name, std::string &new_name);
-
    //!Closes a previously opened file mapping. Never throws.
    bool priv_open_or_create(detail::create_enum_t type, const char *filename, mode_t mode);
 
@@ -184,56 +177,6 @@
 inline mode_t shared_memory_object::get_mode() const
 { return m_mode; }
 
-inline void shared_memory_object::priv_tmp_filename
- (const char *filename, std::string &tmp_name)
-{
- const char *tmp_dir = detail::get_temporary_path();
- if(!tmp_dir){
- error_info err = system_error_code();
- throw interprocess_exception(err);
- }
- tmp_name = tmp_dir;
-
- //Remove final null.
- tmp_name += "/boost_interprocess/";
- tmp_name += filename;
-}
-
-inline void shared_memory_object::priv_create_tmp_dir_and_get_filename
- (const char *filename, std::string &tmp_name)
-{
- const char *tmp_path = detail::get_temporary_path();
- if(!tmp_path){
- error_info err = system_error_code();
- throw interprocess_exception(err);
- }
-
- tmp_name = tmp_path;
- tmp_name += "/boost_interprocess";
-
- //Create the temporary directory.
- //If fails, check that it's because already exists
- if(!detail::create_directory(tmp_name.c_str())){
- error_info info(system_error_code());
- if(info.get_error_code() != already_exists_error){
- throw interprocess_exception(info);
- }
- }
-
- //Add filename
- tmp_name += '/';
- tmp_name += filename;
-}
-
-inline void shared_memory_object::priv_add_leading_slash
- (const char *name, std::string &new_name)
-{
- if(name[0] != '/'){
- new_name = '/';
- }
- new_name += name;
-}
-
 #if !defined(BOOST_INTERPROCESS_POSIX_SHARED_MEMORY_OBJECTS)
 
 inline bool shared_memory_object::priv_open_or_create
@@ -241,7 +184,7 @@
 {
    m_filename = filename;
    std::string shmfile;
- priv_create_tmp_dir_and_get_filename(filename, shmfile);
+ detail::create_tmp_dir_and_get_filename(filename, shmfile);
 
    //Set accesses
    if (mode != read_write && mode != read_only){
@@ -282,7 +225,7 @@
    try{
       //Make sure a temporary path is created for shared memory
       std::string shmfile;
- priv_tmp_filename(filename, shmfile);
+ detail::tmp_filename(filename, shmfile);
       return std::remove(shmfile.c_str()) == 0;
    }
    catch(...){
@@ -314,9 +257,9 @@
     mode_t mode)
 {
    #ifndef BOOST_INTERPROCESS_FILESYSTEM_BASED_POSIX_SHARED_MEMORY
- priv_add_leading_slash(filename, m_filename);
+ detail::add_leading_slash(filename, m_filename);
    #else
- priv_create_tmp_dir_and_get_filename(filename, m_filename);
+ detail::create_tmp_dir_and_get_filename(filename, m_filename);
    #endif
 
    //Create new mapping
@@ -369,9 +312,9 @@
    try{
       std::string file_str;
       #ifndef BOOST_INTERPROCESS_FILESYSTEM_BASED_POSIX_SHARED_MEMORY
- priv_add_leading_slash(filename, file_str);
+ detail::add_leading_slash(filename, file_str);
       #else
- priv_tmp_filename(filename, file_str);
+ detail::tmp_filename(filename, file_str);
       #endif
       return 0 != shm_unlink(file_str.c_str());
    }

Modified: branches/proto/v3/boost/interprocess/sync/posix/semaphore_wrapper.hpp
==============================================================================
--- branches/proto/v3/boost/interprocess/sync/posix/semaphore_wrapper.hpp (original)
+++ branches/proto/v3/boost/interprocess/sync/posix/semaphore_wrapper.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -15,9 +15,16 @@
 #include <boost/interprocess/exceptions.hpp>
 #include <boost/interprocess/creation_tags.hpp>
 #include <boost/interprocess/detail/os_file_functions.hpp>
+#include <boost/interprocess/detail/tmp_dir_helpers.hpp>
 #include <string>
 #include <semaphore.h>
 
+#ifdef SEM_FAILED
+#define BOOST_INTERPROCESS_POSIX_SEM_FAILED SEM_FAILED
+#else
+#define BOOST_INTERPROCESS_POSIX_SEM_FAILED ((sem_t*)(-1))
+#endif
+
 #ifdef BOOST_INTERPROCESS_POSIX_TIMEOUTS
 #include <boost/interprocess/sync/posix/ptime_to_timespec.hpp>
 #else
@@ -37,14 +44,12 @@
    (sem_t *&handle, detail::create_enum_t type, const char *origname, mode_t mode,
     unsigned int count)
 {
- bool slash_added = origname[0] != '/';
- //First add preceding "/"
    std::string name;
-
- if(slash_added){
- name = '/';
- }
- name += origname;
+ #ifndef BOOST_INTERPROCESS_FILESYSTEM_BASED_POSIX_SEMAPHORES
+ detail::add_leading_slash(origname, name);
+ #else
+ detail::create_tmp_dir_and_get_filename(origname, name);
+ #endif
 
    //Create new mapping
    int oflag = 0;
@@ -83,14 +88,10 @@
       handle = sem_open(name.c_str(), oflag);
 
    //Check for error
- if(handle == SEM_FAILED){
+ if(handle == BOOST_INTERPROCESS_POSIX_SEM_FAILED){
       throw interprocess_exception(error_info(errno));
    }
 
- if(slash_added){
- name.erase(name.begin());
- }
-
    return true;
 }
 
@@ -102,16 +103,16 @@
    }
 }
 
-inline bool semaphore_unlink(const char *name)
+inline bool semaphore_unlink(const char *semname)
 {
    try{
- std::string str;
- //First add preceding "/"
- if(name[0] != '/'){
- str = '/';
- }
- str += name;
- return 0 != sem_unlink(str.c_str());
+ std::string sem_str;
+ #ifndef BOOST_INTERPROCESS_FILESYSTEM_BASED_POSIX_SEMAPHORES
+ detail::add_leading_slash(semname, sem_str);
+ #else
+ detail::tmp_filename(semname, sem_str);
+ #endif
+ return 0 != sem_unlink(sem_str.c_str());
    }
    catch(...){
       return false;
@@ -121,7 +122,10 @@
 inline void semaphore_init(sem_t *handle, int initialCount)
 {
    int ret = sem_init(handle, 1, initialCount);
- if(ret != 0){
+ //According to SUSV3 version 2003 edition, the return value of a successful
+ //sem_init call is not defined, but -1 is returned on failure.
+ //In the future, a successful call might be required to return 0.
+ if(ret == -1){
       throw interprocess_exception(system_error_code());
    }
 }
@@ -190,14 +194,7 @@
    return false;
    #endif //#ifdef BOOST_INTERPROCESS_POSIX_TIMEOUTS
 }
-/*
-inline int semaphore_get_count(sem_t *handle)
-{
- int count;
- sem_getvalue(handle, &ret);
- return count;
-}
-*/
+
 
 class named_semaphore_wrapper
 {
@@ -212,7 +209,7 @@
 
    ~named_semaphore_wrapper()
    {
- if(mp_sem != SEM_FAILED)
+ if(mp_sem != BOOST_INTERPROCESS_POSIX_SEM_FAILED)
          semaphore_close(mp_sem);
    }
 
@@ -234,7 +231,7 @@
    private:
    friend class detail::interprocess_tester;
    void dont_close_on_destruction()
- { mp_sem = SEM_FAILED; }
+ { mp_sem = BOOST_INTERPROCESS_POSIX_SEM_FAILED; }
 
    sem_t *mp_sem;
 };
@@ -272,4 +269,6 @@
 } //namespace interprocess {
 } //namespace boost {
 
+#undef BOOST_INTERPROCESS_POSIX_SEM_FAILED
+
 #endif //#ifndef BOOST_INTERPROCESS_POSIX_SEMAPHORE_WRAPPER_HPP

Modified: branches/proto/v3/boost/intrusive/detail/utilities.hpp
==============================================================================
--- branches/proto/v3/boost/intrusive/detail/utilities.hpp (original)
+++ branches/proto/v3/boost/intrusive/detail/utilities.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -515,33 +515,35 @@
    return ((x & (x-1))!= 0) + floor_log2(x);
 }
 
-template<std::size_t N>
+template<class SizeType, std::size_t N>
+struct numbits_eq
+{
+ static const bool value = sizeof(SizeType)*CHAR_BIT == N;
+};
+
+template<class SizeType, class Enabler = void >
 struct sqrt2_pow_max;
 
-template<>
-struct sqrt2_pow_max<32>
+template <class SizeType>
+struct sqrt2_pow_max<SizeType, typename enable_if< numbits_eq<SizeType, 32> >::type>
 {
    static const boost::uint32_t value = 0xb504f334;
    static const std::size_t pow = 31;
 };
 
-#ifdef BOOST_HAS_LONG_LONG
-
-template<>
-struct sqrt2_pow_max<64>
+template <class SizeType>
+struct sqrt2_pow_max<SizeType, typename enable_if< numbits_eq<SizeType, 64> >::type>
 {
    static const boost::uint64_t value = 0xb504f333f9de6484ull;
    static const std::size_t pow = 63;
 };
 
-#endif
-
 // Returns floor(pow(sqrt(2), x * 2 + 1)).
 // Defined for X from 0 up to the number of bits in size_t minus 1.
 inline std::size_t sqrt2_pow_2xplus1 (std::size_t x)
 {
- const std::size_t value = (std::size_t)sqrt2_pow_max<sizeof(std::size_t)*CHAR_BIT>::value;
- const std::size_t pow = (std::size_t)sqrt2_pow_max<sizeof(std::size_t)*CHAR_BIT>::pow;
+ const std::size_t value = (std::size_t)sqrt2_pow_max<std::size_t>::value;
+ const std::size_t pow = (std::size_t)sqrt2_pow_max<std::size_t>::pow;
    return (value >> (pow - x)) + 1;
 }
 

Modified: branches/proto/v3/boost/lexical_cast.hpp
==============================================================================
--- branches/proto/v3/boost/lexical_cast.hpp (original)
+++ branches/proto/v3/boost/lexical_cast.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -86,6 +86,14 @@
             typedef char type;
         };
 
+#ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
+ template<class CharT, class Traits, class Alloc>
+ struct stream_char< std::basic_string<CharT,Traits,Alloc> >
+ {
+ typedef CharT type;
+ };
+#endif
+
 #ifndef DISABLE_WIDE_CHAR_SUPPORT
 #ifndef BOOST_NO_INTRINSIC_WCHAR_T
         template<>
@@ -107,12 +115,14 @@
             typedef wchar_t type;
         };
 
+#ifdef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
         template<>
         struct stream_char<std::wstring>
         {
             typedef wchar_t type;
         };
 #endif
+#endif
 
         template<typename TargetChar, typename SourceChar>
         struct widest_char
@@ -127,6 +137,44 @@
         };
     }
 
+ namespace detail // deduce_char_traits template
+ {
+#ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
+ template<class CharT, class Target, class Source>
+ struct deduce_char_traits
+ {
+ typedef std::char_traits<CharT> type;
+ };
+
+ template<class CharT, class Traits, class Alloc, class Source>
+ struct deduce_char_traits< CharT
+ , std::basic_string<CharT,Traits,Alloc>
+ , Source
+ >
+ {
+ typedef Traits type;
+ };
+
+ template<class CharT, class Target, class Traits, class Alloc>
+ struct deduce_char_traits< CharT
+ , Target
+ , std::basic_string<CharT,Traits,Alloc>
+ >
+ {
+ typedef Traits type;
+ };
+
+ template<class CharT, class Traits, class Alloc1, class Alloc2>
+ struct deduce_char_traits< CharT
+ , std::basic_string<CharT,Traits,Alloc1>
+ , std::basic_string<CharT,Traits,Alloc2>
+ >
+ {
+ typedef Traits type;
+ };
+#endif
+ }
+
     namespace detail // lcast_src_length
     {
         // Return max. length of string representation of Source;
@@ -267,14 +315,15 @@
         template<class Source>
         struct lcast_src_length_integral
         {
-#if !defined(__BORLANDC__) || __BORLANDC__ >= 0x581
+#ifndef BOOST_NO_LIMITS_COMPILE_TIME_CONSTANTS
             BOOST_STATIC_CONSTANT(std::size_t, value =
                   std::numeric_limits<Source>::is_signed +
                   std::numeric_limits<Source>::is_specialized + // == 1
                   std::numeric_limits<Source>::digits10 * 2
               );
 #else
- BOOST_STATIC_CONSTANT(std::size_t, value = 156); // 256bit integers
+ BOOST_STATIC_CONSTANT(std::size_t, value = 156);
+ BOOST_STATIC_ASSERT(sizeof(Source) * CHAR_BIT <= 256);
 #endif
         };
 
@@ -308,8 +357,6 @@
 #undef BOOST_AUX_LEXICAL_CAST_DEF1
 
 #ifndef BOOST_LCAST_NO_COMPILE_TIME_PRECISION
-// This #if is in sync with lcast_precision
-
         // Helper for floating point types.
         // -1.23456789e-123456
         // ^ sign
@@ -400,14 +447,8 @@
 #endif
     }
 
- namespace detail // lexical_streambuf and lexical_streambuf_fake
+ namespace detail // lexical_streambuf_fake
     {
- template<typename CharT>
- class lexical_streambuf : public std::basic_streambuf<CharT>
- {
- };
-
- template<typename CharT>
         struct lexical_streambuf_fake
         {
         };
@@ -448,17 +489,19 @@
 #endif
 
 #if (defined _MSC_VER)
-# pragma warning( pop ) // C4146: unary minus operator applied to unsigned type, result still unsigned
+# pragma warning( pop ) // C4146: unary minus operator applied to unsigned type,
+ // result still unsigned
 #endif
     }
 
     namespace detail // lcast_put_unsigned
     {
- // I'd personally put lcast_put_unsigned in .cpp file if not
- // boost practice for header-only libraries (Alexander Nasonov).
- template<typename T, typename CharT>
+ template<class Traits, class T, class CharT>
         CharT* lcast_put_unsigned(T n, CharT* finish)
         {
+#ifndef BOOST_NO_LIMITS_COMPILE_TIME_CONSTANTS
+ BOOST_STATIC_ASSERT(!std::numeric_limits<T>::is_signed);
+#endif
             CharT thousands_sep = 0;
 
 #ifdef BOOST_LEXICAL_CAST_ASSUME_C_LOCALE
@@ -483,6 +526,9 @@
 #ifndef BOOST_NO_LIMITS_COMPILE_TIME_CONSTANTS
             BOOST_STATIC_ASSERT(std::numeric_limits<T>::digits10 < CHAR_MAX);
 #endif
+ typedef typename Traits::int_type int_type;
+ CharT const czero = lcast_char_constants<CharT>::zero;
+ int_type const zero = Traits::to_int_type(czero);
 
             char left = last_grp_size;
 
@@ -499,14 +545,13 @@
 
                     left = last_grp_size;
                     --finish;
- *finish = thousands_sep;
+ Traits::assign(*finish, thousands_sep);
                 }
 
                 --left;
                 --finish;
- int const digit = static_cast<int>(n % 10);
- int const cdigit = digit + lcast_char_constants<CharT>::zero;
- *finish = static_cast<char>(cdigit);
+ int_type const digit = static_cast<int_type>(n % 10U);
+ Traits::assign(*finish, Traits::to_char_type(zero + digit));
                 n /= 10;
             } while(n);
 
@@ -516,7 +561,7 @@
 
     namespace detail // stream wrapper for handling lexical conversions
     {
- template<typename Target, typename Source>
+ template<typename Target, typename Source, typename Traits>
         class lexical_stream
         {
         private:
@@ -524,6 +569,8 @@
                 typename stream_char<Target>::type,
                 typename stream_char<Source>::type>::type char_type;
 
+ typedef Traits traits_type;
+
         public:
             lexical_stream(char_type* = 0, char_type* = 0)
             {
@@ -553,9 +600,12 @@
     
                            EOF;
 #else
- std::char_traits<char_type>::eof();
+ traits_type::eof();
 #endif
             }
+
+#ifdef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
+
             bool operator>>(std::string &output)
             {
                 #if defined(BOOST_NO_STRINGSTREAM)
@@ -571,13 +621,29 @@
                 return true;
             }
             #endif
+
+#else
+ bool operator>>(std::basic_string<char_type,traits_type>& output)
+ {
+ stream.str().swap(output);
+ return true;
+ }
+
+ template<class Alloc>
+ bool operator>>(std::basic_string<char_type,traits_type,Alloc>& out)
+ {
+ std::basic_string<char_type,traits_type> str(stream.str());
+ out.assign(str.begin(), str.end());
+ return true;
+ }
+#endif
         private:
             #if defined(BOOST_NO_STRINGSTREAM)
             std::strstream stream;
             #elif defined(BOOST_NO_STD_LOCALE)
             std::stringstream stream;
             #else
- std::basic_stringstream<char_type> stream;
+ std::basic_stringstream<char_type,traits_type> stream;
             #endif
         };
     }
@@ -586,7 +652,8 @@
     {
         // String representation of Source has an upper limit.
         template< class CharT // a result of widest_char transformation
- , class Base // lexical_streambuf or lexical_streambuf_fake
+ , class Base // lexical_streambuf_fake or basic_streambuf<CharT>
+ , class Traits // usually char_traits<CharT>
>
         class lexical_stream_limited_src : public Base
         {
@@ -600,19 +667,20 @@
 
             static void widen_and_assign(char*p, char ch)
             {
- *p = ch;
+ Traits::assign(*p, ch);
             }
 
 #ifndef DISABLE_WIDE_CHAR_SUPPORT
             static void widen_and_assign(wchar_t* p, char ch)
             {
                 std::locale loc;
- *p = BOOST_USE_FACET(std::ctype<wchar_t>, loc).widen(ch);
+ wchar_t w = BOOST_USE_FACET(std::ctype<wchar_t>, loc).widen(ch);
+ Traits::assign(*p, w);
             }
 
             static void widen_and_assign(wchar_t* p, wchar_t ch)
             {
- *p = ch;
+ Traits::assign(*p, ch);
             }
 
             static void widen_and_assign(char*, wchar_t ch); // undefined
@@ -642,8 +710,8 @@
 
         public: // output
 
- template<class Traits, class Alloc>
- bool operator<<(std::basic_string<CharT, Traits, Alloc> const& str)
+ template<class Alloc>
+ bool operator<<(std::basic_string<CharT,Traits,Alloc> const& str)
             {
                 start = const_cast<CharT*>(str.data());
                 finish = start + str.length();
@@ -706,7 +774,7 @@
 
                     EOF;
 #else
- std::char_traits<CharT>::eof();
+ Traits::eof();
 #endif
             }
 
@@ -722,7 +790,7 @@
 #endif
 
 #else
- template<class Traits, class Alloc>
+ template<class Alloc>
             bool operator>>(std::basic_string<CharT,Traits,Alloc>& str)
             {
                 str.assign(start, finish);
@@ -731,17 +799,21 @@
 #endif
         };
 
- template<typename CharT, class Base>
- inline bool lexical_stream_limited_src<CharT,Base>::operator<<(
+ template<typename CharT, class Base, class Traits>
+ inline bool lexical_stream_limited_src<CharT,Base,Traits>::operator<<(
                 bool value)
         {
- *start = value + lcast_char_constants<CharT>::zero;
+ typedef typename Traits::int_type int_type;
+ CharT const czero = lcast_char_constants<CharT>::zero;
+ int_type const zero = Traits::to_int_type(czero);
+ Traits::assign(*start, Traits::to_char_type(zero + value));
             finish = start + 1;
             return true;
         }
 
- template<typename CharT, class Base>
- inline bool lexical_stream_limited_src<CharT,Base>::operator<<(char ch)
+ template<typename CharT, class Base, class Traits>
+ inline bool lexical_stream_limited_src<CharT,Base,Traits>::operator<<(
+ char ch)
         {
             widen_and_assign(start, ch);
             finish = start + 1;
@@ -749,8 +821,8 @@
         }
 
 #if !defined(DISABLE_WIDE_CHAR_SUPPORT) && !defined(BOOST_NO_INTRINSIC_WCHAR_T)
- template<typename CharT, class Base>
- inline bool lexical_stream_limited_src<CharT,Base>::operator<<(
+ template<typename CharT, class Base, class Traits>
+ inline bool lexical_stream_limited_src<CharT,Base,Traits>::operator<<(
                 wchar_t ch)
         {
             widen_and_assign(start, ch);
@@ -759,140 +831,163 @@
         }
 #endif
 
- template<typename CharT, class Base>
- inline bool lexical_stream_limited_src<CharT,Base>::operator<<(short n)
+ template<typename CharT, class Base, class Traits>
+ inline bool lexical_stream_limited_src<CharT,Base,Traits>::operator<<(
+ short n)
         {
- start = lcast_put_unsigned(lcast_to_unsigned(n), finish);
+ start = lcast_put_unsigned<Traits>(lcast_to_unsigned(n), finish);
             if(n < 0)
- *--start = lcast_char_constants<CharT>::minus;
+ {
+ --start;
+ CharT const minus = lcast_char_constants<CharT>::minus;
+ Traits::assign(*start, minus);
+ }
             return true;
         }
 
- template<typename CharT, class Base>
- inline bool lexical_stream_limited_src<CharT,Base>::operator<<(int n)
+ template<typename CharT, class Base, class Traits>
+ inline bool lexical_stream_limited_src<CharT,Base,Traits>::operator<<(
+ int n)
         {
- start = lcast_put_unsigned(lcast_to_unsigned(n), finish);
+ start = lcast_put_unsigned<Traits>(lcast_to_unsigned(n), finish);
             if(n < 0)
- *--start = lcast_char_constants<CharT>::minus;
+ {
+ --start;
+ CharT const minus = lcast_char_constants<CharT>::minus;
+ Traits::assign(*start, minus);
+ }
             return true;
         }
 
- template<typename CharT, class Base>
- inline bool lexical_stream_limited_src<CharT,Base>::operator<<(long n)
+ template<typename CharT, class Base, class Traits>
+ inline bool lexical_stream_limited_src<CharT,Base,Traits>::operator<<(
+ long n)
         {
- start = lcast_put_unsigned(lcast_to_unsigned(n), finish);
+ start = lcast_put_unsigned<Traits>(lcast_to_unsigned(n), finish);
             if(n < 0)
- *--start = lcast_char_constants<CharT>::minus;
+ {
+ --start;
+ CharT const minus = lcast_char_constants<CharT>::minus;
+ Traits::assign(*start, minus);
+ }
             return true;
         }
 
 #if defined(BOOST_HAS_LONG_LONG)
- template<typename CharT, class Base>
- inline bool lexical_stream_limited_src<CharT,Base>::operator<<(
+ template<typename CharT, class Base, class Traits>
+ inline bool lexical_stream_limited_src<CharT,Base,Traits>::operator<<(
                 boost::long_long_type n)
         {
- start = lcast_put_unsigned(lcast_to_unsigned(n), finish);
+ start = lcast_put_unsigned<Traits>(lcast_to_unsigned(n), finish);
             if(n < 0)
- *--start = lcast_char_constants<CharT>::minus;
+ {
+ --start;
+ CharT const minus = lcast_char_constants<CharT>::minus;
+ Traits::assign(*start, minus);
+ }
             return true;
         }
 #elif defined(BOOST_HAS_MS_INT64)
- template<typename CharT, class Base>
- inline bool lexical_stream_limited_src<CharT,Base>::operator<<(
+ template<typename CharT, class Base, class Traits>
+ inline bool lexical_stream_limited_src<CharT,Base,Traits>::operator<<(
                 __int64 n)
         {
- start = lcast_put_unsigned(lcast_to_unsigned(n), finish);
+ start = lcast_put_unsigned<Traits>(lcast_to_unsigned(n), finish);
             if(n < 0)
- *--start = lcast_char_constants<CharT>::minus;
+ {
+ --start;
+ CharT const minus = lcast_char_constants<CharT>::minus;
+ Traits::assign(*start, minus);
+ }
             return true;
         }
 #endif
 
- template<typename CharT, class Base>
- inline bool lexical_stream_limited_src<CharT,Base>::operator<<(
+ template<typename CharT, class Base, class Traits>
+ inline bool lexical_stream_limited_src<CharT,Base,Traits>::operator<<(
                 unsigned short n)
         {
- start = lcast_put_unsigned(+n, finish);
+ start = lcast_put_unsigned<Traits>(lcast_to_unsigned(n), finish);
             return true;
         }
 
- template<typename CharT, class Base>
- inline bool lexical_stream_limited_src<CharT,Base>::operator<<(
+ template<typename CharT, class Base, class Traits>
+ inline bool lexical_stream_limited_src<CharT,Base,Traits>::operator<<(
                 unsigned int n)
         {
- start = lcast_put_unsigned(n, finish);
+ start = lcast_put_unsigned<Traits>(n, finish);
             return true;
         }
 
- template<typename CharT, class Base>
- inline bool lexical_stream_limited_src<CharT,Base>::operator<<(
+ template<typename CharT, class Base, class Traits>
+ inline bool lexical_stream_limited_src<CharT,Base,Traits>::operator<<(
                 unsigned long n)
         {
- start = lcast_put_unsigned(n, finish);
+ start = lcast_put_unsigned<Traits>(n, finish);
             return true;
         }
 
 #if defined(BOOST_HAS_LONG_LONG)
- template<typename CharT, class Base>
- inline bool lexical_stream_limited_src<CharT,Base>::operator<<(
+ template<typename CharT, class Base, class Traits>
+ inline bool lexical_stream_limited_src<CharT,Base,Traits>::operator<<(
                 boost::ulong_long_type n)
         {
- start = lcast_put_unsigned(n, finish);
+ start = lcast_put_unsigned<Traits>(n, finish);
             return true;
         }
 #elif defined(BOOST_HAS_MS_INT64)
- template<typename CharT, class Base>
- inline bool lexical_stream_limited_src<CharT,Base>::operator<<(
+ template<typename CharT, class Base, class Traits>
+ inline bool lexical_stream_limited_src<CharT,Base,Traits>::operator<<(
                 unsigned __int64 n)
         {
- start = lcast_put_unsigned(n, finish);
+ start = lcast_put_unsigned<Traits>(n, finish);
             return true;
         }
 #endif
 
- template<typename CharT, class Base>
- inline bool lexical_stream_limited_src<CharT,Base>::operator<<(
+ template<typename CharT, class Base, class Traits>
+ inline bool lexical_stream_limited_src<CharT,Base,Traits>::operator<<(
                 float val)
         {
             return this->lcast_put(val);
         }
 
- template<typename CharT, class Base>
- inline bool lexical_stream_limited_src<CharT,Base>::operator<<(
+ template<typename CharT, class Base, class Traits>
+ inline bool lexical_stream_limited_src<CharT,Base,Traits>::operator<<(
                 double val)
         {
             return this->lcast_put(val);
         }
 
- template<typename CharT, class Base>
- inline bool lexical_stream_limited_src<CharT,Base>::operator<<(
+ template<typename CharT, class Base, class Traits>
+ inline bool lexical_stream_limited_src<CharT,Base,Traits>::operator<<(
                 long double val)
         {
             return this->lcast_put(val);
         }
 
- template<typename CharT, class Base>
- inline bool lexical_stream_limited_src<CharT,Base>::operator<<(
+ template<typename CharT, class Base, class Traits>
+ inline bool lexical_stream_limited_src<CharT,Base,Traits>::operator<<(
                 CharT const* str)
         {
             start = const_cast<CharT*>(str);
- finish = start + std::char_traits<CharT>::length(str);
+ finish = start + Traits::length(str);
             return true;
         }
 
- template<typename CharT, class Base>
- inline bool lexical_stream_limited_src<CharT,Base>::operator>>(
+ template<typename CharT, class Base, class Traits>
+ inline bool lexical_stream_limited_src<CharT,Base,Traits>::operator>>(
                 CharT& output)
         {
             bool const ok = (finish - start == 1);
             if(ok)
- output = *start;
+ Traits::assign(output, *start);
             return ok;
         }
 
 #ifdef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
- template<typename CharT, class Base>
- inline bool lexical_stream_limited_src<CharT,Base>::operator>>(
+ template<typename CharT, class Base, class Traits>
+ inline bool lexical_stream_limited_src<CharT,Base,Traits>::operator>>(
                 std::string& str)
         {
             str.assign(start, finish);
@@ -900,8 +995,8 @@
         }
 
 #ifndef DISABLE_WIDE_CHAR_SUPPORT
- template<typename CharT, class Base>
- inline bool lexical_stream_limited_src<CharT,Base>::operator>>(
+ template<typename CharT, class Base, class Traits>
+ inline bool lexical_stream_limited_src<CharT,Base,Traits>::operator>>(
                 std::wstring& str)
         {
             str.assign(start, finish);
@@ -913,7 +1008,7 @@
 
     namespace detail // lcast_streambuf_for_source
     {
- // Returns true if optimized stream wrapper uses ostream for formatting.
+ // Returns true if optimized stream wrapper needs ostream for writing.
         template<class Source>
         struct lcast_streambuf_for_source
         {
@@ -941,7 +1036,7 @@
 
     namespace detail // lcast_streambuf_for_target
     {
- // Returns true if optimized stream wrapper use istream for reading.
+ // Returns true if optimized stream wrapper needs istream for reading.
         template<class Target>
         struct lcast_streambuf_for_target
         {
@@ -1022,17 +1117,23 @@
             BOOST_DEDUCED_TYPENAME boost::call_traits<Source>::param_type arg,
             CharT* buf, std::size_t src_len)
         {
+#ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
+ typedef BOOST_DEDUCED_TYPENAME
+ deduce_char_traits<CharT,Target,Source>::type traits;
+#else
+ typedef std::char_traits<CharT> traits;
+#endif
             typedef BOOST_DEDUCED_TYPENAME boost::mpl::if_c<
                 lcast_streambuf_for_target<Target>::value ||
                 lcast_streambuf_for_source<Source>::value
- , lexical_streambuf<CharT>
- , lexical_streambuf_fake<CharT>
+ , std::basic_streambuf<CharT>
+ , lexical_streambuf_fake
>::type base;
 
             BOOST_DEDUCED_TYPENAME boost::mpl::if_c<
                 Unlimited
- , detail::lexical_stream<Target, Source>
- , detail::lexical_stream_limited_src<CharT,base>
+ , detail::lexical_stream<Target,Source,traits>
+ , detail::lexical_stream_limited_src<CharT,base,traits>
>::type interpreter(buf, buf + src_len);
 
             // The original form, reproduced below, is more elegant
@@ -1079,7 +1180,13 @@
     template<typename Target, typename Source>
     Target lexical_cast(Source arg)
     {
- detail::lexical_stream<Target, Source> interpreter;
+ typedef typename detail::widest_char<
+ BOOST_DEDUCED_TYPENAME detail::stream_char<Target>::type
+ , BOOST_DEDUCED_TYPENAME detail::stream_char<Source>::type
+ >::type char_type;
+
+ typedef std::char_traits<char_type> traits;
+ detail::lexical_stream<Target, Source, traits> interpreter;
         Target result;
 
         if(!(interpreter << arg && interpreter >> result))
@@ -1091,7 +1198,7 @@
 }
 
 // Copyright Kevlin Henney, 2000-2005.
-// Copyright Alexander Nasonov, 2006.
+// Copyright Alexander Nasonov, 2006-2007.
 //
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at

Modified: branches/proto/v3/boost/math/bindings/rr.hpp
==============================================================================
--- branches/proto/v3/boost/math/bindings/rr.hpp (original)
+++ branches/proto/v3/boost/math/bindings/rr.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -413,7 +413,7 @@
 template <class charT, class traits>
 inline std::basic_istream<charT, traits>& operator>>(std::basic_istream<charT, traits>& is, RR& a)
 {
- long double v;
+ ::NTL::RR v;
    is >> v;
    a = v;
    return is;

Modified: branches/proto/v3/boost/mpi/detail/ignore_skeleton_oarchive.hpp
==============================================================================
--- branches/proto/v3/boost/mpi/detail/ignore_skeleton_oarchive.hpp (original)
+++ branches/proto/v3/boost/mpi/detail/ignore_skeleton_oarchive.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -48,8 +48,8 @@
     }
         
 #define BOOST_ARCHIVE_IGNORE_IMPLEMENTATION(T) \
- void save_override(T const & t , int) \
- {} \
+ void save_override(T const & , int) \
+ {}
 
 BOOST_ARCHIVE_IGNORE_IMPLEMENTATION(archive::class_id_optional_type)
 BOOST_ARCHIVE_IGNORE_IMPLEMENTATION(archive::version_type)

Modified: branches/proto/v3/boost/multi_index/detail/auto_space.hpp
==============================================================================
--- branches/proto/v3/boost/multi_index/detail/auto_space.hpp (original)
+++ branches/proto/v3/boost/multi_index/detail/auto_space.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -16,6 +16,7 @@
 #include <boost/config.hpp> /* keep it first to prevent nasty warns in MSVC */
 #include <algorithm>
 #include <boost/detail/allocator_utilities.hpp>
+#include <boost/multi_index/detail/adl_swap.hpp>
 #include <boost/multi_index/detail/prevent_eti.hpp>
 #include <boost/noncopyable.hpp>
 #include <memory>
@@ -65,30 +66,14 @@
 
   pointer data()const{return data_;}
 
- void swap(auto_space& x){swap_(x);}
-
-private:
- void swap_(auto_space& x)
+ void swap(auto_space& x)
   {
- /* Swapping is done inside swap_() rather than swap() so as to avoid
- * name hiding when ADLing swap below. Not sure if this is legally
- * required, though.
- */
-
- if(al_!=x.al_){
-
-#if defined(BOOST_FUNCTION_SCOPE_USING_DECLARATION_BREAKS_ADL)
- std::swap(al_,x.al_);
-#else
- using std::swap;
- swap(al_,x.al_);
-#endif
-
- }
+ if(al_!=x.al_)adl_swap(al_,x.al_);
     std::swap(n_,x.n_);
     std::swap(data_,x.data_);
   }
-
+
+private:
   typename boost::detail::allocator::rebind_to<
     Allocator,T>::type al_;
   std::size_t n_;

Modified: branches/proto/v3/boost/multi_index_container.hpp
==============================================================================
--- branches/proto/v3/boost/multi_index_container.hpp (original)
+++ branches/proto/v3/boost/multi_index_container.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -29,6 +29,7 @@
 #include <boost/mpl/deref.hpp>
 #include <boost/multi_index_container_fwd.hpp>
 #include <boost/multi_index/detail/access_specifier.hpp>
+#include <boost/multi_index/detail/adl_swap.hpp>
 #include <boost/multi_index/detail/base_type.hpp>
 #include <boost/multi_index/detail/converter.hpp>
 #include <boost/multi_index/detail/header_holder.hpp>
@@ -540,14 +541,7 @@
   void swap_(multi_index_container<Value,IndexSpecifierList,Allocator>& x)
   {
     if(bfm_allocator::member!=x.bfm_allocator::member){
-
-#if defined(BOOST_FUNCTION_SCOPE_USING_DECLARATION_BREAKS_ADL)
- std::swap(bfm_allocator::member,x.bfm_allocator::member);
-#else
- using std::swap;
- swap(bfm_allocator::member,x.bfm_allocator::member);
-#endif
-
+ detail::adl_swap(bfm_allocator::member,x.bfm_allocator::member);
     }
     std::swap(bfm_header::member,x.bfm_header::member);
     super::swap_(x);

Modified: branches/proto/v3/boost/numeric/ublas/symmetric.hpp
==============================================================================
--- branches/proto/v3/boost/numeric/ublas/symmetric.hpp (original)
+++ branches/proto/v3/boost/numeric/ublas/symmetric.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -14,6 +14,7 @@
 #define _BOOST_UBLAS_SYMMETRIC_
 
 #include <boost/numeric/ublas/matrix.hpp>
+#include <boost/numeric/ublas/triangular.hpp>
 #include <boost/numeric/ublas/detail/temporary.hpp>
 
 // Iterators based on ideas of Jeremy Siek
@@ -121,7 +122,7 @@
         void resize (size_type size, bool preserve = true) {
             if (preserve) {
                 self_type temporary (size, size);
- detail::matrix_resize_preserve<layout_type> (*this, temporary);
+ detail::matrix_resize_preserve<layout_type, triangular_type> (*this, temporary);
             }
             else {
                 data ().resize (triangular_type::packed_size (layout_type (), size, size));

Modified: branches/proto/v3/boost/optional/optional.hpp
==============================================================================
--- branches/proto/v3/boost/optional/optional.hpp (original)
+++ branches/proto/v3/boost/optional/optional.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -516,7 +516,7 @@
 
     // Creates a deep copy of another optional<T>
     // Can throw if T::T(T const&) does
- optional ( optional const& rhs ) : base(rhs) {}
+ optional ( optional const& rhs ) : base( static_cast<base const&>(rhs) ) {}
 
    // No-throw (assuming T::~T() doesn't)
     ~optional() {}
@@ -550,7 +550,7 @@
     // (NOTE: On BCB, this operator is not actually called and left is left UNMODIFIED in case of a throw)
     optional& operator= ( optional const& rhs )
       {
- this->assign( rhs ) ;
+ this->assign( static_cast<base const&>(rhs) ) ;
         return *this ;
       }
 

Modified: branches/proto/v3/boost/pool/pool.hpp
==============================================================================
--- branches/proto/v3/boost/pool/pool.hpp (original)
+++ branches/proto/v3/boost/pool/pool.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -153,6 +153,7 @@
     const simple_segregated_storage<size_type> & store() const { return *this; }
     const size_type requested_size;
     size_type next_size;
+ size_type start_size;
 
     // finds which POD in the list 'chunk' was allocated from
     details::PODptr<size_type> find_POD(void * const chunk) const;
@@ -192,7 +193,7 @@
     // pre: npartition_size != 0 && nnext_size != 0
     explicit pool(const size_type nrequested_size,
         const size_type nnext_size = 32)
- :list(0, 0), requested_size(nrequested_size), next_size(nnext_size)
+ :list(0, 0), requested_size(nrequested_size), next_size(nnext_size), start_size(nnext_size)
     { }
 
     ~pool() { purge_memory(); }
@@ -208,7 +209,8 @@
 
     // These functions are extensions!
     size_type get_next_size() const { return next_size; }
- void set_next_size(const size_type nnext_size) { next_size = nnext_size; }
+ void set_next_size(const size_type nnext_size) { next_size = start_size = nnext_size; }
+ size_type get_requested_size() const { return requested_size; }
 
     // Both malloc and ordered_malloc do a quick inlined check first for any
     // free chunks. Only if we need to get another memory block do we call
@@ -290,8 +292,8 @@
   // Note that "prev_free" in this case does NOT point to the previous memory
   // chunk in the free list, but rather the last free memory chunk before the
   // current block.
- void * free = this->first;
- void * prev_free = 0;
+ void * free_p = this->first;
+ void * prev_free_p = 0;
 
   const size_type partition_size = alloc_size();
 
@@ -300,10 +302,10 @@
   {
     // At this point:
     // ptr points to a valid memory block
- // free points to either:
+ // free_p points to either:
     // 0 if there are no more free chunks
     // the first free chunk in this or some next memory block
- // prev_free points to either:
+ // prev_free_p points to either:
     // the last free chunk in some previous memory block
     // 0 if there is no such free chunk
     // prev is either:
@@ -313,8 +315,8 @@
     // If there are no more free memory chunks, then every remaining
     // block is allocated out to its fullest capacity, and we can't
     // release any more memory
- if (free == 0)
- return ret;
+ if (free_p == 0)
+ break;
 
     // We have to check all the chunks. If they are *all* free (i.e., present
     // in the free list), then we can free the block.
@@ -322,47 +324,47 @@
 
     // Iterate 'i' through all chunks in the memory block
     // if free starts in the memory block, be careful to keep it there
- void * saved_free = free;
+ void * saved_free = free_p;
     for (char * i = ptr.begin(); i != ptr.end(); i += partition_size)
     {
       // If this chunk is not free
- if (i != free)
+ if (i != free_p)
       {
         // We won't be able to free this block
         all_chunks_free = false;
 
- // free might have travelled outside ptr
- free = saved_free;
+ // free_p might have travelled outside ptr
+ free_p = saved_free;
         // Abort searching the chunks; we won't be able to free this
         // block because a chunk is not free.
         break;
       }
 
- // We do not increment prev_free because we are in the same block
- free = nextof(free);
+ // We do not increment prev_free_p because we are in the same block
+ free_p = nextof(free_p);
     }
 
- // post: if the memory block has any chunks, free points to one of them
+ // post: if the memory block has any chunks, free_p points to one of them
     // otherwise, our assertions above are still valid
 
     const details::PODptr<size_type> next = ptr.next();
 
     if (!all_chunks_free)
     {
- if (is_from(free, ptr.begin(), ptr.element_size()))
+ if (is_from(free_p, ptr.begin(), ptr.element_size()))
       {
         std::less<void *> lt;
         void * const end = ptr.end();
         do
         {
- prev_free = free;
- free = nextof(free);
- } while (free && lt(free, end));
+ prev_free_p = free_p;
+ free_p = nextof(free_p);
+ } while (free_p && lt(free_p, end));
       }
       // This invariant is now restored:
- // free points to the first free chunk in some next memory block, or
+ // free_p points to the first free chunk in some next memory block, or
       // 0 if there is no such chunk.
- // prev_free points to the last free chunk in this memory block.
+ // prev_free_p points to the last free chunk in this memory block.
       
       // We are just about to advance ptr. Maintain the invariant:
       // prev is the PODptr whose next() is ptr, or !valid()
@@ -380,10 +382,10 @@
         list = next;
 
       // Remove all entries in the free list from this block
- if (prev_free != 0)
- nextof(prev_free) = free;
+ if (prev_free_p != 0)
+ nextof(prev_free_p) = free_p;
       else
- this->first = free;
+ this->first = free_p;
 
       // And release memory
       UserAllocator::free(ptr.begin());
@@ -394,6 +396,7 @@
     ptr = next;
   }
 
+ next_size = start_size;
   return ret;
 }
 
@@ -419,6 +422,7 @@
 
   list.invalidate();
   this->first = 0;
+ next_size = start_size;
 
   return true;
 }

Modified: branches/proto/v3/boost/python/object_protocol.hpp
==============================================================================
--- branches/proto/v3/boost/python/object_protocol.hpp (original)
+++ branches/proto/v3/boost/python/object_protocol.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -12,46 +12,55 @@
 
 namespace boost { namespace python { namespace api {
 
+# if BOOST_WORKAROUND(__SUNPRO_CC, <= 0x580)
+// attempt to use SFINAE to prevent functions accepting T const& from
+// coming up as ambiguous with the one taking a char const* when a
+// string literal is passed
+# define BOOST_PYTHON_NO_ARRAY_ARG(T) , T (*)() = 0
+# else
+# define BOOST_PYTHON_NO_ARRAY_ARG(T)
+# endif
+
 template <class Target, class Key>
-object getattr(Target const& target, Key const& key)
+object getattr(Target const& target, Key const& key BOOST_PYTHON_NO_ARRAY_ARG(key))
 {
     return getattr(object(target), object(key));
 }
 
 template <class Target, class Key, class Default>
-object getattr(Target const& target, Key const& key, Default const& default_)
+object getattr(Target const& target, Key const& key, Default const& default_ BOOST_PYTHON_NO_ARRAY_ARG(key))
 {
     return getattr(object(target), object(key), object(default_));
 }
 
 
 template <class Key, class Value>
-void setattr(object const& target, Key const& key, Value const& value)
+void setattr(object const& target, Key const& key, Value const& value BOOST_PYTHON_NO_ARRAY_ARG(key))
 {
     setattr(target, object(key), object(value));
 }
 
 template <class Key>
-void delattr(object const& target, Key const& key)
+void delattr(object const& target, Key const& key BOOST_PYTHON_NO_ARRAY_ARG(key))
 {
     delattr(target, object(key));
 }
 
 template <class Target, class Key>
-object getitem(Target const& target, Key const& key)
+object getitem(Target const& target, Key const& key BOOST_PYTHON_NO_ARRAY_ARG(key))
 {
     return getitem(object(target), object(key));
 }
 
 
 template <class Key, class Value>
-void setitem(object const& target, Key const& key, Value const& value)
+void setitem(object const& target, Key const& key, Value const& value BOOST_PYTHON_NO_ARRAY_ARG(key))
 {
     setitem(target, object(key), object(value));
 }
 
 template <class Key>
-void delitem(object const& target, Key const& key)
+void delitem(object const& target, Key const& key BOOST_PYTHON_NO_ARRAY_ARG(key))
 {
     delitem(target, object(key));
 }

Modified: branches/proto/v3/boost/regex/v4/fileiter.hpp
==============================================================================
--- branches/proto/v3/boost/regex/v4/fileiter.hpp (original)
+++ branches/proto/v3/boost/regex/v4/fileiter.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -51,7 +51,11 @@
 namespace boost{
    namespace re_detail{
 
+#ifndef BOOST_NO_ANSI_APIS
 typedef WIN32_FIND_DATAA _fi_find_data;
+#else
+typedef WIN32_FIND_DATAW _fi_find_data;
+#endif
 typedef HANDLE _fi_find_handle;
 
    } // namespace re_detail

Modified: branches/proto/v3/boost/test/auto_unit_test.hpp
==============================================================================
--- branches/proto/v3/boost/test/auto_unit_test.hpp (original)
+++ branches/proto/v3/boost/test/auto_unit_test.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2001-2005.
+// (C) Copyright Gennadiy Rozental 2001-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -17,14 +17,4 @@
 
 #include <boost/test/unit_test.hpp>
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.18 2005/12/14 05:03:11 rogeeff
-// depreicated
-//
-//
-// ***************************************************************************
-
 #endif // BOOST_TEST_AUTO_UNIT_TEST_HPP_071894GER

Modified: branches/proto/v3/boost/test/debug.hpp
==============================================================================
--- branches/proto/v3/boost/test/debug.hpp (original)
+++ branches/proto/v3/boost/test/debug.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -18,7 +18,7 @@
 // Boost.Test
 #include <boost/test/detail/config.hpp>
 #include <boost/test/utils/callback.hpp>
-#include <boost/test/utils/basic_cstring/basic_cstring_fwd.hpp>
+#include <boost/test/utils/basic_cstring/basic_cstring.hpp>
 
 // STL
 #include <string>
@@ -98,10 +98,4 @@
 
 #include <boost/test/detail/enable_warnings.hpp>
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// ***************************************************************************
-
 #endif

Modified: branches/proto/v3/boost/test/debug_config.hpp
==============================================================================
--- branches/proto/v3/boost/test/debug_config.hpp (original)
+++ branches/proto/v3/boost/test/debug_config.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -21,10 +21,4 @@
 // maximum size of /proc/pid/stat file
 // #define BOOST_TEST_STAT_LINE_MAX
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// ***************************************************************************
-
 #endif

Modified: branches/proto/v3/boost/test/detail/config.hpp
==============================================================================
--- branches/proto/v3/boost/test/detail/config.hpp (original)
+++ branches/proto/v3/boost/test/detail/config.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2001-2005.
+// (C) Copyright Gennadiy Rozental 2001-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)

Modified: branches/proto/v3/boost/test/detail/enable_warnings.hpp
==============================================================================
--- branches/proto/v3/boost/test/detail/enable_warnings.hpp (original)
+++ branches/proto/v3/boost/test/detail/enable_warnings.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2004-2005.
+// (C) Copyright Gennadiy Rozental 2004-2007.
 // Distributed under the 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,27 +25,3 @@
 # pragma warning(default: 4180) // qualifier applied to function type has no meaning; ignored
 # pragma warning(pop)
 #endif
-
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.6 2006/01/28 07:09:08 rogeeff
-// 4180 suppressed
-//
-// Revision 1.5 2005/12/14 04:57:50 rogeeff
-// extra warnings suppressed
-//
-// Revision 1.4 2005/02/20 08:27:06 rogeeff
-// This a major update for Boost.Test framework. See release docs for complete list of fixes/updates
-//
-// Revision 1.3 2005/02/01 06:40:07 rogeeff
-// copyright update
-// old log entries removed
-// minor stilistic changes
-// depricated tools removed
-//
-// Revision 1.2 2005/01/31 06:00:37 rogeeff
-// deprecated std symbols warning suppressed
-//
-// ***************************************************************************

Modified: branches/proto/v3/boost/test/detail/fwd_decl.hpp
==============================================================================
--- branches/proto/v3/boost/test/detail/fwd_decl.hpp (original)
+++ branches/proto/v3/boost/test/detail/fwd_decl.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -43,17 +43,5 @@
 
 } // namespace boost
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.2 2005/12/14 04:59:11 rogeeff
-// *** empty log message ***
-//
-// Revision 1.1 2005/02/20 08:27:06 rogeeff
-// This a major update for Boost.Test framework. See release docs for complete list of fixes/updates
-//
-// ***************************************************************************
-
 #endif // BOOST_TEST_FWD_DECL_HPP_011605GER
 

Modified: branches/proto/v3/boost/test/detail/global_typedef.hpp
==============================================================================
--- branches/proto/v3/boost/test/detail/global_typedef.hpp (original)
+++ branches/proto/v3/boost/test/detail/global_typedef.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2001-2005.
+// (C) Copyright Gennadiy Rozental 2001-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -69,16 +69,4 @@
 
 #include <boost/test/detail/enable_warnings.hpp>
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.2 2006/03/15 03:18:29 rogeeff
-// made literal resizable
-//
-// Revision 1.1 2005/02/20 08:27:06 rogeeff
-// This a major update for Boost.Test framework. See release docs for complete list of fixes/updates
-//
-// ***************************************************************************
-
 #endif // BOOST_TEST_GLOBAL_TYPEDEF_HPP_021005GER

Modified: branches/proto/v3/boost/test/detail/log_level.hpp
==============================================================================
--- branches/proto/v3/boost/test/detail/log_level.hpp (original)
+++ branches/proto/v3/boost/test/detail/log_level.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -40,21 +40,4 @@
 } // namespace unit_test
 } // namespace boost
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.2 2005/02/20 08:27:06 rogeeff
-// This a major update for Boost.Test framework. See release docs for complete list of fixes/updates
-//
-// Revision 1.1 2005/01/18 08:27:30 rogeeff
-// unit_test_log rework:
-// eliminated need for ::instance()
-// eliminated need for << end and ...END macro
-// straitend interface between log and formatters
-// change compiler like formatter name
-// minimized unit_test_log interface and reworked to use explicit calls
-//
-// ***************************************************************************
-
 #endif // BOOST_TEST_LOG_LEVEL_HPP_011605GER

Modified: branches/proto/v3/boost/test/detail/suppress_warnings.hpp
==============================================================================
--- branches/proto/v3/boost/test/detail/suppress_warnings.hpp (original)
+++ branches/proto/v3/boost/test/detail/suppress_warnings.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2004-2005.
+// (C) Copyright Gennadiy Rozental 2004-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -26,26 +26,3 @@
 # pragma warning(disable: 4180) // qualifier applied to function type has no meaning; ignored
 #endif
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.6 2006/01/28 07:09:08 rogeeff
-// 4180 suppressed
-//
-// Revision 1.5 2005/12/14 04:57:50 rogeeff
-// extra warnings suppressed
-//
-// Revision 1.4 2005/02/20 08:27:06 rogeeff
-// This a major update for Boost.Test framework. See release docs for complete list of fixes/updates
-//
-// Revision 1.3 2005/02/01 06:40:07 rogeeff
-// copyright update
-// old log entries removed
-// minor stilistic changes
-// depricated tools removed
-//
-// Revision 1.2 2005/01/31 06:00:37 rogeeff
-// deprecated std symbols warning suppressed
-//
-// ***************************************************************************

Modified: branches/proto/v3/boost/test/detail/unit_test_parameters.hpp
==============================================================================
--- branches/proto/v3/boost/test/detail/unit_test_parameters.hpp (original)
+++ branches/proto/v3/boost/test/detail/unit_test_parameters.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2001-2005.
+// (C) Copyright Gennadiy Rozental 2001-2007.
 // Distributed under the 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,10 +61,4 @@
 
 #include <boost/test/detail/enable_warnings.hpp>
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// ***************************************************************************
-
 #endif // BOOST_TEST_UNIT_TEST_PARAMETERS_HPP_071894GER

Modified: branches/proto/v3/boost/test/detail/workaround.hpp
==============================================================================
--- branches/proto/v3/boost/test/detail/workaround.hpp (original)
+++ branches/proto/v3/boost/test/detail/workaround.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -59,16 +59,4 @@
 
 #include <boost/test/detail/enable_warnings.hpp>
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.2 2005/02/21 10:20:04 rogeeff
-// ignore unused vars helper
-//
-// Revision 1.1 2005/02/20 08:27:06 rogeeff
-// This a major update for Boost.Test framework. See release docs for complete list of fixes/updates
-//
-// ***************************************************************************
-
 #endif // BOOST_TEST_WORKAROUND_HPP_021005GER

Deleted: branches/proto/v3/boost/test/detail/wrap_io_saver.hpp
==============================================================================
--- branches/proto/v3/boost/test/detail/wrap_io_saver.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
+++ (empty file)
@@ -1,63 +0,0 @@
-// (C) Copyright Gennadiy Rozental 2005.
-// Distributed under the Boost Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-
-// See http://www.boost.org/libs/test for the library home page.
-//
-// File : $RCSfile$
-//
-// Version : $Revision$
-//
-// Description : wraps io savers staff to be provide workaround for classic iostreams
-// ***************************************************************************
-
-#ifndef BOOST_WRAP_IO_SAVER_HPP_011605GER
-#define BOOST_WRAP_IO_SAVER_HPP_011605GER
-
-#include <boost/test/detail/suppress_warnings.hpp>
-
-#if defined(BOOST_STANDARD_IOSTREAMS)
-#include <boost/io/ios_state.hpp>
-#endif
-
-namespace boost {
-
-namespace unit_test {
-
-#if defined(BOOST_STANDARD_IOSTREAMS)
-
-typedef ::boost::io::ios_base_all_saver io_saver_type;
-
-#else
-
-struct io_saver_type {
- explicit io_saver_type( std::ostream& ) {}
- void restore() {}
-};
-
-#endif
-
-} // namespace unit_test
-
-} // namespace boost
-
-#include <boost/test/detail/enable_warnings.hpp>
-
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.2 2005/12/14 04:59:11 rogeeff
-// *** empty log message ***
-//
-// Revision 1.1 2005/04/30 16:48:21 rogeeff
-// io saver warkaround for classic io is shared
-//
-// Revision 1.1 2005/02/20 08:27:06 rogeeff
-// This a major update for Boost.Test framework. See release docs for complete list of fixes/updates
-//
-// ***************************************************************************
-
-#endif // BOOST_WRAP_IO_SAVER_HPP_011605GER
-

Modified: branches/proto/v3/boost/test/exception_safety.hpp
==============================================================================
--- branches/proto/v3/boost/test/exception_safety.hpp (original)
+++ branches/proto/v3/boost/test/exception_safety.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Distributed under the 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 @@
 #include <boost/test/detail/config.hpp>
 
 #include <boost/test/utils/callback.hpp>
-#include <boost/test/utils/basic_cstring/basic_cstring_fwd.hpp>
+#include <boost/test/utils/basic_cstring/basic_cstring.hpp>
 
 // STL
 #include <memory>
@@ -184,25 +184,4 @@
 
 #include <boost/test/detail/enable_warnings.hpp>
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.4 2006/01/28 08:52:35 rogeeff
-// operator new overloads made inline to:
-// 1. prevent issues with export them from DLL
-// 2. release link issue fixed
-//
-// Revision 1.3 2006/01/15 11:14:38 rogeeff
-// simpl_mock -> mock_object<>::prototype()
-// operator new need to be rethinked
-//
-// Revision 1.2 2005/12/20 23:50:13 rogeeff
-// unit_test.hpp removed
-//
-// Revision 1.1 2005/12/14 05:03:46 rogeeff
-// exception safety automatic testing facilties
-//
-// ***************************************************************************
-
 #endif // BOOST_TEST_EXCEPTION_SAFETY_HPP_111705GER

Modified: branches/proto/v3/boost/test/execution_monitor.hpp
==============================================================================
--- branches/proto/v3/boost/test/execution_monitor.hpp (original)
+++ branches/proto/v3/boost/test/execution_monitor.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2001-2005.
+// (C) Copyright Gennadiy Rozental 2001-2007.
 // (C) Copyright Beman Dawes 2001.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
@@ -237,12 +237,13 @@
 class system_error {
 public:
     // Constructor
- system_error();
+ explicit system_error( char const* exp );
 
- unit_test::readonly_property<long> p_errno;
+ unit_test::readonly_property<long> p_errno;
+ unit_test::readonly_property<char const*> p_failed_exp;
 };
 
-#define BOOST_TEST_SYS_ASSERT( exp ) if( (exp) ) ; else throw ::boost::system_error()
+#define BOOST_TEST_SYS_ASSERT( exp ) if( (exp) ) ; else throw ::boost::system_error( BOOST_STRINGIZE( exp ) )
 
 } // namespace boost
 
@@ -250,35 +251,4 @@
 
 #include <boost/test/detail/enable_warnings.hpp>
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.25 2006/01/30 07:29:49 rogeeff
-// split memory leaks detection API in two to get more functions with better defined roles
-//
-// Revision 1.24 2005/12/14 05:05:58 rogeeff
-// dll support introduced
-//
-// Revision 1.23 2005/04/05 06:11:37 rogeeff
-// memory leak allocation point detection\nextra help with _WIN32_WINNT
-//
-// Revision 1.22 2005/02/20 08:27:05 rogeeff
-// This a major update for Boost.Test framework. See release docs for complete list of fixes/updates
-//
-// Revision 1.21 2005/02/01 08:59:28 rogeeff
-// supplied_log_formatters split
-// change formatters interface to simplify result interface
-//
-// Revision 1.20 2005/02/01 06:40:06 rogeeff
-// copyright update
-// old log entries removed
-// minor stilistic changes
-// depricated tools removed
-//
-// Revision 1.19 2005/01/31 05:59:18 rogeeff
-// detect_memory_leak feature added
-//
-// ***************************************************************************
-
 #endif

Modified: branches/proto/v3/boost/test/floating_point_comparison.hpp
==============================================================================
--- branches/proto/v3/boost/test/floating_point_comparison.hpp (original)
+++ branches/proto/v3/boost/test/floating_point_comparison.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2001-2005.
+// (C) Copyright Gennadiy Rozental 2001-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -256,50 +256,4 @@
 
 #include <boost/test/detail/enable_warnings.hpp>
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.30 2006/11/30 14:38:40 jhunold
-// Remove unnecessary export makro.
-//
-// Revision 1.29 2006/08/11 17:32:42 rogeeff
-// numeric_limits access guard reworked
-//
-// Revision 1.28 2006/07/28 15:01:01 rogeeff
-// guard numeric_limits access with is_specialized
-//
-// Revision 1.27 2006/05/22 17:39:43 johnmaddock
-// Fix min/max guidelines violation.
-//
-// Revision 1.26 2006/03/16 07:31:06 vladimir_prus
-// Fix compile error on MSVC due to max and min being defined as macros.
-//
-// Revision 1.25 2006/03/13 18:28:25 rogeeff
-// warnings eliminated
-//
-// Revision 1.24 2005/12/14 05:07:28 rogeeff
-// introduced an ability to test on closeness based on either percentage dirven tolerance or fraction driven one
-//
-// Revision 1.23 2005/05/29 08:54:57 rogeeff
-// allow bind usage
-//
-// Revision 1.22 2005/02/21 10:21:40 rogeeff
-// check_is_small implemented
-// check functions implemented as function objects
-//
-// Revision 1.21 2005/02/20 08:27:05 rogeeff
-// This a major update for Boost.Test framework. See release docs for complete list of fixes/updates
-//
-// Revision 1.20 2005/02/01 06:40:06 rogeeff
-// copyright update
-// old log entries removed
-// minor stilistic changes
-// depricated tools removed
-//
-// Revision 1.19 2005/01/22 19:22:12 rogeeff
-// implementation moved into headers section to eliminate dependency of included/minimal component on src directory
-//
-// ***************************************************************************
-
 #endif // BOOST_FLOATING_POINT_COMAPARISON_HPP_071894GER

Modified: branches/proto/v3/boost/test/framework.hpp
==============================================================================
--- branches/proto/v3/boost/test/framework.hpp (original)
+++ branches/proto/v3/boost/test/framework.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)

Modified: branches/proto/v3/boost/test/impl/compiler_log_formatter.ipp
==============================================================================
--- branches/proto/v3/boost/test/impl/compiler_log_formatter.ipp (original)
+++ branches/proto/v3/boost/test/impl/compiler_log_formatter.ipp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -192,26 +192,4 @@
 
 #include <boost/test/detail/enable_warnings.hpp>
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.5 2006/07/28 15:01:59 rogeeff
-// flush log stream on exit
-//
-// Revision 1.4 2005/12/14 05:26:32 rogeeff
-// report aborted test units
-//
-// Revision 1.3 2005/02/21 10:09:26 rogeeff
-// exception logging changes so that it produce a string recognizable by compiler as an error
-//
-// Revision 1.2 2005/02/20 08:27:06 rogeeff
-// This a major update for Boost.Test framework. See release docs for complete list of fixes/updates
-//
-// Revision 1.1 2005/02/01 08:59:38 rogeeff
-// supplied_log_formatters split
-// change formatters interface to simplify result interface
-//
-// ***************************************************************************
-
 #endif // BOOST_TEST_COMPILER_LOG_FORMATTER_IPP_020105GER

Modified: branches/proto/v3/boost/test/impl/cpp_main.ipp
==============================================================================
--- branches/proto/v3/boost/test/impl/cpp_main.ipp (original)
+++ branches/proto/v3/boost/test/impl/cpp_main.ipp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2001-2005.
+// (C) Copyright Gennadiy Rozental 2001-2007.
 // (C) Copyright Beman Dawes 1995-2001.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
@@ -28,15 +28,14 @@
 // STL
 #include <iostream>
 #include <cstdlib> // std::getenv
-
-#include <boost/test/detail/suppress_warnings.hpp>
+#include <cstring> // std::strerror
 
 #include <boost/test/detail/suppress_warnings.hpp>
 
 //____________________________________________________________________________//
 
 #ifdef BOOST_NO_STDC_NAMESPACE
-namespace std { using ::getenv; }
+namespace std { using ::getenv; using ::strerror; }
 #endif
 
 namespace {
@@ -89,7 +88,13 @@
         std::cout << "\n**** exception(" << exex.code() << "): " << exex.what() << std::endl;
         result = ::boost::exit_exception_failure;
     }
-
+ catch( ::boost::system_error const& ex ) {
+ std::cout << "\n**** failed to initialize execution monitor."
+ << "\n**** expression at fault: " << ex.p_failed_exp
+ << "\n**** error(" << ex.p_errno << "): " << std::strerror( ex.p_errno ) << std::endl;
+ result = ::boost::exit_exception_failure;
+ }
+
     if( result != ::boost::exit_success ) {
         std::cerr << "******** errors detected; see standard output for details ********" << std::endl;
     }
@@ -131,16 +136,4 @@
 
 #include <boost/test/detail/enable_warnings.hpp>
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.7 2006/03/19 11:45:26 rogeeff
-// main function renamed for consistancy
-//
-// Revision 1.6 2005/12/14 05:27:21 rogeeff
-// cpp_main API modified for DLL
-//
-// ***************************************************************************
-
 #endif // BOOST_TEST_CPP_MAIN_IPP_012205GER

Modified: branches/proto/v3/boost/test/impl/debug.ipp
==============================================================================
--- branches/proto/v3/boost/test/impl/debug.ipp (original)
+++ branches/proto/v3/boost/test/impl/debug.ipp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2006.
+// (C) Copyright Gennadiy Rozental 2006-2007.
 // Use, modification, and distribution are subject to the
 // Boost Software License, Version 1.0. (See accompanying file
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -316,7 +316,7 @@
     else
         ++it;
 
- ::snprintf( title_str, sizeof(title_str), "%*s %ld", dsi.binary_path.end()-it, it, dsi.pid );
+ ::snprintf( title_str, sizeof(title_str), "%*s %ld", (int)(dsi.binary_path.end()-it), it, dsi.pid );
 
     return title_str;
 }
@@ -964,11 +964,4 @@
 
 #include <boost/test/detail/enable_warnings.hpp>
 
-
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// ***************************************************************************
-
 #endif // BOOST_TEST_DEBUG_API_IPP_112006GER

Modified: branches/proto/v3/boost/test/impl/exception_safety.ipp
==============================================================================
--- branches/proto/v3/boost/test/impl/exception_safety.ipp (original)
+++ branches/proto/v3/boost/test/impl/exception_safety.ipp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Use, modification, and distribution are subject to the
 // Boost Software License, Version 1.0. (See accompanying file
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -537,35 +537,4 @@
 
 #endif // non-ancient compiler
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.7 2006/02/23 15:10:00 rogeeff
-// vc70 out
-//
-// Revision 1.6 2006/02/06 10:06:56 rogeeff
-// MSVC restored for now
-//
-// Revision 1.5 2006/01/28 08:52:35 rogeeff
-// operator new overloads made inline to:
-// 1. prevent issues with export them from DLL
-// 2. release link issue fixed
-//
-// Revision 1.4 2006/01/15 11:14:39 rogeeff
-// simpl_mock -> mock_object<>::prototype()
-// operator new need to be rethinked
-//
-// Revision 1.3 2005/12/22 15:49:32 rogeeff
-// sunpro port
-// made operator new conformant
-//
-// Revision 1.2 2005/12/16 02:33:17 rogeeff
-// portability fix
-//
-// Revision 1.1 2005/12/14 05:56:09 rogeeff
-// exception safety testing introduced
-//
-// ***************************************************************************
-
 #endif // BOOST_TEST_EXECUTION_SAFETY_IPP_112005GER

Modified: branches/proto/v3/boost/test/impl/execution_monitor.ipp
==============================================================================
--- branches/proto/v3/boost/test/impl/execution_monitor.ipp (original)
+++ branches/proto/v3/boost/test/impl/execution_monitor.ipp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2001-2005.
+// (C) Copyright Gennadiy Rozental 2001-2007.
 // (C) Copyright Beman Dawes and Ullrich Koethe 1995-2001.
 // Use, modification, and distribution are subject to the
 // Boost Software License, Version 1.0. (See accompanying file
@@ -1108,7 +1108,9 @@
     catch( std::exception const& ex )
       { detail::report_error( execution_exception::cpp_exception_error, "std::exception: %s", ex.what() ); }
     catch( system_error const& ex )
- { detail::report_error( execution_exception::cpp_exception_error, "system_error: %s", std::strerror( ex.p_errno ) ); }
+ { detail::report_error( execution_exception::cpp_exception_error, "system_error produced by: %s: %s",
+ ex.p_failed_exp.get(),
+ std::strerror( ex.p_errno ) ); }
     catch( detail::system_signal_exception const& ex )
       { ex.report(); }
     catch( execution_aborted const& )
@@ -1128,12 +1130,13 @@
 // ************** system_error ************** //
 // ************************************************************************** //
 
-system_error::system_error()
+system_error::system_error( char const* exp )
 #ifdef UNDER_CE
 : p_errno( GetLastError() )
 #else
 : p_errno( errno )
 #endif
+, p_failed_exp( exp )
 {}
 
 
@@ -1145,10 +1148,4 @@
 
 #include <boost/test/detail/enable_warnings.hpp>
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// ***************************************************************************
-
 #endif // BOOST_TEST_EXECUTION_MONITOR_IPP_012205GER

Modified: branches/proto/v3/boost/test/impl/framework.ipp
==============================================================================
--- branches/proto/v3/boost/test/impl/framework.ipp (original)
+++ branches/proto/v3/boost/test/impl/framework.ipp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)

Modified: branches/proto/v3/boost/test/impl/interaction_based.ipp
==============================================================================
--- branches/proto/v3/boost/test/impl/interaction_based.ipp (original)
+++ branches/proto/v3/boost/test/impl/interaction_based.ipp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Use, modification, and distribution are subject to the
 // Boost Software License, Version 1.0. (See accompanying file
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -91,35 +91,4 @@
 
 #endif // not ancient compiler
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.7 2006/03/19 07:27:52 rogeeff
-// streamline test setup error message
-//
-// Revision 1.6 2006/02/23 15:10:00 rogeeff
-// vc70 out
-//
-// Revision 1.5 2006/02/22 16:13:34 rogeeff
-// ifdef out for non supported compilers
-//
-// Revision 1.4 2006/01/28 08:52:35 rogeeff
-// operator new overloads made inline to:
-// 1. prevent issues with export them from DLL
-// 2. release link issue fixed
-//
-// Revision 1.3 2006/01/15 11:14:39 rogeeff
-// simpl_mock -> mock_object<>::prototype()
-// operator new need to be rethinked
-//
-// Revision 1.2 2005/12/22 15:49:32 rogeeff
-// sunpro port
-// made operator new conformant
-//
-// Revision 1.1 2005/12/14 05:56:56 rogeeff
-// Interraction based / logged expectation testing is introduced
-//
-// ***************************************************************************
-
 #endif // BOOST_TEST_INTERACTION_BASED_IPP_112105GER

Modified: branches/proto/v3/boost/test/impl/logged_expectations.ipp
==============================================================================
--- branches/proto/v3/boost/test/impl/logged_expectations.ipp (original)
+++ branches/proto/v3/boost/test/impl/logged_expectations.ipp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Use, modification, and distribution are subject to the
 // Boost Software License, ELOG_VER 1.0. (See accompanying file
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -246,29 +246,4 @@
 
 #endif // not ancient compiler
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.6 2006/02/23 15:10:00 rogeeff
-// vc70 out
-//
-// Revision 1.5 2006/02/06 10:06:56 rogeeff
-// MSVC restored for now
-//
-// Revision 1.4 2006/01/28 08:55:31 rogeeff
-// VC6.0 workaround removed
-//
-// Revision 1.3 2005/12/22 15:49:32 rogeeff
-// sunpro port
-// made operator new conformant
-//
-// Revision 1.2 2005/12/19 00:08:34 rogeeff
-// gcc port
-//
-// Revision 1.1 2005/12/14 05:56:56 rogeeff
-// Interraction based / logged expectation testing is introduced
-//
-// ***************************************************************************
-
 #endif // BOOST_TEST_LOGGED_EXPECTATIONS_IPP_120905GER

Modified: branches/proto/v3/boost/test/impl/plain_report_formatter.ipp
==============================================================================
--- branches/proto/v3/boost/test/impl/plain_report_formatter.ipp (original)
+++ branches/proto/v3/boost/test/impl/plain_report_formatter.ipp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -195,28 +195,4 @@
 
 #include <boost/test/detail/enable_warnings.hpp>
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.4 2006/01/28 08:55:52 rogeeff
-// results collection bug fixed
-//
-// Revision 1.3 2005/12/14 05:31:06 rogeeff
-// report all aborted test units
-//
-// Revision 1.2 2005/12/08 03:19:01 dgregor
-// Merged from Version_1_33_1
-//
-// Revision 1.1.2.2 2005/11/28 11:57:07 dgregor
-// Make that.... iostream
-//
-// Revision 1.1.2.1 2005/11/28 00:02:36 dgregor
-// Include ostream
-//
-// Revision 1.1 2005/02/20 08:27:07 rogeeff
-// This a major update for Boost.Test framework. See release docs for complete list of fixes/updates
-//
-// ***************************************************************************
-
 #endif // BOOST_TEST_PLAIN_REPORT_FORMATTER_IPP_020105GER

Modified: branches/proto/v3/boost/test/impl/progress_monitor.ipp
==============================================================================
--- branches/proto/v3/boost/test/impl/progress_monitor.ipp (original)
+++ branches/proto/v3/boost/test/impl/progress_monitor.ipp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -105,16 +105,4 @@
 
 #include <boost/test/detail/enable_warnings.hpp>
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.2 2005/12/14 05:52:49 rogeeff
-// *** empty log message ***
-//
-// Revision 1.1 2005/02/20 08:27:07 rogeeff
-// This a major update for Boost.Test framework. See release docs for complete list of fixes/updates
-//
-// ***************************************************************************
-
 #endif // BOOST_TEST_PROGRESS_MONITOR_IPP_020105GER

Modified: branches/proto/v3/boost/test/impl/results_collector.ipp
==============================================================================
--- branches/proto/v3/boost/test/impl/results_collector.ipp (original)
+++ branches/proto/v3/boost/test/impl/results_collector.ipp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -291,25 +291,4 @@
 
 #include <boost/test/detail/enable_warnings.hpp>
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.5 2006/02/26 15:24:00 rogeeff
-// vc65 workaround
-//
-// Revision 1.4 2006/01/28 08:55:52 rogeeff
-// results collection bug fixed
-//
-// Revision 1.3 2005/12/14 05:53:22 rogeeff
-// collect amount of aborted test cases
-//
-// Revision 1.2 2005/03/24 04:02:33 rogeeff
-// portability fixes
-//
-// Revision 1.1 2005/02/20 08:27:07 rogeeff
-// This a major update for Boost.Test framework. See release docs for complete list of fixes/updates
-//
-// ***************************************************************************
-
 #endif // BOOST_TEST_RESULTS_COLLECTOR_IPP_021105GER

Modified: branches/proto/v3/boost/test/impl/results_reporter.ipp
==============================================================================
--- branches/proto/v3/boost/test/impl/results_reporter.ipp (original)
+++ branches/proto/v3/boost/test/impl/results_reporter.ipp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -195,27 +195,4 @@
 
 #include <boost/test/detail/enable_warnings.hpp>
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.5 2005/12/14 05:57:32 rogeeff
-// *** empty log message ***
-//
-// Revision 1.4 2005/04/30 16:48:51 rogeeff
-// io saver warkaround for classic io is shared
-//
-// Revision 1.3 2005/04/29 06:27:45 rogeeff
-// bug fix for manipulator nandling
-// bug fix for invalid output stream
-// bug fix for set_format function implementation
-//
-// Revision 1.2 2005/02/21 10:12:20 rogeeff
-// Support for random order of test cases implemented
-//
-// Revision 1.1 2005/02/20 08:27:07 rogeeff
-// This a major update for Boost.Test framework. See release docs for complete list of fixes/updates
-//
-// ***************************************************************************
-
 #endif // BOOST_TEST_RESULTS_REPORTER_IPP_020105GER

Modified: branches/proto/v3/boost/test/impl/test_main.ipp
==============================================================================
--- branches/proto/v3/boost/test/impl/test_main.ipp (original)
+++ branches/proto/v3/boost/test/impl/test_main.ipp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2001-2005.
+// (C) Copyright Gennadiy Rozental 2001-2007.
 // (C) Copyright Beman Dawes 1995-2001.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
@@ -65,19 +65,4 @@
 
 #include <boost/test/detail/enable_warnings.hpp>
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.8 2005/12/20 23:50:13 rogeeff
-// unit_test.hpp removed
-//
-// Revision 1.7 2005/12/14 05:54:17 rogeeff
-// change existent init API usage
-//
-// Revision 1.6 2005/02/20 08:27:07 rogeeff
-// This a major update for Boost.Test framework. See release docs for complete list of fixes/updates
-//
-// ***************************************************************************
-
 #endif // BOOST_TEST_TEST_MAIN_IPP_012205GER

Modified: branches/proto/v3/boost/test/impl/test_tools.ipp
==============================================================================
--- branches/proto/v3/boost/test/impl/test_tools.ipp (original)
+++ branches/proto/v3/boost/test/impl/test_tools.ipp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)

Modified: branches/proto/v3/boost/test/impl/unit_test_log.ipp
==============================================================================
--- branches/proto/v3/boost/test/impl/unit_test_log.ipp (original)
+++ branches/proto/v3/boost/test/impl/unit_test_log.ipp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -407,31 +407,4 @@
 
 #include <boost/test/detail/enable_warnings.hpp>
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.12 2006/07/28 15:03:13 rogeeff
-// flush log strema on exit
-//
-// Revision 1.11 2005/12/14 05:34:21 rogeeff
-// log API simplified
-//
-// Revision 1.10 2005/04/30 16:48:51 rogeeff
-// io saver warkaround for classic io is shared
-//
-// Revision 1.9 2005/04/29 06:28:35 rogeeff
-// bug fix for manipulator handling
-//
-// Revision 1.8 2005/04/12 06:50:46 rogeeff
-// assign_to -> assign_op
-//
-// Revision 1.7 2005/03/22 07:06:58 rogeeff
-// assign_to made free function
-//
-// Revision 1.6 2005/02/20 08:27:07 rogeeff
-// This a major update for Boost.Test framework. See release docs for complete list of fixes/updates
-//
-// ***************************************************************************
-
 #endif // BOOST_TEST_UNIT_TEST_LOG_IPP_012205GER

Modified: branches/proto/v3/boost/test/impl/unit_test_main.ipp
==============================================================================
--- branches/proto/v3/boost/test/impl/unit_test_main.ipp (original)
+++ branches/proto/v3/boost/test/impl/unit_test_main.ipp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2001-2005.
+// (C) Copyright Gennadiy Rozental 2001-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -232,23 +232,4 @@
 
 #include <boost/test/detail/enable_warnings.hpp>
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.9 2006/03/19 11:45:26 rogeeff
-// main function renamed for consistancy
-//
-// Revision 1.8 2006/03/19 07:27:52 rogeeff
-// streamline test setup error message
-//
-// Revision 1.7 2005/12/14 05:35:57 rogeeff
-// DLL support implemented
-// Alternative init API introduced
-//
-// Revision 1.6 2005/02/20 08:27:07 rogeeff
-// This a major update for Boost.Test framework. See release docs for complete list of fixes/updates
-//
-// ***************************************************************************
-
 #endif // BOOST_TEST_UNIT_TEST_MAIN_IPP_012205GER

Modified: branches/proto/v3/boost/test/impl/unit_test_monitor.ipp
==============================================================================
--- branches/proto/v3/boost/test/impl/unit_test_monitor.ipp (original)
+++ branches/proto/v3/boost/test/impl/unit_test_monitor.ipp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -98,40 +98,4 @@
 
 #include <boost/test/detail/enable_warnings.hpp>
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.4 2005/12/14 05:37:52 rogeeff
-// zero_return_wrapper made to template
-// comply to test_unit_aborted() modification
-//
-// Revision 1.3 2005/02/20 08:27:07 rogeeff
-// This a major update for Boost.Test framework. See release docs for complete list of fixes/updates
-//
-// Revision 1.2 2005/02/01 06:40:07 rogeeff
-// copyright update
-// old log entries removed
-// minor stilistic changes
-// depricated tools removed
-//
-// Revision 1.1 2005/01/22 19:22:13 rogeeff
-// implementation moved into headers section to eliminate dependency of included/minimal component on src directory
-//
-// Revision 1.17 2005/01/19 16:34:07 vawjr
-// Changed the \r\r\n back to \r\n on windows so we don't get errors when compiling
-// on VC++8.0. I don't know why Microsoft thinks it's a good idea to call this an error,
-// but they do. I also don't know why people insist on checking out files on Windows and
-// copying them to a unix system to check them in (which will cause exactly this problem)
-//
-// Revision 1.16 2005/01/18 08:30:08 rogeeff
-// unit_test_log rework:
-// eliminated need for ::instance()
-// eliminated need for << end and ...END macro
-// straitend interface between log and formatters
-// change compiler like formatter name
-// minimized unit_test_log interface and reworked to use explicit calls
-//
-// ***************************************************************************
-
 #endif // BOOST_TEST_UNIT_TEST_MONITOR_IPP_012205GER

Modified: branches/proto/v3/boost/test/impl/unit_test_parameters.ipp
==============================================================================
--- branches/proto/v3/boost/test/impl/unit_test_parameters.ipp (original)
+++ branches/proto/v3/boost/test/impl/unit_test_parameters.ipp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2001-2005.
+// (C) Copyright Gennadiy Rozental 2001-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -384,11 +384,4 @@
 
 #include <boost/test/detail/enable_warnings.hpp>
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-//
-// ***************************************************************************
-
 #endif // BOOST_TEST_UNIT_TEST_PARAMETERS_IPP_012205GER

Modified: branches/proto/v3/boost/test/impl/unit_test_suite.ipp
==============================================================================
--- branches/proto/v3/boost/test/impl/unit_test_suite.ipp (original)
+++ branches/proto/v3/boost/test/impl/unit_test_suite.ipp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -336,10 +336,4 @@
 
 #include <boost/test/detail/enable_warnings.hpp>
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// ***************************************************************************
-
 #endif // BOOST_TEST_UNIT_TEST_SUITE_IPP_012205GER

Modified: branches/proto/v3/boost/test/impl/xml_log_formatter.ipp
==============================================================================
--- branches/proto/v3/boost/test/impl/xml_log_formatter.ipp (original)
+++ branches/proto/v3/boost/test/impl/xml_log_formatter.ipp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -170,26 +170,4 @@
 
 #include <boost/test/detail/enable_warnings.hpp>
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.5 2005/12/14 05:39:43 rogeeff
-// *** empty log message ***
-//
-// Revision 1.4 2005/04/30 16:47:14 rogeeff
-// warning supressed
-//
-// Revision 1.3 2005/04/29 06:29:35 rogeeff
-// bug fix for incorect XML output
-//
-// Revision 1.2 2005/02/20 08:27:07 rogeeff
-// This a major update for Boost.Test framework. See release docs for complete list of fixes/updates
-//
-// Revision 1.1 2005/02/01 08:59:38 rogeeff
-// supplied_log_formatters split
-// change formatters interface to simplify result interface
-//
-// ***************************************************************************
-
 #endif // BOOST_TEST_XML_LOG_FORMATTER_IPP_020105GER

Modified: branches/proto/v3/boost/test/impl/xml_report_formatter.ipp
==============================================================================
--- branches/proto/v3/boost/test/impl/xml_report_formatter.ipp (original)
+++ branches/proto/v3/boost/test/impl/xml_report_formatter.ipp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -112,19 +112,4 @@
 
 #include <boost/test/detail/enable_warnings.hpp>
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.3 2005/12/14 05:39:43 rogeeff
-// *** empty log message ***
-//
-// Revision 1.2 2005/04/29 06:30:07 rogeeff
-// bug fix for incorect XML output
-//
-// Revision 1.1 2005/02/20 08:27:07 rogeeff
-// This a major update for Boost.Test framework. See release docs for complete list of fixes/updates
-//
-// ***************************************************************************
-
 #endif // BOOST_TEST_XML_REPORT_FORMATTER_IPP_020105GER

Modified: branches/proto/v3/boost/test/included/prg_exec_monitor.hpp
==============================================================================
--- branches/proto/v3/boost/test/included/prg_exec_monitor.hpp (original)
+++ branches/proto/v3/boost/test/included/prg_exec_monitor.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2001-2005.
+// (C) Copyright Gennadiy Rozental 2001-2007.
 // Distributed under the 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,22 +22,4 @@
 #define BOOST_TEST_INCLUDED
 #include <boost/test/prg_exec_monitor.hpp>
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.10 2006/02/06 10:01:55 rogeeff
-// m,ake name similar to the primary header name
-//
-// Revision 1.9 2005/02/01 06:40:07 rogeeff
-// copyright update
-// old log entries removed
-// minor stilistic changes
-// depricated tools removed
-//
-// Revision 1.8 2005/01/22 19:22:13 rogeeff
-// implementation moved into headers section to eliminate dependency of included/minimal component on src directory
-//
-// ***************************************************************************
-
 #endif // BOOST_INCLUDED_PRG_EXEC_MONITOR_HPP_071894GER

Modified: branches/proto/v3/boost/test/included/test_exec_monitor.hpp
==============================================================================
--- branches/proto/v3/boost/test/included/test_exec_monitor.hpp (original)
+++ branches/proto/v3/boost/test/included/test_exec_monitor.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2001-2005.
+// (C) Copyright Gennadiy Rozental 2001-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -36,32 +36,4 @@
 #define BOOST_TEST_INCLUDED
 #include <boost/test/test_exec_monitor.hpp>
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.15 2006/02/06 10:01:55 rogeeff
-// m,ake name similar to the primary header name
-//
-// Revision 1.14 2006/02/01 07:57:49 rogeeff
-// included components entry points
-//
-// Revision 1.13 2005/02/20 08:27:08 rogeeff
-// This a major update for Boost.Test framework. See release docs for complete list of fixes/updates
-//
-// Revision 1.12 2005/02/01 08:59:38 rogeeff
-// supplied_log_formatters split
-// change formatters interface to simplify result interface
-//
-// Revision 1.11 2005/02/01 06:40:07 rogeeff
-// copyright update
-// old log entries removed
-// minor stilistic changes
-// depricated tools removed
-//
-// Revision 1.10 2005/01/22 19:22:13 rogeeff
-// implementation moved into headers section to eliminate dependency of included/minimal component on src directory
-//
-// ***************************************************************************
-
 #endif // BOOST_INCLUDED_TEST_EXEC_MONITOR_HPP_071894GER

Modified: branches/proto/v3/boost/test/included/unit_test.hpp
==============================================================================
--- branches/proto/v3/boost/test/included/unit_test.hpp (original)
+++ branches/proto/v3/boost/test/included/unit_test.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2001-2005.
+// (C) Copyright Gennadiy Rozental 2001-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -38,32 +38,4 @@
 #define BOOST_TEST_INCLUDED
 #include <boost/test/unit_test.hpp>
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.1 2006/02/06 10:02:52 rogeeff
-// make the name similar to the primary header name
-//
-// Revision 1.14 2006/02/01 07:57:50 rogeeff
-// included components entry points
-//
-// Revision 1.13 2005/02/20 08:27:08 rogeeff
-// This a major update for Boost.Test framework. See release docs for complete list of fixes/updates
-//
-// Revision 1.12 2005/02/01 08:59:38 rogeeff
-// supplied_log_formatters split
-// change formatters interface to simplify result interface
-//
-// Revision 1.11 2005/02/01 06:40:07 rogeeff
-// copyright update
-// old log entries removed
-// minor stilistic changes
-// depricated tools removed
-//
-// Revision 1.10 2005/01/22 19:22:13 rogeeff
-// implementation moved into headers section to eliminate dependency of included/minimal component on src directory
-//
-// ***************************************************************************
-
 #endif // BOOST_INCLUDED_UNIT_TEST_FRAMEWORK_HPP_071894GER

Modified: branches/proto/v3/boost/test/interaction_based.hpp
==============================================================================
--- branches/proto/v3/boost/test/interaction_based.hpp (original)
+++ branches/proto/v3/boost/test/interaction_based.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -256,22 +256,4 @@
 
 #include <boost/test/detail/enable_warnings.hpp>
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.3 2006/01/28 08:52:35 rogeeff
-// operator new overloads made inline to:
-// 1. prevent issues with export them from DLL
-// 2. release link issue fixed
-//
-// Revision 1.2 2006/01/15 11:14:38 rogeeff
-// simpl_mock -> mock_object<>::prototype()
-// operator new need to be rethinked
-//
-// Revision 1.1 2005/12/14 05:09:21 rogeeff
-// interraction based testing is introdused
-//
-// ***************************************************************************
-
 #endif // BOOST_TEST_INTERACTION_BASED_HPP_112105GER

Modified: branches/proto/v3/boost/test/logged_expectations.hpp
==============================================================================
--- branches/proto/v3/boost/test/logged_expectations.hpp (original)
+++ branches/proto/v3/boost/test/logged_expectations.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -71,16 +71,4 @@
 
 #include <boost/test/detail/enable_warnings.hpp>
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.2 2005/12/20 23:50:13 rogeeff
-// unit_test.hpp removed
-//
-// Revision 1.1 2005/12/14 05:09:21 rogeeff
-// interraction based testing is introdused
-//
-// ***************************************************************************
-
 #endif // BOOST_TEST_LOGGED_EXPECTATIONS_HPP_120905GER

Modified: branches/proto/v3/boost/test/minimal.hpp
==============================================================================
--- branches/proto/v3/boost/test/minimal.hpp (original)
+++ branches/proto/v3/boost/test/minimal.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2002-2005.
+// (C) Copyright Gennadiy Rozental 2002-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -140,29 +140,4 @@
 
 #include <boost/test/detail/enable_warnings.hpp>
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.19 2005/02/20 08:27:06 rogeeff
-// This a major update for Boost.Test framework. See release docs for complete list of fixes/updates
-//
-// Revision 1.18 2005/02/01 06:40:06 rogeeff
-// copyright update
-// old log entries removed
-// minor stilistic changes
-// depricated tools removed
-//
-// Revision 1.17 2005/01/31 07:50:05 rogeeff
-// cdecl portability fix
-//
-// Revision 1.16 2005/01/31 06:01:27 rogeeff
-// BOOST_TEST_CALL_DECL correctness fixes
-//
-// Revision 1.15 2005/01/22 19:22:12 rogeeff
-// implementation moved into headers section to eliminate dependency of included/minimal component on src directory
-//
-// ***************************************************************************
-
-
 #endif // BOOST_TEST_MINIMAL_HPP_071894GER

Modified: branches/proto/v3/boost/test/mock_object.hpp
==============================================================================
--- branches/proto/v3/boost/test/mock_object.hpp (original)
+++ branches/proto/v3/boost/test/mock_object.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -325,20 +325,4 @@
 
 #include <boost/test/detail/enable_warnings.hpp>
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.3 2006/03/19 07:27:52 rogeeff
-// streamline test setup error message
-//
-// Revision 1.2 2006/01/15 11:14:39 rogeeff
-// simpl_mock -> mock_object<>::prototype()
-// operator new need to be rethinked
-//
-// Revision 1.1 2005/12/14 05:09:21 rogeeff
-// interraction based testing is introdused
-//
-// ***************************************************************************
-
 #endif // BOOST_TEST_MOCK_OBJECT_HPP_112205GER

Modified: branches/proto/v3/boost/test/output/compiler_log_formatter.hpp
==============================================================================
--- branches/proto/v3/boost/test/output/compiler_log_formatter.hpp (original)
+++ branches/proto/v3/boost/test/output/compiler_log_formatter.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -64,20 +64,4 @@
 
 #include <boost/test/detail/enable_warnings.hpp>
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.3 2006/11/13 20:03:48 jhunold
-// Added missing export declarations.
-//
-// Revision 1.2 2005/02/20 08:27:08 rogeeff
-// This a major update for Boost.Test framework. See release docs for complete list of fixes/updates
-//
-// Revision 1.1 2005/02/01 08:59:39 rogeeff
-// supplied_log_formatters split
-// change formatters interface to simplify result interface
-//
-// ***************************************************************************
-
 #endif // BOOST_TEST_COMPILER_LOG_FORMATTER_HPP_020105GER

Modified: branches/proto/v3/boost/test/output/plain_report_formatter.hpp
==============================================================================
--- branches/proto/v3/boost/test/output/plain_report_formatter.hpp (original)
+++ branches/proto/v3/boost/test/output/plain_report_formatter.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -59,13 +59,4 @@
 
 #include <boost/test/detail/enable_warnings.hpp>
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.1 2005/02/20 08:27:08 rogeeff
-// This a major update for Boost.Test framework. See release docs for complete list of fixes/updates
-//
-// ***************************************************************************
-
 #endif // BOOST_TEST_PLAIN_REPORT_FORMATTER_HPP_020105GER

Modified: branches/proto/v3/boost/test/output/xml_log_formatter.hpp
==============================================================================
--- branches/proto/v3/boost/test/output/xml_log_formatter.hpp (original)
+++ branches/proto/v3/boost/test/output/xml_log_formatter.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -68,17 +68,4 @@
 
 #include <boost/test/detail/enable_warnings.hpp>
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.2 2005/02/20 08:27:08 rogeeff
-// This a major update for Boost.Test framework. See release docs for complete list of fixes/updates
-//
-// Revision 1.1 2005/02/01 08:59:39 rogeeff
-// supplied_log_formatters split
-// change formatters interface to simplify result interface
-//
-// ***************************************************************************
-
 #endif // BOOST_TEST_XML_LOG_FORMATTER_020105GER

Modified: branches/proto/v3/boost/test/output/xml_report_formatter.hpp
==============================================================================
--- branches/proto/v3/boost/test/output/xml_report_formatter.hpp (original)
+++ branches/proto/v3/boost/test/output/xml_report_formatter.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -55,13 +55,4 @@
 
 #include <boost/test/detail/enable_warnings.hpp>
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.1 2005/02/20 08:27:08 rogeeff
-// This a major update for Boost.Test framework. See release docs for complete list of fixes/updates
-//
-// ***************************************************************************
-
 #endif // BOOST_TEST_XML_REPORT_FORMATTER_HPP_020105GER

Modified: branches/proto/v3/boost/test/output_test_stream.hpp
==============================================================================
--- branches/proto/v3/boost/test/output_test_stream.hpp (original)
+++ branches/proto/v3/boost/test/output_test_stream.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2001-2005.
+// (C) Copyright Gennadiy Rozental 2001-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -75,29 +75,4 @@
 
 #include <boost/test/detail/enable_warnings.hpp>
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.5 2005/12/14 05:10:34 rogeeff
-// dll support introduced
-// introduced an ability to match agains binary openned file
-//
-// Revision 1.4 2005/03/23 21:02:15 rogeeff
-// Sunpro CC 5.3 fixes
-//
-// Revision 1.3 2005/02/20 08:27:06 rogeeff
-// This a major update for Boost.Test framework. See release docs for complete list of fixes/updates
-//
-// Revision 1.2 2005/02/01 06:40:06 rogeeff
-// copyright update
-// old log entries removed
-// minor stilistic changes
-// depricated tools removed
-//
-// Revision 1.1 2005/01/30 03:25:24 rogeeff
-// output_test_stream moved into separate file
-//
-// ***************************************************************************
-
 #endif // BOOST_TEST_OUTPUT_TEST_STREAM_HPP_012705GER

Modified: branches/proto/v3/boost/test/parameterized_test.hpp
==============================================================================
--- branches/proto/v3/boost/test/parameterized_test.hpp (original)
+++ branches/proto/v3/boost/test/parameterized_test.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2001-2005.
+// (C) Copyright Gennadiy Rozental 2001-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -177,32 +177,5 @@
 
 #include <boost/test/detail/enable_warnings.hpp>
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.7 2006/01/28 08:57:02 rogeeff
-// VC6.0 workaround removed
-//
-// Revision 1.6 2006/01/28 07:10:20 rogeeff
-// tm->test_method
-//
-// Revision 1.5 2005/12/14 05:16:49 rogeeff
-// dll support introduced
-//
-// Revision 1.4 2005/05/02 06:00:10 rogeeff
-// restore a parameterized user case method based testing
-//
-// Revision 1.3 2005/03/21 15:32:31 rogeeff
-// check reworked
-//
-// Revision 1.2 2005/02/21 10:25:04 rogeeff
-// remove const during ParamType deduction
-//
-// Revision 1.1 2005/02/20 08:27:06 rogeeff
-// This a major update for Boost.Test framework. See release docs for complete list of fixes/updates
-//
-// ***************************************************************************
-
 #endif // BOOST_TEST_PARAMETERIZED_TEST_HPP_021102GER
 

Modified: branches/proto/v3/boost/test/predicate_result.hpp
==============================================================================
--- branches/proto/v3/boost/test/predicate_result.hpp (original)
+++ branches/proto/v3/boost/test/predicate_result.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2001-2005.
+// (C) Copyright Gennadiy Rozental 2001-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -80,34 +80,4 @@
 
 #include <boost/test/detail/enable_warnings.hpp>
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.7 2005/12/14 05:16:49 rogeeff
-// dll support introduced
-//
-// Revision 1.6 2005/03/23 21:02:17 rogeeff
-// Sunpro CC 5.3 fixes
-//
-// Revision 1.5 2005/02/20 08:27:06 rogeeff
-// This a major update for Boost.Test framework. See release docs for complete list of fixes/updates
-//
-// Revision 1.4 2005/02/03 20:39:12 rogeeff
-// m_message zero init for sunpro
-//
-// Revision 1.3 2005/02/01 06:40:06 rogeeff
-// copyright update
-// old log entries removed
-// minor stilistic changes
-// depricated tools removed
-//
-// Revision 1.2 2005/01/31 20:07:19 rogeeff
-// Sunpro CC 5.3 workarounds
-//
-// Revision 1.1 2005/01/30 03:24:51 rogeeff
-// extended_predicate_result renamed ot predicate_result and moved into separate file
-//
-// ***************************************************************************
-
 #endif // BOOST_TEST_PREDICATE_RESULT_HPP_012705GER

Modified: branches/proto/v3/boost/test/prg_exec_monitor.hpp
==============================================================================
--- branches/proto/v3/boost/test/prg_exec_monitor.hpp (original)
+++ branches/proto/v3/boost/test/prg_exec_monitor.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2001-2005.
+// (C) Copyright Gennadiy Rozental 2001-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -65,19 +65,4 @@
 
 #endif // BOOST_TEST_DYN_LINK && !BOOST_TEST_NO_MAIN
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.3 2006/03/19 11:45:26 rogeeff
-// main function renamed for consistancy
-//
-// Revision 1.2 2006/02/07 16:15:20 rogeeff
-// BOOST_TEST_INCLUDED guard were missing
-//
-// Revision 1.1 2005/12/14 05:42:08 rogeeff
-// components primary headers
-//
-// ***************************************************************************
-
 #endif // BOOST_PRG_EXEC_MONITOR_HPP_071894GER

Modified: branches/proto/v3/boost/test/progress_monitor.hpp
==============================================================================
--- branches/proto/v3/boost/test/progress_monitor.hpp (original)
+++ branches/proto/v3/boost/test/progress_monitor.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -66,23 +66,5 @@
 
 #include <boost/test/detail/enable_warnings.hpp>
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.4 2006/02/22 16:22:37 rogeeff
-// eliminate warning
-//
-// Revision 1.3 2005/12/14 05:11:07 rogeeff
-// dll support introduced
-//
-// Revision 1.2 2005/06/24 04:09:34 rogeeff
-// added missing iosfwd
-//
-// Revision 1.1 2005/02/20 08:27:06 rogeeff
-// This a major update for Boost.Test framework. See release docs for complete list of fixes/updates
-//
-// ***************************************************************************
-
 #endif // BOOST_TEST_PROGRESS_MONITOR_HPP_020105GER
 

Modified: branches/proto/v3/boost/test/results_collector.hpp
==============================================================================
--- branches/proto/v3/boost/test/results_collector.hpp (original)
+++ branches/proto/v3/boost/test/results_collector.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2001-2005.
+// (C) Copyright Gennadiy Rozental 2001-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -108,33 +108,5 @@
 
 #include <boost/test/detail/enable_warnings.hpp>
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.2 2005/12/14 05:12:24 rogeeff
-// dll support introduced
-// amount of aborted test cases in now computed. If test case is aborted - the whole
-// test subtree is marked as aborted
-//
-// Revision 1.1 2005/02/20 08:27:06 rogeeff
-// This a major update for Boost.Test framework. See release docs for complete list of fixes/updates
-//
-// Revision 1.25 2005/02/01 08:59:29 rogeeff
-// supplied_log_formatters split
-// change formatters interface to simplify result interface
-//
-// Revision 1.24 2005/02/01 06:40:06 rogeeff
-// copyright update
-// old log entries removed
-// minor stilistic changes
-// depricated tools removed
-//
-// Revision 1.23 2005/01/30 03:23:06 rogeeff
-// result_tracker class removed
-// counter type renamed
-//
-// ***************************************************************************
-
 #endif // BOOST_TEST_RESULTS_COLLECTOR_HPP_071894GER
 

Modified: branches/proto/v3/boost/test/results_reporter.hpp
==============================================================================
--- branches/proto/v3/boost/test/results_reporter.hpp (original)
+++ branches/proto/v3/boost/test/results_reporter.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2001-2005.
+// (C) Copyright Gennadiy Rozental 2001-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -84,17 +84,5 @@
 
 #include <boost/test/detail/enable_warnings.hpp>
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.2 2005/12/14 05:13:18 rogeeff
-// dll support introduced
-//
-// Revision 1.1 2005/02/20 08:27:06 rogeeff
-// This a major update for Boost.Test framework. See release docs for complete list of fixes/updates
-//
-// ***************************************************************************
-
 #endif // BOOST_TEST_RESULTS_REPORTER_HPP_021205GER
 

Modified: branches/proto/v3/boost/test/test_case_template.hpp
==============================================================================
--- branches/proto/v3/boost/test/test_case_template.hpp (original)
+++ branches/proto/v3/boost/test/test_case_template.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2003-2005.
+// (C) Copyright Gennadiy Rozental 2003-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -150,35 +150,5 @@
 
 #include <boost/test/detail/enable_warnings.hpp>
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.15 2005/04/17 15:50:37 rogeeff
-// portability fixes
-//
-// Revision 1.14 2005/04/13 04:35:18 rogeeff
-// forgot zero
-//
-// Revision 1.13 2005/04/12 06:50:46 rogeeff
-// assign_to -> assign_op
-//
-// Revision 1.12 2005/03/22 06:58:47 rogeeff
-// assign_to made free function
-//
-// Revision 1.11 2005/02/20 08:27:06 rogeeff
-// This a major update for Boost.Test framework. See release docs for complete list of fixes/updates
-//
-// Revision 1.10 2005/02/01 06:40:06 rogeeff
-// copyright update
-// old log entries removed
-// minor stilistic changes
-// depricated tools removed
-//
-// Revision 1.9 2005/01/30 03:20:38 rogeeff
-// use BOOST_JOIN and BOOST_TEST_STRINGIZE
-//
-// ***************************************************************************
-
 #endif // BOOST_TEST_TEST_CASE_TEMPLATE_HPP_071894GER
 

Modified: branches/proto/v3/boost/test/test_exec_monitor.hpp
==============================================================================
--- branches/proto/v3/boost/test/test_exec_monitor.hpp (original)
+++ branches/proto/v3/boost/test/test_exec_monitor.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2001-2005.
+// (C) Copyright Gennadiy Rozental 2001-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -33,19 +33,4 @@
 
 #endif // auto-linking disabled
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.3 2006/03/19 11:45:26 rogeeff
-// main function renamed for consistancy
-//
-// Revision 1.2 2006/02/07 16:15:20 rogeeff
-// BOOST_TEST_INCLUDED guard were missing
-//
-// Revision 1.1 2005/12/14 05:42:08 rogeeff
-// components primary headers
-//
-// ***************************************************************************
-
 #endif // BOOST_TEST_EXEC_MONITOR_HPP_071894GER

Modified: branches/proto/v3/boost/test/test_observer.hpp
==============================================================================
--- branches/proto/v3/boost/test/test_observer.hpp (original)
+++ branches/proto/v3/boost/test/test_observer.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Distributed under the 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,22 +61,5 @@
 
 #include <boost/test/detail/enable_warnings.hpp>
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.3 2006/03/13 18:28:26 rogeeff
-// warnings eliminated
-//
-// Revision 1.2 2005/12/14 05:15:34 rogeeff
-// dll support introduced
-// priority interface added
-// provide default implementation for interface function
-//
-// Revision 1.1 2005/02/20 08:27:06 rogeeff
-// This a major update for Boost.Test framework. See release docs for complete list of fixes/updates
-//
-// ***************************************************************************
-
 #endif // BOOST_TEST_TEST_OBSERVER_HPP_021005GER
 

Modified: branches/proto/v3/boost/test/test_tools.hpp
==============================================================================
--- branches/proto/v3/boost/test/test_tools.hpp (original)
+++ branches/proto/v3/boost/test/test_tools.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2001-2005.
+// (C) Copyright Gennadiy Rozental 2001-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -689,11 +689,4 @@
 
 #include <boost/test/detail/enable_warnings.hpp>
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-//
-// ***************************************************************************
-
 #endif // BOOST_TEST_TEST_TOOLS_HPP_012705GER

Modified: branches/proto/v3/boost/test/unit_test.hpp
==============================================================================
--- branches/proto/v3/boost/test/unit_test.hpp (original)
+++ branches/proto/v3/boost/test/unit_test.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2001-2005.
+// (C) Copyright Gennadiy Rozental 2001-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -63,32 +63,4 @@
 
 #endif // BOOST_TEST_DYN_LINK && BOOST_TEST_MAIN && !BOOST_TEST_NO_MAIN
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.19 2006/03/19 11:45:26 rogeeff
-// main function renamed for consistancy
-//
-// Revision 1.18 2006/02/07 16:15:20 rogeeff
-// BOOST_TEST_INCLUDED guard were missing
-//
-// Revision 1.17 2006/02/06 10:04:55 rogeeff
-// BOOST_TEST_MODULE - master test suite name
-//
-// Revision 1.16 2005/12/14 05:21:36 rogeeff
-// dll support introduced
-// auto linking support introduced
-//
-// Revision 1.15 2005/02/20 08:27:06 rogeeff
-// This a major update for Boost.Test framework. See release docs for complete list of fixes/updates
-//
-// Revision 1.14 2005/02/01 06:40:06 rogeeff
-// copyright update
-// old log entries removed
-// minor stilistic changes
-// depricated tools removed
-//
-// ***************************************************************************
-
 #endif // BOOST_TEST_UNIT_TEST_HPP_071894GER

Modified: branches/proto/v3/boost/test/unit_test_log.hpp
==============================================================================
--- branches/proto/v3/boost/test/unit_test_log.hpp (original)
+++ branches/proto/v3/boost/test/unit_test_log.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2001-2005.
+// (C) Copyright Gennadiy Rozental 2001-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -168,46 +168,5 @@
 
 #include <boost/test/detail/enable_warnings.hpp>
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.32 2006/01/28 08:57:02 rogeeff
-// VC6.0 workaround removed
-//
-// Revision 1.31 2005/12/14 05:23:21 rogeeff
-// dll support introduced
-// Minor interface simplifications
-// BOOST_TEST_MESSAGE and BOOST_TEST_CHECKPOINT moved into log realm
-// BOOST_TEST_PASSPOINT is introduced
-//
-// Revision 1.30 2005/02/20 08:27:06 rogeeff
-// This a major update for Boost.Test framework. See release docs for complete list of fixes/updates
-//
-// Revision 1.29 2005/02/02 12:08:14 rogeeff
-// namespace log added for log manipulators
-//
-// Revision 1.28 2005/02/01 06:40:06 rogeeff
-// copyright update
-// old log entries removed
-// minor stilistic changes
-// depricated tools removed
-//
-// Revision 1.27 2005/01/30 03:26:29 rogeeff
-// return an ability for explicit end()
-//
-// Revision 1.26 2005/01/21 07:30:24 rogeeff
-// to log testing time log formatter interfaces changed
-//
-// Revision 1.25 2005/01/18 08:26:12 rogeeff
-// unit_test_log rework:
-// eliminated need for ::instance()
-// eliminated need for << end and ...END macro
-// straitend interface between log and formatters
-// change compiler like formatter name
-// minimized unit_test_log interface and reworked to use explicit calls
-//
-// ***************************************************************************
-
 #endif // BOOST_TEST_UNIT_TEST_LOG_HPP_071894GER
 

Modified: branches/proto/v3/boost/test/unit_test_log_formatter.hpp
==============================================================================
--- branches/proto/v3/boost/test/unit_test_log_formatter.hpp (original)
+++ branches/proto/v3/boost/test/unit_test_log_formatter.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2003-2005.
+// (C) Copyright Gennadiy Rozental 2003-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -111,42 +111,5 @@
 
 #include <boost/test/detail/enable_warnings.hpp>
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.14 2005/12/14 05:52:16 rogeeff
-// log API simplified
-//
-// Revision 1.13 2005/02/20 08:27:06 rogeeff
-// This a major update for Boost.Test framework. See release docs for complete list of fixes/updates
-//
-// Revision 1.12 2005/02/01 08:59:28 rogeeff
-// supplied_log_formatters split
-// change formatters interface to simplify result interface
-//
-// Revision 1.11 2005/02/01 06:40:06 rogeeff
-// copyright update
-// old log entries removed
-// minor stilistic changes
-// depricated tools removed
-//
-// Revision 1.10 2005/01/30 03:23:58 rogeeff
-// counter type renamed
-// log interface slightly shortened
-//
-// Revision 1.9 2005/01/21 07:30:24 rogeeff
-// to log testing time log formatter interfaces changed
-//
-// Revision 1.8 2005/01/18 08:26:12 rogeeff
-// unit_test_log rework:
-// eliminated need for ::instance()
-// eliminated need for << end and ...END macro
-// straitend interface between log and formatters
-// change compiler like formatter name
-// minimized unit_test_log interface and reworked to use explicit calls
-//
-// ***************************************************************************
-
 #endif // BOOST_TEST_UNIT_TEST_LOG_FORMATTER_HPP_071894GER
 

Modified: branches/proto/v3/boost/test/unit_test_monitor.hpp
==============================================================================
--- branches/proto/v3/boost/test/unit_test_monitor.hpp (original)
+++ branches/proto/v3/boost/test/unit_test_monitor.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2001-2005.
+// (C) Copyright Gennadiy Rozental 2001-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -66,16 +66,4 @@
 
 #include <boost/test/detail/enable_warnings.hpp>
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.2 2005/12/14 05:55:35 rogeeff
-// dll support introduced
-//
-// Revision 1.1 2005/02/20 08:27:06 rogeeff
-// This a major update for Boost.Test framework. See release docs for complete list of fixes/updates
-//
-// ***************************************************************************
-
 #endif // BOOST_TEST_UNIT_TEST_MONITOR_HPP_020905GER

Modified: branches/proto/v3/boost/test/unit_test_suite.hpp
==============================================================================
--- branches/proto/v3/boost/test/unit_test_suite.hpp (original)
+++ branches/proto/v3/boost/test/unit_test_suite.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2001-2005.
+// (C) Copyright Gennadiy Rozental 2001-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)

Modified: branches/proto/v3/boost/test/unit_test_suite_impl.hpp
==============================================================================
--- branches/proto/v3/boost/test/unit_test_suite_impl.hpp (original)
+++ branches/proto/v3/boost/test/unit_test_suite_impl.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2001-2005.
+// (C) Copyright Gennadiy Rozental 2001-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -224,16 +224,16 @@
 
 BOOST_TEST_DECL std::string normalize_test_case_name( const_string tu_name );
 
-template<typename UserTestCase>
+template<typename InstanceType,typename UserTestCase>
 struct user_tc_method_invoker {
     typedef void (UserTestCase::*test_method )();
 
- user_tc_method_invoker( shared_ptr<UserTestCase> inst, test_method test_method )
+ user_tc_method_invoker( shared_ptr<InstanceType> inst, test_method test_method )
     : m_inst( inst ), m_test_method( test_method ) {}
 
     void operator()() { ((*m_inst).*m_test_method)(); }
 
- shared_ptr<UserTestCase> m_inst;
+ shared_ptr<InstanceType> m_inst;
     test_method m_test_method;
 };
 
@@ -249,14 +249,14 @@
 
 //____________________________________________________________________________//
 
-template<typename UserTestCase>
+template<typename UserTestCase, typename InstanceType>
 inline test_case*
-make_test_case( void (UserTestCase::*test_method )(),
- const_string tc_name,
- boost::shared_ptr<UserTestCase> const& user_test_case )
+make_test_case( void (UserTestCase::* test_method )(),
+ const_string tc_name,
+ boost::shared_ptr<InstanceType> user_test_case )
 {
     return new test_case( ut_detail::normalize_test_case_name( tc_name ),
- ut_detail::user_tc_method_invoker<UserTestCase>( user_test_case, test_method ) );
+ ut_detail::user_tc_method_invoker<InstanceType,UserTestCase>( user_test_case, test_method ) );
 }
 
 //____________________________________________________________________________//
@@ -347,18 +347,5 @@
 
 #include <boost/test/detail/enable_warnings.hpp>
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.2 2006/01/28 07:09:34 rogeeff
-// tm->test_method
-//
-// Revision 1.1 2005/12/14 05:24:55 rogeeff
-// dll support introduced
-// split into 2 files
-//
-// ***************************************************************************
-
 #endif // BOOST_TEST_UNIT_TEST_SUITE_IMPL_HPP_071894GER
 

Modified: branches/proto/v3/boost/test/utils/algorithm.hpp
==============================================================================
--- branches/proto/v3/boost/test/utils/algorithm.hpp (original)
+++ branches/proto/v3/boost/test/utils/algorithm.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2004-2005.
+// (C) Copyright Gennadiy Rozental 2004-2007.
 // Distributed under the 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,6 +16,8 @@
 #define BOOST_ALGORITHM_HPP_062304GER
 
 #include <utility>
+#include <algorithm> // std::find
+#include <functional> // std::bind1st
 
 #include <boost/test/detail/suppress_warnings.hpp>
 
@@ -221,30 +223,6 @@
 
 #include <boost/test/detail/enable_warnings.hpp>
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.5 2005/04/12 06:50:06 rogeeff
-// suppress warnings
-//
-// Revision 1.4 2005/02/20 08:27:08 rogeeff
-// This a major update for Boost.Test framework. See release docs for complete list of fixes/updates
-//
-// Revision 1.3 2005/02/01 08:59:39 rogeeff
-// supplied_log_formatters split
-// change formatters interface to simplify result interface
-//
-// Revision 1.2 2005/02/01 06:40:07 rogeeff
-// copyright update
-// old log entries removed
-// minor stilistic changes
-// depricated tools removed
-//
-// Revision 1.1 2005/01/22 18:21:39 rogeeff
-// moved sharable staff into utils
-//
-// ***************************************************************************
-
 #endif // BOOST_ALGORITHM_HPP_062304GER
 
+

Modified: branches/proto/v3/boost/test/utils/assign_op.hpp
==============================================================================
--- branches/proto/v3/boost/test/utils/assign_op.hpp (original)
+++ branches/proto/v3/boost/test/utils/assign_op.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -37,14 +37,5 @@
 
 } // namespace boost
 
-// ***************************************************************************
-// Revision History:
-//
-// $Log$
-// Revision 1.1 2005/04/12 06:48:12 rogeeff
-// Runtime.Param library initial commit
-//
-// ***************************************************************************
-
 #endif // BOOST_TEST_ASSIGN_OP_033005GER
 

Modified: branches/proto/v3/boost/test/utils/basic_cstring/basic_cstring.hpp
==============================================================================
--- branches/proto/v3/boost/test/utils/basic_cstring/basic_cstring.hpp (original)
+++ branches/proto/v3/boost/test/utils/basic_cstring/basic_cstring.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2004-2005.
+// (C) Copyright Gennadiy Rozental 2004-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -728,46 +728,4 @@
 
 #include <boost/test/detail/enable_warnings.hpp>
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.10 2005/12/14 05:01:13 rogeeff
-// *** empty log message ***
-//
-// Revision 1.9 2005/07/13 21:49:46 danieljames
-// Boost.Test workarounds for Digital Mars bugs.
-//
-// Revision 1.8 2005/04/12 06:49:05 rogeeff
-// assign_to -> assign_op
-//
-// Revision 1.7 2005/03/23 21:02:37 rogeeff
-// Sunpro CC 5.3 fixes
-//
-// Revision 1.6 2005/03/22 07:02:57 rogeeff
-// assign_to made free function
-//
-// Revision 1.5 2005/03/22 07:00:56 rogeeff
-// assign_to made free function
-//
-// Revision 1.4 2005/02/20 08:27:08 rogeeff
-// This a major update for Boost.Test framework. See release docs for complete list of fixes/updates
-//
-// Revision 1.3 2005/02/01 06:40:08 rogeeff
-// copyright update
-// old log entries removed
-// minor stilistic changes
-// depricated tools removed
-//
-// Revision 1.2 2005/01/22 19:22:13 rogeeff
-// implementation moved into headers section to eliminate dependency of included/minimal component on src directory
-//
-// Revision 1.1 2005/01/22 18:21:40 rogeeff
-// moved sharable staff into utils
-//
-// Revision 1.12 2005/01/21 07:33:51 rogeeff
-// small aCC fix
-//
-// ***************************************************************************
-
 #endif // BOOST_TEST_BASIC_CSTRING_HPP_071894GER

Modified: branches/proto/v3/boost/test/utils/basic_cstring/basic_cstring_fwd.hpp
==============================================================================
--- branches/proto/v3/boost/test/utils/basic_cstring/basic_cstring_fwd.hpp (original)
+++ branches/proto/v3/boost/test/utils/basic_cstring/basic_cstring_fwd.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2004-2005.
+// (C) Copyright Gennadiy Rozental 2004-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -36,26 +36,5 @@
 
 } // namespace boost
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.4 2005/04/12 06:49:05 rogeeff
-// assign_to -> assign_op
-//
-// Revision 1.3 2005/02/20 08:27:09 rogeeff
-// This a major update for Boost.Test framework. See release docs for complete list of fixes/updates
-//
-// Revision 1.2 2005/02/01 06:40:08 rogeeff
-// copyright update
-// old log entries removed
-// minor stilistic changes
-// depricated tools removed
-//
-// Revision 1.1 2005/01/22 18:21:40 rogeeff
-// moved sharable staff into utils
-//
-// ***************************************************************************
-
 #endif // BOOST_TEST_BASIC_CSTRING_FWD_HPP_071894GER
 

Modified: branches/proto/v3/boost/test/utils/basic_cstring/bcs_char_traits.hpp
==============================================================================
--- branches/proto/v3/boost/test/utils/basic_cstring/bcs_char_traits.hpp (original)
+++ branches/proto/v3/boost/test/utils/basic_cstring/bcs_char_traits.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2004-2005.
+// (C) Copyright Gennadiy Rozental 2004-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -147,22 +147,4 @@
 
 #include <boost/test/detail/enable_warnings.hpp>
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.3 2005/02/20 08:27:09 rogeeff
-// This a major update for Boost.Test framework. See release docs for complete list of fixes/updates
-//
-// Revision 1.2 2005/02/01 06:40:08 rogeeff
-// copyright update
-// old log entries removed
-// minor stilistic changes
-// depricated tools removed
-//
-// Revision 1.1 2005/01/22 18:21:40 rogeeff
-// moved sharable staff into utils
-//
-// ***************************************************************************
-
 #endif // BOOST_TEST_BCS_CHAR_TRAITS_HPP_071894GER

Modified: branches/proto/v3/boost/test/utils/basic_cstring/compare.hpp
==============================================================================
--- branches/proto/v3/boost/test/utils/basic_cstring/compare.hpp (original)
+++ branches/proto/v3/boost/test/utils/basic_cstring/compare.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2004-2005.
+// (C) Copyright Gennadiy Rozental 2004-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -112,28 +112,4 @@
 
 #include <boost/test/detail/enable_warnings.hpp>
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.5 2005/02/20 08:27:09 rogeeff
-// This a major update for Boost.Test framework. See release docs for complete list of fixes/updates
-//
-// Revision 1.4 2005/02/01 06:40:08 rogeeff
-// copyright update
-// old log entries removed
-// minor stilistic changes
-// depricated tools removed
-//
-// Revision 1.3 2005/01/31 20:07:21 rogeeff
-// Sunpro CC 5.3 workarounds
-//
-// Revision 1.2 2005/01/22 19:22:13 rogeeff
-// implementation moved into headers section to eliminate dependency of included/minimal component on src directory
-//
-// Revision 1.1 2005/01/22 18:21:40 rogeeff
-// moved sharable staff into utils
-//
-// ***************************************************************************
-
 #endif // BOOST_TEST_BASIC_CSTRING_COMPARE_HPP_071894GER

Modified: branches/proto/v3/boost/test/utils/basic_cstring/io.hpp
==============================================================================
--- branches/proto/v3/boost/test/utils/basic_cstring/io.hpp (original)
+++ branches/proto/v3/boost/test/utils/basic_cstring/io.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2004-2005.
+// (C) Copyright Gennadiy Rozental 2004-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -70,28 +70,4 @@
 
 #include <boost/test/detail/enable_warnings.hpp>
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.5 2005/12/14 05:01:13 rogeeff
-// *** empty log message ***
-//
-// Revision 1.4 2005/02/20 08:27:09 rogeeff
-// This a major update for Boost.Test framework. See release docs for complete list of fixes/updates
-//
-// Revision 1.3 2005/02/01 06:40:08 rogeeff
-// copyright update
-// old log entries removed
-// minor stilistic changes
-// depricated tools removed
-//
-// Revision 1.2 2005/01/22 19:22:13 rogeeff
-// implementation moved into headers section to eliminate dependency of included/minimal component on src directory
-//
-// Revision 1.1 2005/01/22 18:21:40 rogeeff
-// moved sharable staff into utils
-//
-// ***************************************************************************
-
 #endif // BOOST_TEST_BASIC_CSTRING_IO_HPP_071894GER

Modified: branches/proto/v3/boost/test/utils/callback.hpp
==============================================================================
--- branches/proto/v3/boost/test/utils/callback.hpp (original)
+++ branches/proto/v3/boost/test/utils/callback.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Use, modification, and distribution are subject to the
 // Boost Software License, Version 1.0. (See accompanying file
 // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -307,31 +307,4 @@
 
 #include <boost/test/detail/enable_warnings.hpp>
 
-// ************************************************************************** //
-// Revision History:
-//
-// $Log$
-// Revision 1.7 2006/02/21 04:27:16 rogeeff
-// rev back
-//
-// Revision 1.6 2006/01/28 08:57:03 rogeeff
-// VC6.0 workaround removed
-//
-// Revision 1.5 2005/04/13 05:09:00 rogeeff
-// Intel 7.1 bug fix
-//
-// Revision 1.4 2005/04/12 06:50:06 rogeeff
-// suppress warnings
-//
-// Revision 1.3 2005/03/22 07:05:18 rogeeff
-// minor vc7.1 workaround
-//
-// Revision 1.2 2005/02/24 19:28:17 turkanis
-// removed redundant copy ctors, except for VC6
-//
-// Revision 1.1 2005/02/20 08:27:08 rogeeff
-// This a major update for Boost.Test framework. See release docs for complete list of fixes/updates
-//
-// ************************************************************************** //
-
 #endif // BOOST_TEST_CALLBACK_020505GER

Modified: branches/proto/v3/boost/test/utils/class_properties.hpp
==============================================================================
--- branches/proto/v3/boost/test/utils/class_properties.hpp (original)
+++ branches/proto/v3/boost/test/utils/class_properties.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2001-2006.
+// (C) Copyright Gennadiy Rozental 2001-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -222,43 +222,4 @@
 
 #undef BOOST_TEST_NO_PROTECTED_USING
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.10 2006/02/21 04:24:46 rogeeff
-// rev back
-//
-// Revision 1.9 2006/01/28 08:57:05 rogeeff
-// VC6.0 workaround removed
-//
-// Revision 1.8 2005/08/25 16:27:26 johnmaddock
-// Large patch from Ulrich Eckhardt to fix support for EVC++ 4.
-//
-// Revision 1.7 2005/05/11 05:04:58 rogeeff
-// borland portability fix
-//
-// Revision 1.6 2005/04/12 06:46:17 rogeeff
-// use add_const
-//
-// Revision 1.5 2005/02/21 10:17:27 rogeeff
-// base reference renamed (borland bug fix)
-//
-// Revision 1.4 2005/02/20 08:27:08 rogeeff
-// This a major update for Boost.Test framework. See release docs for complete list of fixes/updates
-//
-// Revision 1.3 2005/02/01 06:40:07 rogeeff
-// copyright update
-// old log entries removed
-// minor stilistic changes
-// depricated tools removed
-//
-// Revision 1.2 2005/01/22 19:22:13 rogeeff
-// implementation moved into headers section to eliminate dependency of included/minimal component on src directory
-//
-// Revision 1.1 2005/01/22 18:21:39 rogeeff
-// moved sharable staff into utils
-//
-// ***************************************************************************
-
 #endif // BOOST_TEST_CLASS_PROPERTIES_HPP_071894GER

Modified: branches/proto/v3/boost/test/utils/custom_manip.hpp
==============================================================================
--- branches/proto/v3/boost/test/utils/custom_manip.hpp (original)
+++ branches/proto/v3/boost/test/utils/custom_manip.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Distributed under the 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,19 +60,4 @@
 
 #include <boost/test/detail/enable_warnings.hpp>
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.2 2005/02/20 08:27:08 rogeeff
-// This a major update for Boost.Test framework. See release docs for complete list of fixes/updates
-//
-// Revision 1.1 2005/01/22 18:21:39 rogeeff
-// moved sharable staff into utils
-//
-// Revision 1.1 2005/01/21 07:31:44 rogeeff
-// xml helper facilities reworked to present manipulator interfaces
-//
-// ***************************************************************************
-
 #endif // BOOST_TEST_CUSTOM_MANIP_HPP_071894GER

Modified: branches/proto/v3/boost/test/utils/fixed_mapping.hpp
==============================================================================
--- branches/proto/v3/boost/test/utils/fixed_mapping.hpp (original)
+++ branches/proto/v3/boost/test/utils/fixed_mapping.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2001-2005.
+// (C) Copyright Gennadiy Rozental 2001-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -120,33 +120,5 @@
 #undef CONSTR_DECL
 #undef CONTRUCTORS
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.6 2005/06/16 14:33:42 schoepflin
-// Added workaround for Tru64/CXX which enables boost.test to compile in strict
-// ansi mode on that compiler.
-//
-// Revision 1.5 2005/05/08 08:55:09 rogeeff
-// typos and missing descriptions fixed
-//
-// Revision 1.4 2005/02/20 08:27:08 rogeeff
-// This a major update for Boost.Test framework. See release docs for complete list of fixes/updates
-//
-// Revision 1.3 2005/02/01 06:40:07 rogeeff
-// copyright update
-// old log entries removed
-// minor stilistic changes
-// depricated tools removed
-//
-// Revision 1.2 2005/01/31 20:07:19 rogeeff
-// Sunpro CC 5.3 workarounds
-//
-// Revision 1.1 2005/01/22 18:21:39 rogeeff
-// moved sharable staff into utils
-//
-// ***************************************************************************
-
 #endif // BOOST_TEST_FIXED_MAPPING_HPP_071894GER
 

Modified: branches/proto/v3/boost/test/utils/foreach.hpp
==============================================================================
--- branches/proto/v3/boost/test/utils/foreach.hpp (original)
+++ branches/proto/v3/boost/test/utils/foreach.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,5 +1,5 @@
 // (C) Copyright Eric Niebler 2004-2005
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -302,22 +302,4 @@
 
 #include <boost/test/detail/enable_warnings.hpp>
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.4 2005/03/24 04:02:33 rogeeff
-// portability fixes
-//
-// Revision 1.3 2005/03/23 21:02:26 rogeeff
-// Sunpro CC 5.3 fixes
-//
-// Revision 1.2 2005/02/21 10:15:45 rogeeff
-// vc 7.1 workaround
-//
-// Revision 1.1 2005/02/20 08:27:08 rogeeff
-// This a major update for Boost.Test framework. See release docs for complete list of fixes/updates
-//
-// ***************************************************************************
-
 #endif // BOOST_TEST_FOREACH_HPP_021005GER

Modified: branches/proto/v3/boost/test/utils/iterator/ifstream_line_iterator.hpp
==============================================================================
--- branches/proto/v3/boost/test/utils/iterator/ifstream_line_iterator.hpp (original)
+++ branches/proto/v3/boost/test/utils/iterator/ifstream_line_iterator.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2004-2005.
+// (C) Copyright Gennadiy Rozental 2004-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -100,35 +100,5 @@
 
 #include <boost/test/detail/enable_warnings.hpp>
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.7 2005/06/11 07:21:23 rogeeff
-// reverse prev fix
-//
-// Revision 1.6 2005/06/07 05:08:03 rogeeff
-// gcc fix
-//
-// Revision 1.5 2005/02/20 08:27:09 rogeeff
-// This a major update for Boost.Test framework. See release docs for complete list of fixes/updates
-//
-// Revision 1.4 2005/02/01 06:40:08 rogeeff
-// copyright update
-// old log entries removed
-// minor stilistic changes
-// depricated tools removed
-//
-// Revision 1.3 2005/01/30 01:44:14 rogeeff
-// warnings suppressed
-//
-// Revision 1.2 2005/01/22 19:22:13 rogeeff
-// implementation moved into headers section to eliminate dependency of included/minimal component on src directory
-//
-// Revision 1.1 2005/01/22 18:21:40 rogeeff
-// moved sharable staff into utils
-//
-// ***************************************************************************
-
 #endif // BOOST_IFSTREAM_LINE_ITERATOR_HPP_071894GER
 

Modified: branches/proto/v3/boost/test/utils/iterator/input_iterator_facade.hpp
==============================================================================
--- branches/proto/v3/boost/test/utils/iterator/input_iterator_facade.hpp (original)
+++ branches/proto/v3/boost/test/utils/iterator/input_iterator_facade.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2004-2005.
+// (C) Copyright Gennadiy Rozental 2004-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -105,29 +105,5 @@
 
 #include <boost/test/detail/enable_warnings.hpp>
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.5 2005/05/08 08:55:09 rogeeff
-// typos and missing descriptions fixed
-//
-// Revision 1.4 2005/04/12 06:47:46 rogeeff
-// help iterator copying
-//
-// Revision 1.3 2005/02/20 08:27:09 rogeeff
-// This a major update for Boost.Test framework. See release docs for complete list of fixes/updates
-//
-// Revision 1.2 2005/02/01 06:40:08 rogeeff
-// copyright update
-// old log entries removed
-// minor stilistic changes
-// depricated tools removed
-//
-// Revision 1.1 2005/01/22 18:21:40 rogeeff
-// moved sharable staff into utils
-//
-// ***************************************************************************
-
 #endif // BOOST_INPUT_ITERATOR_FACADE_HPP_071894GER
 

Modified: branches/proto/v3/boost/test/utils/iterator/istream_line_iterator.hpp
==============================================================================
--- branches/proto/v3/boost/test/utils/iterator/istream_line_iterator.hpp (original)
+++ branches/proto/v3/boost/test/utils/iterator/istream_line_iterator.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2004-2005.
+// (C) Copyright Gennadiy Rozental 2004-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -93,29 +93,5 @@
 
 #include <boost/test/detail/enable_warnings.hpp>
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.5 2005/12/14 05:01:13 rogeeff
-// *** empty log message ***
-//
-// Revision 1.4 2005/02/20 08:27:09 rogeeff
-// This a major update for Boost.Test framework. See release docs for complete list of fixes/updates
-//
-// Revision 1.3 2005/02/01 06:40:08 rogeeff
-// copyright update
-// old log entries removed
-// minor stilistic changes
-// depricated tools removed
-//
-// Revision 1.2 2005/01/22 19:22:14 rogeeff
-// implementation moved into headers section to eliminate dependency of included/minimal component on src directory
-//
-// Revision 1.1 2005/01/22 18:21:40 rogeeff
-// moved sharable staff into utils
-//
-// ***************************************************************************
-
 #endif // BOOST_ISTREAM_LINE_ITERATOR_HPP_071894GER
 

Modified: branches/proto/v3/boost/test/utils/iterator/token_iterator.hpp
==============================================================================
--- branches/proto/v3/boost/test/utils/iterator/token_iterator.hpp (original)
+++ branches/proto/v3/boost/test/utils/iterator/token_iterator.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2004-2005.
+// (C) Copyright Gennadiy Rozental 2004-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -414,43 +414,5 @@
 
 #include <boost/test/detail/enable_warnings.hpp>
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.9 2005/12/14 05:01:13 rogeeff
-// *** empty log message ***
-//
-// Revision 1.8 2005/06/16 05:58:26 rogeeff
-// make default constructed range token iterator copyable according ot standard
-//
-// Revision 1.7 2005/06/11 19:23:28 rogeeff
-// 1. Always use clear
-// reorder field in constructor to eliminate warning
-// remove cw workaround - doesn't seems to be needed
-//
-// Revision 1.6 2005/06/05 16:07:51 grafik
-// Work around CW-8 problem parsing the switch statement.
-//
-// Revision 1.5 2005/04/12 06:46:42 rogeeff
-// use named_param facilites
-//
-// Revision 1.4 2005/02/20 08:27:09 rogeeff
-// This a major update for Boost.Test framework. See release docs for complete list of fixes/updates
-//
-// Revision 1.3 2005/02/01 06:40:08 rogeeff
-// copyright update
-// old log entries removed
-// minor stylitic changes
-// deprecated tools removed
-//
-// Revision 1.2 2005/01/22 19:22:14 rogeeff
-// implementation moved into headers section to eliminate dependency of included/minimal component on src directory
-//
-// Revision 1.1 2005/01/22 18:21:40 rogeeff
-// moved sharable staff into utils
-//
-// ***************************************************************************
-
 #endif // BOOST_TOKEN_ITERATOR_HPP_071894GER
 

Modified: branches/proto/v3/boost/test/utils/named_params.hpp
==============================================================================
--- branches/proto/v3/boost/test/utils/named_params.hpp (original)
+++ branches/proto/v3/boost/test/utils/named_params.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -290,11 +290,5 @@
 
 #include <boost/test/detail/enable_warnings.hpp>
 
-// ***************************************************************************
-// Revision History:
-//
-// $Log$
-// ***************************************************************************
-
 #endif // BOOST_TEST_NAMED_PARAM_022505GER
 

Modified: branches/proto/v3/boost/test/utils/nullstream.hpp
==============================================================================
--- branches/proto/v3/boost/test/utils/nullstream.hpp (original)
+++ branches/proto/v3/boost/test/utils/nullstream.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2002-2005.
+// (C) Copyright Gennadiy Rozental 2002-2007.
 // (C) Copyright Daryle Walker 2000-2001.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
@@ -97,25 +97,4 @@
 
 #include <boost/test/detail/enable_warnings.hpp>
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.4 2005/02/20 08:27:08 rogeeff
-// This a major update for Boost.Test framework. See release docs for complete list of fixes/updates
-//
-// Revision 1.3 2005/02/01 06:40:07 rogeeff
-// copyright update
-// old log entries removed
-// minor stilistic changes
-// depricated tools removed
-//
-// Revision 1.2 2005/01/30 01:42:49 rogeeff
-// warnings suppressed
-//
-// Revision 1.1 2005/01/22 18:21:40 rogeeff
-// moved sharable staff into utils
-//
-// ***************************************************************************
-
 #endif // BOOST_NULLSTREAM_HPP_071894GER

Modified: branches/proto/v3/boost/test/utils/rtti.hpp
==============================================================================
--- branches/proto/v3/boost/test/utils/rtti.hpp (original)
+++ branches/proto/v3/boost/test/utils/rtti.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Distributed under the 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,16 +61,4 @@
 
 } // namespace boost
 
-// ************************************************************************** //
-// Revision History:
-//
-// $Log$
-// Revision 1.2 2005/05/15 06:45:32 rogeeff
-// *** empty log message ***
-//
-// Revision 1.1 2005/04/12 06:48:12 rogeeff
-// Runtime.Param library initial commit
-//
-// ************************************************************************** //
-
 #endif // BOOST_RT_RTTI_HPP_062604GER

Modified: branches/proto/v3/boost/test/utils/runtime/argument.hpp
==============================================================================
--- branches/proto/v3/boost/test/utils/runtime/argument.hpp (original)
+++ branches/proto/v3/boost/test/utils/runtime/argument.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -100,16 +100,4 @@
 
 } // namespace boost
 
-// ************************************************************************** //
-// Revision History:
-//
-// $Log$
-// Revision 1.2 2005/04/12 07:01:35 rogeeff
-// exclude polymorphic_downcast
-//
-// Revision 1.1 2005/04/12 06:42:42 rogeeff
-// Runtime.Param library initial commit
-//
-// ************************************************************************** //
-
 #endif // BOOST_RT_ARGUMENT_HPP_062604GER

Modified: branches/proto/v3/boost/test/utils/runtime/cla/argument_factory.hpp
==============================================================================
--- branches/proto/v3/boost/test/utils/runtime/cla/argument_factory.hpp (original)
+++ branches/proto/v3/boost/test/utils/runtime/cla/argument_factory.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Use, modification, and distribution are subject to the
 // Boost Software License, Version 1.0. (See accompanying file
 // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -215,13 +215,4 @@
 
 } // namespace cla
 
-// ************************************************************************** //
-// Revision History:
-//
-// $Log$
-// Revision 1.1 2005/04/12 06:42:42 rogeeff
-// Runtime.Param library initial commit
-//
-// ************************************************************************** //
-
 #endif // BOOST_RT_CLA_ARGUMENT_FACTORY_HPP_062604GER

Modified: branches/proto/v3/boost/test/utils/runtime/cla/argv_traverser.cpp
==============================================================================
--- branches/proto/v3/boost/test/utils/runtime/cla/argv_traverser.cpp (original)
+++ branches/proto/v3/boost/test/utils/runtime/cla/argv_traverser.cpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Use, modification, and distribution are subject to the
 // Boost Software License, Version 1.0. (See accompanying file
 // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -14,12 +14,3 @@
 
 #define BOOST_RT_PARAM_INLINE
 #include <boost/test/utils/runtime/cla/argv_traverser.ipp>
-
-// ************************************************************************** //
-// Revision History:
-//
-// $Log$
-// Revision 1.1 2005/04/12 06:42:42 rogeeff
-// Runtime.Param library initial commit
-//
-// ************************************************************************** //

Modified: branches/proto/v3/boost/test/utils/runtime/cla/argv_traverser.hpp
==============================================================================
--- branches/proto/v3/boost/test/utils/runtime/cla/argv_traverser.hpp (original)
+++ branches/proto/v3/boost/test/utils/runtime/cla/argv_traverser.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Use, modification, and distribution are subject to the
 // Boost Software License, Version 1.0. (See accompanying file
 // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -95,13 +95,4 @@
 
 #endif
 
-// ************************************************************************** //
-// Revision History:
-//
-// $Log$
-// Revision 1.1 2005/04/12 06:42:43 rogeeff
-// Runtime.Param library initial commit
-//
-// ************************************************************************** //
-
 #endif // BOOST_RT_CLA_ARGV_TRAVERSER_HPP_062604GER

Modified: branches/proto/v3/boost/test/utils/runtime/cla/argv_traverser.ipp
==============================================================================
--- branches/proto/v3/boost/test/utils/runtime/cla/argv_traverser.ipp (original)
+++ branches/proto/v3/boost/test/utils/runtime/cla/argv_traverser.ipp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Use, modification, and distribution are subject to the
 // Boost Software License, Version 1.0. (See accompanying file
 // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -206,19 +206,4 @@
 
 } // namespace boost
 
-// ************************************************************************** //
-// Revision History:
-//
-// $Log$
-// Revision 1.3 2005/05/05 05:55:45 rogeeff
-// portability fixes
-//
-// Revision 1.2 2005/05/03 05:02:49 rogeeff
-// como fixes
-//
-// Revision 1.1 2005/04/12 06:42:43 rogeeff
-// Runtime.Param library initial commit
-//
-// ************************************************************************** //
-
 #endif // BOOST_RT_CLA_ARGV_TRAVERSER_IPP_070604GER

Modified: branches/proto/v3/boost/test/utils/runtime/cla/basic_parameter.hpp
==============================================================================
--- branches/proto/v3/boost/test/utils/runtime/cla/basic_parameter.hpp (original)
+++ branches/proto/v3/boost/test/utils/runtime/cla/basic_parameter.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Use, modification, and distribution are subject to the
 // Boost Software License, Version 1.0. (See accompanying file
 // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -81,13 +81,4 @@
 
 } // namespace boost
 
-// ************************************************************************** //
-// Revision History:
-//
-// $Log$
-// Revision 1.1 2005/04/12 06:42:43 rogeeff
-// Runtime.Param library initial commit
-//
-// ************************************************************************** //
-
 #endif // BOOST_RT_CLA_BASIC_PARAMETER_HPP_062604GER

Modified: branches/proto/v3/boost/test/utils/runtime/cla/char_parameter.cpp
==============================================================================
--- branches/proto/v3/boost/test/utils/runtime/cla/char_parameter.cpp (original)
+++ branches/proto/v3/boost/test/utils/runtime/cla/char_parameter.cpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Use, modification, and distribution are subject to the
 // Boost Software License, Version 1.0. (See accompanying file
 // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -14,12 +14,3 @@
 
 #define BOOST_RT_PARAM_INLINE
 #include <boost/test/utils/runtime/cla/char_parameter.ipp>
-
-// ************************************************************************** //
-// Revision History:
-//
-// $Log$
-// Revision 1.1 2005/04/12 06:42:43 rogeeff
-// Runtime.Param library initial commit
-//
-// ************************************************************************** //

Modified: branches/proto/v3/boost/test/utils/runtime/cla/char_parameter.hpp
==============================================================================
--- branches/proto/v3/boost/test/utils/runtime/cla/char_parameter.hpp (original)
+++ branches/proto/v3/boost/test/utils/runtime/cla/char_parameter.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Use, modification, and distribution are subject to the
 // Boost Software License, Version 1.0. (See accompanying file
 // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -95,13 +95,4 @@
 
 #endif
 
-// ************************************************************************** //
-// Revision History:
-//
-// $Log$
-// Revision 1.1 2005/04/12 06:42:43 rogeeff
-// Runtime.Param library initial commit
-//
-// ************************************************************************** //
-
 #endif // BOOST_RT_CLA_CHAR_PARAMETER_HPP_062604GER

Modified: branches/proto/v3/boost/test/utils/runtime/cla/char_parameter.ipp
==============================================================================
--- branches/proto/v3/boost/test/utils/runtime/cla/char_parameter.ipp (original)
+++ branches/proto/v3/boost/test/utils/runtime/cla/char_parameter.ipp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Use, modification, and distribution are subject to the
 // Boost Software License, Version 1.0. (See accompanying file
 // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -54,16 +54,4 @@
 
 } // namespace boost
 
-// ************************************************************************** //
-// Revision History:
-//
-// $Log$
-// Revision 1.2 2005/04/12 07:01:36 rogeeff
-// exclude polymorphic_downcast
-//
-// Revision 1.1 2005/04/12 06:42:43 rogeeff
-// Runtime.Param library initial commit
-//
-// ************************************************************************** //
-
 #endif // BOOST_RT_CLA_CHAR_PARAMETER_IPP_062904GER

Modified: branches/proto/v3/boost/test/utils/runtime/cla/detail/argument_value_usage.hpp
==============================================================================
--- branches/proto/v3/boost/test/utils/runtime/cla/detail/argument_value_usage.hpp (original)
+++ branches/proto/v3/boost/test/utils/runtime/cla/detail/argument_value_usage.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Permission to copy, use, modify, sell and distribute this software
 // is granted provided this copyright notice appears in all copies.
 // This software is provided "as is" without express or implied warranty,
@@ -79,13 +79,4 @@
 
 } // namespace boost
 
-// ************************************************************************** //
-// Revision History:
-//
-// $Log$
-// Revision 1.1 2005/04/12 06:42:43 rogeeff
-// Runtime.Param library initial commit
-//
-// ************************************************************************** //
-
 #endif // BOOST_RT_CLA_ARGUMENT_VALUE_USAGE_HPP_062604GER

Modified: branches/proto/v3/boost/test/utils/runtime/cla/dual_name_parameter.cpp
==============================================================================
--- branches/proto/v3/boost/test/utils/runtime/cla/dual_name_parameter.cpp (original)
+++ branches/proto/v3/boost/test/utils/runtime/cla/dual_name_parameter.cpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Use, modification, and distribution are subject to the
 // Boost Software License, Version 1.0. (See accompanying file
 // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -14,12 +14,3 @@
 
 #define BOOST_RT_PARAM_INLINE
 #include <boost/test/utils/runtime/cla/dual_name_parameter.ipp>
-
-// ************************************************************************** //
-// Revision History:
-//
-// $Log$
-// Revision 1.1 2005/04/12 06:42:43 rogeeff
-// Runtime.Param library initial commit
-//
-// ************************************************************************** //

Modified: branches/proto/v3/boost/test/utils/runtime/cla/dual_name_parameter.hpp
==============================================================================
--- branches/proto/v3/boost/test/utils/runtime/cla/dual_name_parameter.hpp (original)
+++ branches/proto/v3/boost/test/utils/runtime/cla/dual_name_parameter.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Use, modification, and distribution are subject to the
 // Boost Software License, Version 1.0. (See accompanying file
 // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -85,13 +85,4 @@
 
 #endif
 
-// ************************************************************************** //
-// Revision History:
-//
-// $Log$
-// Revision 1.1 2005/04/12 06:42:43 rogeeff
-// Runtime.Param library initial commit
-//
-// ************************************************************************** //
-
 #endif // BOOST_RT_CLA_DUAL_NAME_PARAMETER_HPP_062604GER

Modified: branches/proto/v3/boost/test/utils/runtime/cla/dual_name_parameter.ipp
==============================================================================
--- branches/proto/v3/boost/test/utils/runtime/cla/dual_name_parameter.ipp (original)
+++ branches/proto/v3/boost/test/utils/runtime/cla/dual_name_parameter.ipp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Use, modification, and distribution are subject to the
 // Boost Software License, Version 1.0. (See accompanying file
 // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -87,13 +87,4 @@
 
 } // namespace boost
 
-// ************************************************************************** //
-// Revision History:
-//
-// $Log$
-// Revision 1.1 2005/04/12 06:42:43 rogeeff
-// Runtime.Param library initial commit
-//
-// ************************************************************************** //
-
 #endif // BOOST_RT_CLA_DUAL_NAME_PARAMETER_IPP_062904GER

Modified: branches/proto/v3/boost/test/utils/runtime/cla/fwd.hpp
==============================================================================
--- branches/proto/v3/boost/test/utils/runtime/cla/fwd.hpp (original)
+++ branches/proto/v3/boost/test/utils/runtime/cla/fwd.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Use, modification, and distribution are subject to the
 // Boost Software License, Version 1.0. (See accompanying file
 // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -52,13 +52,4 @@
 
 } // namespace boost
 
-// ************************************************************************** //
-// Revision History:
-//
-// $Log$
-// Revision 1.1 2005/04/12 06:42:43 rogeeff
-// Runtime.Param library initial commit
-//
-// ************************************************************************** //
-
 #endif // BOOST_RT_CLA_FWD_HPP_062604GER

Modified: branches/proto/v3/boost/test/utils/runtime/cla/id_policy.cpp
==============================================================================
--- branches/proto/v3/boost/test/utils/runtime/cla/id_policy.cpp (original)
+++ branches/proto/v3/boost/test/utils/runtime/cla/id_policy.cpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Use, modification, and distribution are subject to the
 // Boost Software License, Version 1.0. (See accompanying file
 // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -14,12 +14,3 @@
 
 #define BOOST_RT_PARAM_INLINE
 #include <boost/test/utils/runtime/cla/id_policy.ipp>
-
-// ************************************************************************** //
-// Revision History:
-//
-// $Log$
-// Revision 1.1 2005/04/12 06:42:43 rogeeff
-// Runtime.Param library initial commit
-//
-// ************************************************************************** //

Modified: branches/proto/v3/boost/test/utils/runtime/cla/id_policy.hpp
==============================================================================
--- branches/proto/v3/boost/test/utils/runtime/cla/id_policy.hpp (original)
+++ branches/proto/v3/boost/test/utils/runtime/cla/id_policy.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Use, modification, and distribution are subject to the
 // Boost Software License, Version 1.0. (See accompanying file
 // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -134,13 +134,4 @@
 
 #endif
 
-// ************************************************************************** //
-// Revision History:
-//
-// $Log$
-// Revision 1.1 2005/04/12 06:42:43 rogeeff
-// Runtime.Param library initial commit
-//
-// ************************************************************************** //
-
 #endif // BOOST_RT_CLA_ID_POLICY_HPP_062604GER

Modified: branches/proto/v3/boost/test/utils/runtime/cla/id_policy.ipp
==============================================================================
--- branches/proto/v3/boost/test/utils/runtime/cla/id_policy.ipp (original)
+++ branches/proto/v3/boost/test/utils/runtime/cla/id_policy.ipp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Use, modification, and distribution are subject to the
 // Boost Software License, Version 1.0. (See accompanying file
 // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -109,13 +109,4 @@
 
 } // namespace boost
 
-// ************************************************************************** //
-// Revision History:
-//
-// $Log$
-// Revision 1.1 2005/04/12 06:42:43 rogeeff
-// Runtime.Param library initial commit
-//
-// ************************************************************************** //
-
 #endif // BOOST_RT_CLA_ID_POLICY_IPP_062904GER

Modified: branches/proto/v3/boost/test/utils/runtime/cla/iface/argument_factory.hpp
==============================================================================
--- branches/proto/v3/boost/test/utils/runtime/cla/iface/argument_factory.hpp (original)
+++ branches/proto/v3/boost/test/utils/runtime/cla/iface/argument_factory.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Use, modification, and distribution are subject to the
 // Boost Software License, Version 1.0. (See accompanying file
 // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -46,13 +46,4 @@
 
 } // namespace cla
 
-// ************************************************************************** //
-// Revision History:
-//
-// $Log$
-// Revision 1.1 2005/04/12 06:42:43 rogeeff
-// Runtime.Param library initial commit
-//
-// ************************************************************************** //
-
 #endif // BOOST_RT_CLA_IFACE_ARGUMENT_FACTORY_HPP_062604GER

Modified: branches/proto/v3/boost/test/utils/runtime/cla/iface/id_policy.hpp
==============================================================================
--- branches/proto/v3/boost/test/utils/runtime/cla/iface/id_policy.hpp (original)
+++ branches/proto/v3/boost/test/utils/runtime/cla/iface/id_policy.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Use, modification, and distribution are subject to the
 // Boost Software License, Version 1.0. (See accompanying file
 // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -60,13 +60,4 @@
 
 } // namespace boost
 
-// ************************************************************************** //
-// Revision History:
-//
-// $Log$
-// Revision 1.1 2005/04/12 06:42:43 rogeeff
-// Runtime.Param library initial commit
-//
-// ************************************************************************** //
-
 #endif // BOOST_RT_CLA_IFACE_ID_POLICY_HPP_062604GER

Modified: branches/proto/v3/boost/test/utils/runtime/cla/modifier.hpp
==============================================================================
--- branches/proto/v3/boost/test/utils/runtime/cla/modifier.hpp (original)
+++ branches/proto/v3/boost/test/utils/runtime/cla/modifier.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Use, modification, and distribution are subject to the
 // Boost Software License, Version 1.0. (See accompanying file
 // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -66,13 +66,4 @@
 
 } // namespace boost
 
-// ************************************************************************** //
-// Revision History:
-//
-// $Log$
-// Revision 1.1 2005/04/12 06:42:43 rogeeff
-// Runtime.Param library initial commit
-//
-// ************************************************************************** //
-
 #endif // BOOST_RT_CLA_MODIFIER_HPP_062604GER

Modified: branches/proto/v3/boost/test/utils/runtime/cla/named_parameter.cpp
==============================================================================
--- branches/proto/v3/boost/test/utils/runtime/cla/named_parameter.cpp (original)
+++ branches/proto/v3/boost/test/utils/runtime/cla/named_parameter.cpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Use, modification, and distribution are subject to the
 // Boost Software License, Version 1.0. (See accompanying file
 // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -14,12 +14,3 @@
 
 #define BOOST_RT_PARAM_INLINE
 #include <boost/test/utils/runtime/cla/named_parameter.ipp>
-
-// ************************************************************************** //
-// Revision History:
-//
-// $Log$
-// Revision 1.1 2005/04/12 06:42:43 rogeeff
-// Runtime.Param library initial commit
-//
-// ************************************************************************** //

Modified: branches/proto/v3/boost/test/utils/runtime/cla/named_parameter.hpp
==============================================================================
--- branches/proto/v3/boost/test/utils/runtime/cla/named_parameter.hpp (original)
+++ branches/proto/v3/boost/test/utils/runtime/cla/named_parameter.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Use, modification, and distribution are subject to the
 // Boost Software License, Version 1.0. (See accompanying file
 // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -90,13 +90,4 @@
 
 #endif
 
-// ************************************************************************** //
-// Revision History:
-//
-// $Log$
-// Revision 1.1 2005/04/12 06:42:43 rogeeff
-// Runtime.Param library initial commit
-//
-// ************************************************************************** //
-
 #endif // BOOST_RT_CLA_NAMED_PARAMETER_HPP_062604GER

Modified: branches/proto/v3/boost/test/utils/runtime/cla/named_parameter.ipp
==============================================================================
--- branches/proto/v3/boost/test/utils/runtime/cla/named_parameter.ipp (original)
+++ branches/proto/v3/boost/test/utils/runtime/cla/named_parameter.ipp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Use, modification, and distribution are subject to the
 // Boost Software License, Version 1.0. (See accompanying file
 // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -113,16 +113,4 @@
 
 } // namespace boost
 
-// ************************************************************************** //
-// Revision History:
-//
-// $Log$
-// Revision 1.2 2005/04/12 07:01:36 rogeeff
-// exclude polymorphic_downcast
-//
-// Revision 1.1 2005/04/12 06:42:43 rogeeff
-// Runtime.Param library initial commit
-//
-// ************************************************************************** //
-
 #endif // BOOST_RT_CLA_NAMED_PARAMETER_IPP_062904GER

Modified: branches/proto/v3/boost/test/utils/runtime/cla/parameter.hpp
==============================================================================
--- branches/proto/v3/boost/test/utils/runtime/cla/parameter.hpp (original)
+++ branches/proto/v3/boost/test/utils/runtime/cla/parameter.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Use, modification, and distribution are subject to the
 // Boost Software License, Version 1.0. (See accompanying file
 // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -147,13 +147,4 @@
 
 } // namespace boost
 
-// ************************************************************************** //
-// Revision History:
-//
-// $Log$
-// Revision 1.1 2005/04/12 06:42:43 rogeeff
-// Runtime.Param library initial commit
-//
-// ************************************************************************** //
-
 #endif // BOOST_RT_CLA_PARAMETER_HPP_062604GER

Modified: branches/proto/v3/boost/test/utils/runtime/cla/parser.cpp
==============================================================================
--- branches/proto/v3/boost/test/utils/runtime/cla/parser.cpp (original)
+++ branches/proto/v3/boost/test/utils/runtime/cla/parser.cpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Use, modification, and distribution are subject to the
 // Boost Software License, Version 1.0. (See accompanying file
 // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -16,12 +16,3 @@
 
 #define BOOST_RT_PARAM_INLINE
 #include <boost/test/utils/runtime/cla/parser.ipp>
-
-// ************************************************************************** //
-// Revision History:
-//
-// $Log$
-// Revision 1.1 2005/04/12 06:42:43 rogeeff
-// Runtime.Param library initial commit
-//
-// ************************************************************************** //

Modified: branches/proto/v3/boost/test/utils/runtime/cla/parser.hpp
==============================================================================
--- branches/proto/v3/boost/test/utils/runtime/cla/parser.hpp (original)
+++ branches/proto/v3/boost/test/utils/runtime/cla/parser.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Use, modification, and distribution are subject to the
 // Boost Software License, Version 1.0. (See accompanying file
 // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -150,16 +150,4 @@
 
 #endif
 
-// ************************************************************************** //
-// Revision History:
-//
-// $Log$
-// Revision 1.2 2005/12/14 05:01:14 rogeeff
-// *** empty log message ***
-//
-// Revision 1.1 2005/04/12 06:42:43 rogeeff
-// Runtime.Param library initial commit
-//
-// ************************************************************************** //
-
 #endif // BOOST_RT_CLA_PARSER_HPP_062604GER

Modified: branches/proto/v3/boost/test/utils/runtime/cla/parser.ipp
==============================================================================
--- branches/proto/v3/boost/test/utils/runtime/cla/parser.ipp (original)
+++ branches/proto/v3/boost/test/utils/runtime/cla/parser.ipp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Use, modification, and distribution are subject to the
 // Boost Software License, Version 1.0. (See accompanying file
 // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -258,13 +258,4 @@
 
 } // namespace boost
 
-// ************************************************************************** //
-// Revision History:
-//
-// $Log$
-// Revision 1.1 2005/04/12 06:42:43 rogeeff
-// Runtime.Param library initial commit
-//
-// ************************************************************************** //
-
 #endif // BOOST_RT_CLA_PARSER_IPP_062904GER

Modified: branches/proto/v3/boost/test/utils/runtime/cla/positional_parameter.hpp
==============================================================================
--- branches/proto/v3/boost/test/utils/runtime/cla/positional_parameter.hpp (original)
+++ branches/proto/v3/boost/test/utils/runtime/cla/positional_parameter.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Use, modification, and distribution are subject to the
 // Boost Software License, Version 1.0. (See accompanying file
 // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -88,13 +88,4 @@
 
 } // namespace boost
 
-// ************************************************************************** //
-// Revision History:
-//
-// $Log$
-// Revision 1.1 2005/04/12 06:42:43 rogeeff
-// Runtime.Param library initial commit
-//
-// ************************************************************************** //
-
 #endif // BOOST_RT_CLA_POSITIONAL_PARAMETER_HPP_062604GER

Modified: branches/proto/v3/boost/test/utils/runtime/cla/typed_parameter.hpp
==============================================================================
--- branches/proto/v3/boost/test/utils/runtime/cla/typed_parameter.hpp (original)
+++ branches/proto/v3/boost/test/utils/runtime/cla/typed_parameter.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Use, modification, and distribution are subject to the
 // Boost Software License, Version 1.0. (See accompanying file
 // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -65,13 +65,4 @@
 
 } // namespace boost
 
-// ************************************************************************** //
-// Revision History:
-//
-// $Log$
-// Revision 1.1 2005/04/12 06:42:43 rogeeff
-// Runtime.Param library initial commit
-//
-// ************************************************************************** //
-
 #endif // BOOST_RT_CLA_TYPED_PARAMETER_HPP_062604GER

Modified: branches/proto/v3/boost/test/utils/runtime/cla/validation.cpp
==============================================================================
--- branches/proto/v3/boost/test/utils/runtime/cla/validation.cpp (original)
+++ branches/proto/v3/boost/test/utils/runtime/cla/validation.cpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Use, modification, and distribution are subject to the
 // Boost Software License, Version 1.0. (See accompanying file
 // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -14,12 +14,3 @@
 
 #define BOOST_RT_PARAM_INLINE
 #include <boost/test/utils/runtime/cla/validation.ipp>
-
-// ************************************************************************** //
-// Revision History:
-//
-// $Log$
-// Revision 1.1 2005/04/12 06:42:43 rogeeff
-// Runtime.Param library initial commit
-//
-// ************************************************************************** //

Modified: branches/proto/v3/boost/test/utils/runtime/cla/validation.hpp
==============================================================================
--- branches/proto/v3/boost/test/utils/runtime/cla/validation.hpp (original)
+++ branches/proto/v3/boost/test/utils/runtime/cla/validation.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Use, modification, and distribution are subject to the
 // Boost Software License, Version 1.0. (See accompanying file
 // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -52,13 +52,4 @@
 
 #endif
 
-// ************************************************************************** //
-// Revision History:
-//
-// $Log$
-// Revision 1.1 2005/04/12 06:42:43 rogeeff
-// Runtime.Param library initial commit
-//
-// ************************************************************************** //
-
 #endif // BOOST_RT_CLA_VALIDATION_HPP_062604GER

Modified: branches/proto/v3/boost/test/utils/runtime/cla/validation.ipp
==============================================================================
--- branches/proto/v3/boost/test/utils/runtime/cla/validation.ipp (original)
+++ branches/proto/v3/boost/test/utils/runtime/cla/validation.ipp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Use, modification, and distribution are subject to the
 // Boost Software License, Version 1.0. (See accompanying file
 // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -20,6 +20,7 @@
 
 #include <boost/test/utils/runtime/cla/argv_traverser.hpp>
 #include <boost/test/utils/runtime/cla/validation.hpp>
+#include <boost/test/utils/runtime/validation.hpp> // BOOST_RT_PARAM_NAMESPACE::logic_error
 
 // Boost
 #include <boost/test/utils/basic_cstring/io.hpp>
@@ -61,13 +62,4 @@
 
 } // namespace boost
 
-// ************************************************************************** //
-// Revision History:
-//
-// $Log$
-// Revision 1.1 2005/04/12 06:42:43 rogeeff
-// Runtime.Param library initial commit
-//
-// ************************************************************************** //
-
 #endif // BOOST_RT_CLA_VALIDATION_IPP_070604GER

Modified: branches/proto/v3/boost/test/utils/runtime/cla/value_generator.hpp
==============================================================================
--- branches/proto/v3/boost/test/utils/runtime/cla/value_generator.hpp (original)
+++ branches/proto/v3/boost/test/utils/runtime/cla/value_generator.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Use, modification, and distribution are subject to the
 // Boost Software License, Version 1.0. (See accompanying file
 // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -78,13 +78,4 @@
 
 } // namespace boost
 
-// ************************************************************************** //
-// Revision History:
-//
-// $Log$
-// Revision 1.1 2005/04/12 06:42:43 rogeeff
-// Runtime.Param library initial commit
-//
-// ************************************************************************** //
-
 #endif // BOOST_RT_CLA_VALUE_GENERATOR_HPP_062604GER

Modified: branches/proto/v3/boost/test/utils/runtime/cla/value_handler.hpp
==============================================================================
--- branches/proto/v3/boost/test/utils/runtime/cla/value_handler.hpp (original)
+++ branches/proto/v3/boost/test/utils/runtime/cla/value_handler.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Use, modification, and distribution are subject to the
 // Boost Software License, Version 1.0. (See accompanying file
 // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -54,13 +54,4 @@
 
 } // namespace boost
 
-// ************************************************************************** //
-// Revision History:
-//
-// $Log$
-// Revision 1.1 2005/04/12 06:42:43 rogeeff
-// Runtime.Param library initial commit
-//
-// ************************************************************************** //
-
 #endif // BOOST_RT_CLA_VALUE_HANDLER_HPP_062604GER

Modified: branches/proto/v3/boost/test/utils/runtime/config.hpp
==============================================================================
--- branches/proto/v3/boost/test/utils/runtime/config.hpp (original)
+++ branches/proto/v3/boost/test/utils/runtime/config.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -28,6 +28,7 @@
 #include <boost/test/detail/config.hpp>
 #include <boost/test/utils/basic_cstring/basic_cstring.hpp>
 #include <boost/test/utils/wrap_stringstream.hpp>
+#include <boost/test/utils/basic_cstring/io.hpp> // operator<<(boost::runtime::cstring)
 
 // STL
 #include <string>
@@ -135,19 +136,4 @@
 
 } // namespace boost
 
-// ************************************************************************** //
-// Revision History:
-//
-// $Log$
-// Revision 1.3 2005/05/06 04:02:52 rogeeff
-// include ctdlib for setenv
-//
-// Revision 1.2 2005/05/05 05:55:31 rogeeff
-// portability fixes
-//
-// Revision 1.1 2005/04/12 06:42:42 rogeeff
-// Runtime.Param library initial commit
-//
-// ************************************************************************** //
-
 #endif // BOOST_RT_CONFIG_HPP_062604GER

Modified: branches/proto/v3/boost/test/utils/runtime/configuration.hpp
==============================================================================
--- branches/proto/v3/boost/test/utils/runtime/configuration.hpp (original)
+++ branches/proto/v3/boost/test/utils/runtime/configuration.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -58,13 +58,4 @@
 
 } // namespace boost
 
-// ************************************************************************** //
-// Revision History:
-//
-// $Log$
-// Revision 1.1 2005/04/12 06:42:42 rogeeff
-// Runtime.Param library initial commit
-//
-// ************************************************************************** //
-
 #endif // BOOST_RT_CONFIGURATION_HPP_062604GER

Modified: branches/proto/v3/boost/test/utils/runtime/env/environment.cpp
==============================================================================
--- branches/proto/v3/boost/test/utils/runtime/env/environment.cpp (original)
+++ branches/proto/v3/boost/test/utils/runtime/env/environment.cpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2004.
+// (C) Copyright Gennadiy Rozental 2004-2007.
 // Use, modification, and distribution are subject to the
 // Boost Software License, Version 1.0. (See accompanying file
 // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -21,12 +21,3 @@
 
 #define BOOST_RT_PARAM_INLINE
 #include <boost/test/utils/runtime/env/environment.ipp>
-
-// ************************************************************************** //
-// Revision History:
-//
-// $Log$
-// Revision 1.1 2005/04/12 06:42:43 rogeeff
-// Runtime.Param library initial commit
-//
-// ************************************************************************** //

Modified: branches/proto/v3/boost/test/utils/runtime/env/environment.hpp
==============================================================================
--- branches/proto/v3/boost/test/utils/runtime/env/environment.hpp (original)
+++ branches/proto/v3/boost/test/utils/runtime/env/environment.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -165,19 +165,4 @@
 
 #endif
 
-// ************************************************************************** //
-// Revision History:
-//
-// $Log$
-// Revision 1.3 2005/05/14 05:41:10 rogeeff
-// *** empty log message ***
-//
-// Revision 1.2 2005/05/14 05:34:57 rogeeff
-// *** empty log message ***
-//
-// Revision 1.1 2005/04/12 06:42:43 rogeeff
-// Runtime.Param library initial commit
-//
-// ************************************************************************** //
-
 #endif // BOOST_RT_ENV_ENVIRONMENT_HPP_062604GER

Modified: branches/proto/v3/boost/test/utils/runtime/env/environment.ipp
==============================================================================
--- branches/proto/v3/boost/test/utils/runtime/env/environment.ipp (original)
+++ branches/proto/v3/boost/test/utils/runtime/env/environment.ipp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -114,25 +114,4 @@
 
 } // namespace boost
 
-// ************************************************************************** //
-// Revision History:
-//
-// $Log$
-// Revision 1.5 2005/05/14 05:41:10 rogeeff
-// *** empty log message ***
-//
-// Revision 1.4 2005/05/05 05:55:45 rogeeff
-// portability fixes
-//
-// Revision 1.3 2005/05/03 05:02:50 rogeeff
-// como fixes
-//
-// Revision 1.2 2005/04/27 03:29:52 rogeeff
-// portability fix
-//
-// Revision 1.1 2005/04/12 06:42:43 rogeeff
-// Runtime.Param library initial commit
-//
-// ************************************************************************** //
-
 #endif // BOOST_RT_ENV_ENVIRONMENT_IPP_062904GER

Modified: branches/proto/v3/boost/test/utils/runtime/env/fwd.hpp
==============================================================================
--- branches/proto/v3/boost/test/utils/runtime/env/fwd.hpp (original)
+++ branches/proto/v3/boost/test/utils/runtime/env/fwd.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -45,13 +45,4 @@
 
 } // namespace boost
 
-// ************************************************************************** //
-// Revision History:
-//
-// $Log$
-// Revision 1.1 2005/04/12 06:42:43 rogeeff
-// Runtime.Param library initial commit
-//
-// ************************************************************************** //
-
 #endif // BOOST_RT_ENV_FWD_HPP_062604GER

Modified: branches/proto/v3/boost/test/utils/runtime/env/modifier.hpp
==============================================================================
--- branches/proto/v3/boost/test/utils/runtime/env/modifier.hpp (original)
+++ branches/proto/v3/boost/test/utils/runtime/env/modifier.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Use, modification, and distribution are subject to the
 // Boost Software License, Version 1.0. (See accompanying file
 // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -44,13 +44,4 @@
 
 } // namespace boost
 
-// ************************************************************************** //
-// Revision History:
-//
-// $Log$
-// Revision 1.1 2005/04/12 06:42:43 rogeeff
-// Runtime.Param library initial commit
-//
-// ************************************************************************** //
-
 #endif // BOOST_RT_ENV_MODIFIER_HPP_062604GER

Modified: branches/proto/v3/boost/test/utils/runtime/env/variable.hpp
==============================================================================
--- branches/proto/v3/boost/test/utils/runtime/env/variable.hpp (original)
+++ branches/proto/v3/boost/test/utils/runtime/env/variable.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -210,16 +210,4 @@
 
 } // namespace boost
 
-// ************************************************************************** //
-// Revision History:
-//
-// $Log$
-// Revision 1.2 2005/05/05 05:55:45 rogeeff
-// portability fixes
-//
-// Revision 1.1 2005/04/12 06:42:43 rogeeff
-// Runtime.Param library initial commit
-//
-// ************************************************************************** //
-
 #endif // BOOST_RT_ENV_VARIABLE_HPP_062604GER

Modified: branches/proto/v3/boost/test/utils/runtime/file/config_file.cpp
==============================================================================
--- branches/proto/v3/boost/test/utils/runtime/file/config_file.cpp (original)
+++ branches/proto/v3/boost/test/utils/runtime/file/config_file.cpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Use, modification, and distribution are subject to the
 // Boost Software License, Version 1.0. (See accompanying file
 // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -246,11 +246,4 @@
 
 } // namespace boost
 
-// ************************************************************************** //
-// Revision History:
-//
-// $Log$
-// Revision 1.1 2005/04/12 06:42:43 rogeeff
-// Runtime.Param library initial commit
-//
-// ************************************************************************** //
+// EOF

Modified: branches/proto/v3/boost/test/utils/runtime/file/config_file.hpp
==============================================================================
--- branches/proto/v3/boost/test/utils/runtime/file/config_file.hpp (original)
+++ branches/proto/v3/boost/test/utils/runtime/file/config_file.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Use, modification, and distribution are subject to the
 // Boost Software License, Version 1.0. (See accompanying file
 // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -179,13 +179,4 @@
 
 } // namespace boost
 
-// ************************************************************************** //
-// Revision History:
-//
-// $Log$
-// Revision 1.1 2005/04/12 06:42:44 rogeeff
-// Runtime.Param library initial commit
-//
-// ************************************************************************** //
-
 #endif // BOOST_RT_FILE_CONFIG_FILE_HPP_010105GER

Modified: branches/proto/v3/boost/test/utils/runtime/file/config_file_iterator.cpp
==============================================================================
--- branches/proto/v3/boost/test/utils/runtime/file/config_file_iterator.cpp (original)
+++ branches/proto/v3/boost/test/utils/runtime/file/config_file_iterator.cpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Use, modification, and distribution are subject to the
 // Boost Software License, Version 1.0. (See accompanying file
 // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -677,11 +677,4 @@
 
 } // namespace boost
 
-// ************************************************************************** //
-// Revision History:
-//
-// $Log$
-// Revision 1.1 2005/04/12 06:42:44 rogeeff
-// Runtime.Param library initial commit
-//
-// ************************************************************************** //
+// EOF

Modified: branches/proto/v3/boost/test/utils/runtime/file/config_file_iterator.hpp
==============================================================================
--- branches/proto/v3/boost/test/utils/runtime/file/config_file_iterator.hpp (original)
+++ branches/proto/v3/boost/test/utils/runtime/file/config_file_iterator.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Use, modification, and distribution are subject to the
 // Boost Software License, Version 1.0. (See accompanying file
 // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -163,16 +163,4 @@
 
 } // namespace boost
 
-// ************************************************************************** //
-// Revision History:
-//
-// $Log$
-// Revision 1.2 2005/04/17 15:50:38 rogeeff
-// portability fixes
-//
-// Revision 1.1 2005/04/12 06:42:44 rogeeff
-// Runtime.Param library initial commit
-//
-// ************************************************************************** //
-
 #endif // BOOST_RT_FILE_CONFIG_FILE_ITERATOR_HPP_062604GER

Modified: branches/proto/v3/boost/test/utils/runtime/fwd.hpp
==============================================================================
--- branches/proto/v3/boost/test/utils/runtime/fwd.hpp (original)
+++ branches/proto/v3/boost/test/utils/runtime/fwd.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -38,13 +38,4 @@
 
 } // namespace boost
 
-// ************************************************************************** //
-// Revision History:
-//
-// $Log$
-// Revision 1.1 2005/04/12 06:42:42 rogeeff
-// Runtime.Param library initial commit
-//
-// ************************************************************************** //
-
 #endif // BOOST_RT_FWD_HPP_062604GER

Modified: branches/proto/v3/boost/test/utils/runtime/interpret_argument_value.hpp
==============================================================================
--- branches/proto/v3/boost/test/utils/runtime/interpret_argument_value.hpp (original)
+++ branches/proto/v3/boost/test/utils/runtime/interpret_argument_value.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -160,13 +160,4 @@
 
 } // namespace boost
 
-// ************************************************************************** //
-// Revision History:
-//
-// $Log$
-// Revision 1.1 2005/04/12 06:42:42 rogeeff
-// Runtime.Param library initial commit
-//
-// ************************************************************************** //
-
 #endif // BOOST_RT_INTERPRET_ARGUMENT_VALUE_HPP_062604GER

Modified: branches/proto/v3/boost/test/utils/runtime/parameter.hpp
==============================================================================
--- branches/proto/v3/boost/test/utils/runtime/parameter.hpp (original)
+++ branches/proto/v3/boost/test/utils/runtime/parameter.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -35,13 +35,4 @@
 
 } // namespace boost
 
-// ************************************************************************** //
-// Revision History:
-//
-// $Log$
-// Revision 1.1 2005/04/12 06:42:42 rogeeff
-// Runtime.Param library initial commit
-//
-// ************************************************************************** //
-
 #endif // BOOST_RT_PARAMETER_HPP_062604GER

Modified: branches/proto/v3/boost/test/utils/runtime/trace.hpp
==============================================================================
--- branches/proto/v3/boost/test/utils/runtime/trace.hpp (original)
+++ branches/proto/v3/boost/test/utils/runtime/trace.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -27,13 +27,4 @@
 # define BOOST_RT_PARAM_TRACE( str )
 #endif
 
-// ************************************************************************** //
-// Revision History:
-//
-// $Log$
-// Revision 1.1 2005/04/12 06:42:42 rogeeff
-// Runtime.Param library initial commit
-//
-// ************************************************************************** //
-
 #endif // BOOST_RT_TRACE_HPP_062604GER

Modified: branches/proto/v3/boost/test/utils/runtime/validation.hpp
==============================================================================
--- branches/proto/v3/boost/test/utils/runtime/validation.hpp (original)
+++ branches/proto/v3/boost/test/utils/runtime/validation.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -79,13 +79,4 @@
 
 } // namespace boost
 
-// ************************************************************************** //
-// Revision History:
-//
-// $Log$
-// Revision 1.1 2005/04/12 06:42:42 rogeeff
-// Runtime.Param library initial commit
-//
-// ************************************************************************** //
-
 #endif // BOOST_RT_VALIDATION_HPP_062604GER

Modified: branches/proto/v3/boost/test/utils/trivial_singleton.hpp
==============================================================================
--- branches/proto/v3/boost/test/utils/trivial_singleton.hpp (original)
+++ branches/proto/v3/boost/test/utils/trivial_singleton.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2005.
+// (C) Copyright Gennadiy Rozental 2005-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -71,23 +71,4 @@
 
 #include <boost/test/detail/enable_warnings.hpp>
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.4 2006/07/28 14:54:51 rogeeff
-// include missing headers
-//
-// Revision 1.3 2006/01/01 17:29:38 dgregor
-// Work around anonymous namespace bug in Apple GCC 3.3
-//
-// Revision 1.2 2005/06/15 07:21:51 schoepflin
-// Tru64 needs an explicit instantiation of the singleton template. Otherwise we
-// end up with multiple singleton instances.
-//
-// Revision 1.1 2005/02/20 08:27:08 rogeeff
-// This a major update for Boost.Test framework. See release docs for complete list of fixes/updates
-//
-// ***************************************************************************
-
 #endif // BOOST_TEST_TRIVIAL_SIGNLETON_HPP_020505GER

Modified: branches/proto/v3/boost/test/utils/wrap_stringstream.hpp
==============================================================================
--- branches/proto/v3/boost/test/utils/wrap_stringstream.hpp (original)
+++ branches/proto/v3/boost/test/utils/wrap_stringstream.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2002-2005.
+// (C) Copyright Gennadiy Rozental 2002-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -163,40 +163,4 @@
 
 #include <boost/test/detail/enable_warnings.hpp>
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.9 2005/05/13 05:55:46 rogeeff
-// gcc 2.95 fix
-//
-// Revision 1.8 2005/05/08 08:55:09 rogeeff
-// typos and missing descriptions fixed
-//
-// Revision 1.7 2005/04/30 17:55:15 rogeeff
-// disable manipulator output for cw
-//
-// Revision 1.6 2005/02/20 08:27:08 rogeeff
-// This a major update for Boost.Test framework. See release docs for complete list of fixes/updates
-//
-// Revision 1.5 2005/02/01 06:40:07 rogeeff
-// copyright update
-// old log entries removed
-// minor stilistic changes
-// depricated tools removed
-//
-// Revision 1.4 2005/01/31 07:50:06 rogeeff
-// cdecl portability fix
-//
-// Revision 1.3 2005/01/31 06:02:15 rogeeff
-// BOOST_TEST_CALL_DECL correctness fixes
-//
-// Revision 1.2 2005/01/30 01:43:57 rogeeff
-// warnings suppressed
-//
-// Revision 1.1 2005/01/22 18:21:40 rogeeff
-// moved sharable staff into utils
-//
-// ***************************************************************************
-
 #endif // BOOST_WRAP_STRINGSTREAM_HPP_071894GER

Modified: branches/proto/v3/boost/test/utils/xml_printer.hpp
==============================================================================
--- branches/proto/v3/boost/test/utils/xml_printer.hpp (original)
+++ branches/proto/v3/boost/test/utils/xml_printer.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,4 @@
-// (C) Copyright Gennadiy Rozental 2004-2005.
+// (C) Copyright Gennadiy Rozental 2004-2007.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -116,38 +116,4 @@
 
 #include <boost/test/detail/enable_warnings.hpp>
 
-// ***************************************************************************
-// Revision History :
-//
-// $Log$
-// Revision 1.7 2005/07/14 15:50:28 dgregor
-// Untabify
-//
-// Revision 1.6 2005/04/29 06:31:18 rogeeff
-// bug fix for incorrect XML output
-//
-// Revision 1.5 2005/02/20 08:27:08 rogeeff
-// This a major update for Boost.Test framework. See release docs for complete list of fixes/updates
-//
-// Revision 1.4 2005/02/01 06:40:08 rogeeff
-// copyright update
-// old log entries removed
-// minor stilistic changes
-// depricated tools removed
-//
-// Revision 1.3 2005/01/23 09:59:34 vawjr
-// Changed - all the \r\r\n to \r\n in the windows flavor of the file
-// because VC++ 8.0 complains and refuses to compile
-//
-// Revision 1.2 2005/01/22 19:22:13 rogeeff
-// implementation moved into headers section to eliminate dependency of included/minimal component on src directory
-//
-// Revision 1.1 2005/01/22 18:21:40 rogeeff
-// moved sharable staff into utils
-//
-// Revision 1.3 2005/01/21 07:31:44 rogeeff
-// xml helper facilities reworked to present manipulator interfaces
-//
-// ***************************************************************************
-
 #endif // BOOST_TEST_XML_PRINTER_HPP_071894GER

Modified: branches/proto/v3/boost/thread/condition_variable.hpp
==============================================================================
--- branches/proto/v3/boost/thread/condition_variable.hpp (original)
+++ branches/proto/v3/boost/thread/condition_variable.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -10,6 +10,12 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/thread/detail/platform.hpp>
-#include BOOST_THREAD_PLATFORM(condition_variable.hpp)
+#if defined(BOOST_THREAD_PLATFORM_WIN32)
+#include <boost/thread/win32/condition_variable.hpp>
+#elif defined(BOOST_THREAD_PLATFORM_PTHREAD)
+#include <boost/thread/pthread/condition_variable.hpp>
+#else
+#error "Boost threads unavailable on this platform"
+#endif
 
 #endif

Modified: branches/proto/v3/boost/thread/detail/config.hpp
==============================================================================
--- branches/proto/v3/boost/thread/detail/config.hpp (original)
+++ branches/proto/v3/boost/thread/detail/config.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -17,8 +17,7 @@
 # pragma warn -8066 // Unreachable code
 #endif
 
-// insist on threading support being available:
-#include <boost/config/requires_threads.hpp>
+#include "platform.hpp"
 
 // compatibility with the rest of Boost's auto-linking code:
 #if defined(BOOST_THREAD_DYN_DLL) || defined(BOOST_ALL_DYN_LINK)
@@ -31,7 +30,7 @@
 #elif defined(BOOST_THREAD_USE_DLL) //Use dll
 #elif defined(BOOST_THREAD_USE_LIB) //Use lib
 #else //Use default
-# if defined(BOOST_HAS_WINTHREADS)
+# if defined(BOOST_THREAD_PLATFORM_WIN32)
 # if defined(BOOST_MSVC) || defined(BOOST_INTEL_WIN)
             //For compilers supporting auto-tss cleanup
             //with Boost.Threads lib, use Boost.Threads lib

Modified: branches/proto/v3/boost/thread/detail/platform.hpp
==============================================================================
--- branches/proto/v3/boost/thread/detail/platform.hpp (original)
+++ branches/proto/v3/boost/thread/detail/platform.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,4 +1,5 @@
 // Copyright 2006 Roland Schwarz.
+// (C) Copyright 2007 Anthony Williams
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -56,17 +57,15 @@
 // available the preprocessor will fail with a diagnostic message.
  
 #if defined(BOOST_THREAD_POSIX)
-# define BOOST_THREAD_PPFX pthread
+# define BOOST_THREAD_PLATFORM_PTHREAD
 #else
 # if defined(BOOST_THREAD_WIN32)
-# define BOOST_THREAD_PPFX win32
+# define BOOST_THREAD_PLATFORM_WIN32
 # elif defined(BOOST_HAS_PTHREADS)
-# define BOOST_THREAD_PPFX pthread
+# define BOOST_THREAD_PLATFORM_PTHREAD
 # else
 # error "Sorry, no boost threads are available for this platform."
 # endif
 #endif
 
-#define BOOST_THREAD_PLATFORM(header) <boost/thread/BOOST_THREAD_PPFX/header>
-
 #endif // BOOST_THREAD_RS06040501_HPP

Modified: branches/proto/v3/boost/thread/mutex.hpp
==============================================================================
--- branches/proto/v3/boost/thread/mutex.hpp (original)
+++ branches/proto/v3/boost/thread/mutex.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -10,6 +10,12 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/thread/detail/platform.hpp>
-#include BOOST_THREAD_PLATFORM(mutex.hpp)
+#if defined(BOOST_THREAD_PLATFORM_WIN32)
+#include <boost/thread/win32/mutex.hpp>
+#elif defined(BOOST_THREAD_PLATFORM_PTHREAD)
+#include <boost/thread/pthread/mutex.hpp>
+#else
+#error "Boost threads unavailable on this platform"
+#endif
 
 #endif

Modified: branches/proto/v3/boost/thread/once.hpp
==============================================================================
--- branches/proto/v3/boost/thread/once.hpp (original)
+++ branches/proto/v3/boost/thread/once.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -10,7 +10,13 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/thread/detail/platform.hpp>
-#include BOOST_THREAD_PLATFORM(once.hpp)
+#if defined(BOOST_THREAD_PLATFORM_WIN32)
+#include <boost/thread/win32/once.hpp>
+#elif defined(BOOST_THREAD_PLATFORM_PTHREAD)
+#include <boost/thread/pthread/once.hpp>
+#else
+#error "Boost threads unavailable on this platform"
+#endif
 
 namespace boost
 {

Modified: branches/proto/v3/boost/thread/pthread/condition_variable.hpp
==============================================================================
--- branches/proto/v3/boost/thread/pthread/condition_variable.hpp (original)
+++ branches/proto/v3/boost/thread/pthread/condition_variable.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -150,6 +150,12 @@
             return true;
         }
 
+ template<typename lock_type,typename duration_type,typename predicate_type>
+ bool timed_wait(lock_type& m,duration_type const& wait_duration,predicate_type pred)
+ {
+ return timed_wait(m,get_system_time()+wait_duration,pred);
+ }
+
         void notify_one()
         {
             boost::pthread::pthread_mutex_scoped_lock internal_lock(&internal_mutex);

Modified: branches/proto/v3/boost/thread/pthread/condition_variable_fwd.hpp
==============================================================================
--- branches/proto/v3/boost/thread/pthread/condition_variable_fwd.hpp (original)
+++ branches/proto/v3/boost/thread/pthread/condition_variable_fwd.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -44,6 +44,12 @@
             return true;
         }
 
+ template<typename duration_type,typename predicate_type>
+ bool timed_wait(unique_lock<mutex>& m,duration_type const& wait_duration,predicate_type pred)
+ {
+ return timed_wait(m,get_system_time()+wait_duration,pred);
+ }
+
         void notify_one();
         void notify_all();
     };

Modified: branches/proto/v3/boost/thread/pthread/once.hpp
==============================================================================
--- branches/proto/v3/boost/thread/pthread/once.hpp (original)
+++ branches/proto/v3/boost/thread/pthread/once.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -27,9 +27,9 @@
     namespace detail
     {
         BOOST_THREAD_DECL boost::uintmax_t& get_once_per_thread_epoch();
- extern BOOST_THREAD_DECL boost::uintmax_t once_global_epoch;
- extern BOOST_THREAD_DECL pthread_mutex_t once_epoch_mutex;
- extern BOOST_THREAD_DECL pthread_cond_t once_epoch_cv;
+ BOOST_THREAD_DECL extern boost::uintmax_t once_global_epoch;
+ BOOST_THREAD_DECL extern pthread_mutex_t once_epoch_mutex;
+ BOOST_THREAD_DECL extern pthread_cond_t once_epoch_cv;
     }
     
 #define BOOST_ONCE_INITIAL_FLAG_VALUE -1

Modified: branches/proto/v3/boost/thread/pthread/thread_data.hpp
==============================================================================
--- branches/proto/v3/boost/thread/pthread/thread_data.hpp (original)
+++ branches/proto/v3/boost/thread/pthread/thread_data.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -20,6 +20,7 @@
     namespace detail
     {
         struct thread_exit_callback_node;
+ struct tss_data_node;
         
         struct thread_data_base
         {
@@ -33,13 +34,14 @@
             bool join_started;
             bool joined;
             boost::detail::thread_exit_callback_node* thread_exit_callbacks;
+ boost::detail::tss_data_node* tss_data;
             bool interrupt_enabled;
             bool interrupt_requested;
             pthread_cond_t* current_cond;
 
             thread_data_base():
                 done(false),join_started(false),joined(false),
- thread_exit_callbacks(0),
+ thread_exit_callbacks(0),tss_data(0),
                 interrupt_enabled(true),
                 interrupt_requested(false),
                 current_cond(0)

Modified: branches/proto/v3/boost/thread/pthread/tss.hpp
==============================================================================
--- branches/proto/v3/boost/thread/pthread/tss.hpp (original)
+++ branches/proto/v3/boost/thread/pthread/tss.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,109 +1,102 @@
 #ifndef BOOST_THREAD_PTHREAD_TSS_HPP
 #define BOOST_THREAD_PTHREAD_TSS_HPP
 
-// Copyright (C) 2001-2003 William E. Kempf
-// Copyright (C) 2006 Roland Schwarz
-// Copyright (C) 2007 Anthony Williams
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/thread/detail/config.hpp>
-#include <boost/utility.hpp>
-#include <boost/function.hpp>
-#include <boost/thread/exceptions.hpp>
-
-#include <pthread.h>
-
-namespace boost {
-
-// disable warnings about non dll import
-// see: http://www.boost.org/more/separate_compilation.html#dlls
-#ifdef BOOST_MSVC
-# pragma warning(push)
-# pragma warning(disable: 4251 4231 4660 4275)
-#endif
-
-namespace detail {
-
-class BOOST_THREAD_DECL tss : private noncopyable
-{
-public:
- tss(boost::function1<void, void*>* pcleanup) {
- if (pcleanup == 0) throw boost::thread_resource_error();
- try
- {
- init(pcleanup);
- }
- catch (...)
- {
- delete pcleanup;
- throw boost::thread_resource_error();
- }
- }
+// Distributed under the Boost Software License, Version 1.0. (See
+// accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+// (C) Copyright 2007 Anthony Williams
 
- ~tss();
- void* get() const;
- void set(void* value);
- void cleanup(void* p);
+#include <boost/shared_ptr.hpp>
 
-private:
- unsigned int m_slot; //This is a "pseudo-slot", not a native slot
-
- void init(boost::function1<void, void*>* pcleanup);
-};
-
-template <typename T>
-struct tss_adapter
-{
- template <typename F>
- tss_adapter(const F& cleanup) : m_cleanup(cleanup) { }
- void operator()(void* p) { m_cleanup(static_cast<T*>(p)); }
- boost::function1<void, T*> m_cleanup;
-};
-
-} // namespace detail
-
-template <typename T>
-class thread_specific_ptr : private noncopyable
+namespace boost
 {
-public:
- thread_specific_ptr()
- : m_tss(new boost::function1<void, void*>(
- boost::detail::tss_adapter<T>(
- &thread_specific_ptr<T>::cleanup)))
- {
- }
- thread_specific_ptr(void (*clean)(T*))
- : m_tss(new boost::function1<void, void*>(
- boost::detail::tss_adapter<T>(clean)))
+ namespace detail
     {
+ struct tss_cleanup_function
+ {
+ virtual ~tss_cleanup_function()
+ {}
+
+ virtual void operator()(void* data)=0;
+ };
+
+ BOOST_THREAD_DECL void set_tss_data(void const* key,boost::shared_ptr<tss_cleanup_function> func,void* tss_data,bool cleanup_existing);
+ BOOST_THREAD_DECL void* get_tss_data(void const* key);
     }
- ~thread_specific_ptr() { reset(); }
 
- T* get() const { return static_cast<T*>(m_tss.get()); }
- T* operator->() const { return get(); }
- T& operator*() const { return *get(); }
- T* release() { T* temp = get(); if (temp) m_tss.set(0); return temp; }
- void reset(T* p=0)
+ template <typename T>
+ class thread_specific_ptr
     {
- T* cur = get();
- if (cur == p) return;
- m_tss.set(p);
- if (cur) m_tss.cleanup(cur);
- }
-
-private:
- static void cleanup(T* p) { delete p; }
- detail::tss m_tss;
-};
-
-#ifdef BOOST_MSVC
-# pragma warning(pop)
-#endif
-
-} // namespace boost
+ private:
+ thread_specific_ptr(thread_specific_ptr&);
+ thread_specific_ptr& operator=(thread_specific_ptr&);
 
+ struct delete_data:
+ detail::tss_cleanup_function
+ {
+ void operator()(void* data)
+ {
+ delete static_cast<T*>(data);
+ }
+ };
+
+ struct run_custom_cleanup_function:
+ detail::tss_cleanup_function
+ {
+ void (*cleanup_function)(T*);
+
+ explicit run_custom_cleanup_function(void (*cleanup_function_)(T*)):
+ cleanup_function(cleanup_function_)
+ {}
+
+ void operator()(void* data)
+ {
+ cleanup_function(data);
+ }
+ };
+
+
+ boost::shared_ptr<detail::tss_cleanup_function> cleanup;
+
+ public:
+ thread_specific_ptr():
+ cleanup(new delete_data)
+ {}
+ explicit thread_specific_ptr(void (*func_)(T*)):
+ cleanup(new run_custom_cleanup_function(func_))
+ {}
+ ~thread_specific_ptr()
+ {
+ reset();
+ }
 
+ T* get() const
+ {
+ return static_cast<T*>(detail::get_tss_data(this));
+ }
+ T* operator->() const
+ {
+ return get();
+ }
+ T& operator*() const
+ {
+ return *get();
+ }
+ T* release()
+ {
+ T* const temp=get();
+ detail::set_tss_data(this,0,0,false);
+ return temp;
+ }
+ void reset(T* new_value=0)
+ {
+ T* const current_value=get();
+ if(current_value!=new_value)
+ {
+ detail::set_tss_data(this,cleanup,new_value,true);
+ }
+ }
+ };
+}
 
 #endif

Modified: branches/proto/v3/boost/thread/recursive_mutex.hpp
==============================================================================
--- branches/proto/v3/boost/thread/recursive_mutex.hpp (original)
+++ branches/proto/v3/boost/thread/recursive_mutex.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -10,6 +10,12 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/thread/detail/platform.hpp>
-#include BOOST_THREAD_PLATFORM(recursive_mutex.hpp)
+#if defined(BOOST_THREAD_PLATFORM_WIN32)
+#include <boost/thread/win32/recursive_mutex.hpp>
+#elif defined(BOOST_THREAD_PLATFORM_PTHREAD)
+#include <boost/thread/pthread/recursive_mutex.hpp>
+#else
+#error "Boost threads unavailable on this platform"
+#endif
 
 #endif

Modified: branches/proto/v3/boost/thread/shared_mutex.hpp
==============================================================================
--- branches/proto/v3/boost/thread/shared_mutex.hpp (original)
+++ branches/proto/v3/boost/thread/shared_mutex.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -10,6 +10,12 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/thread/detail/platform.hpp>
-#include BOOST_THREAD_PLATFORM(shared_mutex.hpp)
+#if defined(BOOST_THREAD_PLATFORM_WIN32)
+#include <boost/thread/win32/shared_mutex.hpp>
+#elif defined(BOOST_THREAD_PLATFORM_PTHREAD)
+#include <boost/thread/pthread/shared_mutex.hpp>
+#else
+#error "Boost threads unavailable on this platform"
+#endif
 
 #endif

Modified: branches/proto/v3/boost/thread/thread.hpp
==============================================================================
--- branches/proto/v3/boost/thread/thread.hpp (original)
+++ branches/proto/v3/boost/thread/thread.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -10,6 +10,13 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/thread/detail/platform.hpp>
-#include BOOST_THREAD_PLATFORM(thread.hpp)
+
+#if defined(BOOST_THREAD_PLATFORM_WIN32)
+#include <boost/thread/win32/thread.hpp>
+#elif defined(BOOST_THREAD_PLATFORM_PTHREAD)
+#include <boost/thread/pthread/thread.hpp>
+#else
+#error "Boost threads unavailable on this platform"
+#endif
 
 #endif

Modified: branches/proto/v3/boost/thread/tss.hpp
==============================================================================
--- branches/proto/v3/boost/thread/tss.hpp (original)
+++ branches/proto/v3/boost/thread/tss.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -7,6 +7,12 @@
 #define BOOST_THREAD_TSS_HPP
 
 #include <boost/thread/detail/platform.hpp>
-#include BOOST_THREAD_PLATFORM(tss.hpp)
+#if defined(BOOST_THREAD_PLATFORM_WIN32)
+#include <boost/thread/win32/tss.hpp>
+#elif defined(BOOST_THREAD_PLATFORM_PTHREAD)
+#include <boost/thread/pthread/tss.hpp>
+#else
+#error "Boost threads unavailable on this platform"
+#endif
 
 #endif

Modified: branches/proto/v3/boost/thread/win32/condition_variable.hpp
==============================================================================
--- branches/proto/v3/boost/thread/win32/condition_variable.hpp (original)
+++ branches/proto/v3/boost/thread/win32/condition_variable.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -263,6 +263,11 @@
             }
             return true;
         }
+ template<typename duration_type,typename predicate_type>
+ bool timed_wait(unique_lock<mutex>& m,duration_type const& wait_duration,predicate_type pred)
+ {
+ return timed_wait(m,get_system_time()+wait_duration,pred);
+ }
     };
     
     class condition_variable_any:
@@ -297,6 +302,12 @@
             }
             return true;
         }
+
+ template<typename lock_type,typename duration_type,typename predicate_type>
+ bool timed_wait(lock_type& m,duration_type const& wait_duration,predicate_type pred)
+ {
+ return timed_wait(m,get_system_time()+wait_duration,pred);
+ }
     };
 
 }

Modified: branches/proto/v3/boost/thread/win32/thread.hpp
==============================================================================
--- branches/proto/v3/boost/thread/win32/thread.hpp (original)
+++ branches/proto/v3/boost/thread/win32/thread.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -15,6 +15,7 @@
 #include "thread_primitives.hpp"
 #include "thread_heap_alloc.hpp"
 #include <boost/utility.hpp>
+#include <boost/assert.hpp>
 #include <list>
 #include <algorithm>
 #include <boost/ref.hpp>
@@ -62,8 +63,16 @@
                 }
             }
 
+ void interrupt()
+ {
+ BOOST_VERIFY(detail::win32::SetEvent(interruption_handle)!=0);
+ }
+
+
             virtual void run()=0;
         };
+
+ typedef boost::intrusive_ptr<detail::thread_data_base> thread_data_ptr;
     }
 
     class BOOST_THREAD_DECL thread
@@ -94,15 +103,15 @@
         };
         
         mutable boost::mutex thread_info_mutex;
- boost::intrusive_ptr<detail::thread_data_base> thread_info;
+ detail::thread_data_ptr thread_info;
 
         static unsigned __stdcall thread_start_function(void* param);
 
         void start_thread();
         
- explicit thread(boost::intrusive_ptr<detail::thread_data_base> data);
+ explicit thread(detail::thread_data_ptr data);
 
- boost::intrusive_ptr<detail::thread_data_base> get_thread_info() const;
+ detail::thread_data_ptr get_thread_info() const;
     public:
         thread();
         ~thread();
@@ -155,12 +164,8 @@
         static void sleep(const system_time& xt);
 
         // extensions
- class interruption_handle;
- interruption_handle get_interruption_handle() const;
         void interrupt();
         bool interruption_requested() const;
-
- static thread self();
     };
 
     template<typename F>
@@ -214,7 +219,6 @@
         void BOOST_THREAD_DECL interruption_point();
         bool BOOST_THREAD_DECL interruption_enabled();
         bool BOOST_THREAD_DECL interruption_requested();
- thread::interruption_handle BOOST_THREAD_DECL get_interruption_handle();
 
         void BOOST_THREAD_DECL yield();
         template<typename TimeDuration>
@@ -227,54 +231,63 @@
     class thread::id
     {
     private:
- unsigned thread_id;
+ detail::thread_data_ptr thread_data;
             
- id(unsigned thread_id_):
- thread_id(thread_id_)
+ id(detail::thread_data_ptr thread_data_):
+ thread_data(thread_data_)
         {}
         friend class thread;
         friend id this_thread::get_id();
     public:
         id():
- thread_id(0)
+ thread_data(0)
         {}
             
         bool operator==(const id& y) const
         {
- return thread_id==y.thread_id;
+ return thread_data==y.thread_data;
         }
         
         bool operator!=(const id& y) const
         {
- return thread_id!=y.thread_id;
+ return thread_data!=y.thread_data;
         }
         
         bool operator<(const id& y) const
         {
- return thread_id<y.thread_id;
+ return thread_data<y.thread_data;
         }
         
         bool operator>(const id& y) const
         {
- return thread_id>y.thread_id;
+ return y.thread_data<thread_data;
         }
         
         bool operator<=(const id& y) const
         {
- return thread_id<=y.thread_id;
+ return !(y.thread_data<thread_data);
         }
         
         bool operator>=(const id& y) const
         {
- return thread_id>=y.thread_id;
+ return !(thread_data<y.thread_data);
         }
 
         template<class charT, class traits>
         friend std::basic_ostream<charT, traits>&
         operator<<(std::basic_ostream<charT, traits>& os, const id& x)
         {
- return os<<x.thread_id;
+ return os<<x.thread_data;
         }
+
+ void interrupt()
+ {
+ if(thread_data)
+ {
+ thread_data->interrupt();
+ }
+ }
+
     };
 
     inline bool thread::operator==(const thread& other) const
@@ -286,56 +299,6 @@
     {
         return get_id()!=other.get_id();
     }
-
- class thread::interruption_handle
- {
- private:
- boost::detail::win32::handle_manager handle;
- friend class thread;
- friend interruption_handle this_thread::get_interruption_handle();
-
- interruption_handle(detail::win32::handle h_):
- handle(h_)
- {}
- public:
- interruption_handle(interruption_handle const& other):
- handle(other.handle.duplicate())
- {}
- interruption_handle():
- handle(0)
- {}
-
- void swap(interruption_handle& other)
- {
- handle.swap(other.handle);
- }
-
- interruption_handle& operator=(interruption_handle const& other)
- {
- interruption_handle temp(other);
- swap(temp);
- return *this;
- }
-
- void reset()
- {
- handle=0;
- }
-
- void interrupt()
- {
- if(handle)
- {
- detail::win32::SetEvent(handle);
- }
- }
-
- typedef void(interruption_handle::*bool_type)();
- operator bool_type() const
- {
- return handle?&interruption_handle::interrupt:0;
- }
- };
         
     namespace detail
     {

Modified: branches/proto/v3/boost/token_functions.hpp
==============================================================================
--- branches/proto/v3/boost/token_functions.hpp (original)
+++ branches/proto/v3/boost/token_functions.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -336,10 +336,12 @@
         return false;
 
       if (current_offset_ == offsets_.size())
+ {
         if (wrap_offsets_)
           current_offset_=0;
         else
           return false;
+ }
       
       int c = offsets_[current_offset_];
       int i = 0;
@@ -449,12 +451,16 @@
         
         // Handle empty token at the end
         if (next == end)
- if (m_output_done == false) {
+ {
+ if (m_output_done == false)
+ {
             m_output_done = true;
             assigner::assign(start,next,tok);
             return true;
- } else
+ }
+ else
             return false;
+ }
         
         if (is_kept(*next)) {
           if (m_output_done == false)

Modified: branches/proto/v3/boost/token_iterator.hpp
==============================================================================
--- branches/proto/v3/boost/token_iterator.hpp (original)
+++ branches/proto/v3/boost/token_iterator.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -84,7 +84,7 @@
             token_iterator<TokenizerFunc, OtherIter,Type> const& t
             , typename enable_if_convertible<OtherIter, Iterator>::type* = 0)
             : f_(t.tokenizer_function()),begin_(t.base())
- ,end_(t.end()),valid_(t.at_end()),tok_(t.current_token()) {}
+ ,end_(t.end()),valid_(!t.at_end()),tok_(t.current_token()) {}
 
       Iterator base()const{return begin_;}
 
@@ -94,7 +94,7 @@
 
       Type current_token()const{return tok_;}
 
- bool at_end()const{return valid_;}
+ bool at_end()const{return !valid_;}
 
 
 

Modified: branches/proto/v3/boost/type_traits/is_abstract.hpp
==============================================================================
--- branches/proto/v3/boost/type_traits/is_abstract.hpp (original)
+++ branches/proto/v3/boost/type_traits/is_abstract.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -85,12 +85,12 @@
 #ifdef __GNUC__
    BOOST_STATIC_CONSTANT(unsigned, s1 = sizeof(is_abstract_imp2<T>::template check_sig<T>(0)));
 #else
-#if BOOST_WORKAROUND(BOOST_MSVC, > 1400)
+#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400)
 #pragma warning(push)
 #pragma warning(disable:6334)
 #endif
    BOOST_STATIC_CONSTANT(unsigned, s1 = sizeof(check_sig<T>(0)));
-#if BOOST_WORKAROUND(BOOST_MSVC, > 1400)
+#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400)
 #pragma warning(pop)
 #endif
 #endif

Modified: branches/proto/v3/boost/type_traits/is_base_and_derived.hpp
==============================================================================
--- branches/proto/v3/boost/type_traits/is_base_and_derived.hpp (original)
+++ branches/proto/v3/boost/type_traits/is_base_and_derived.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -129,7 +129,7 @@
 template<typename B, typename D>
 struct is_base_and_derived_impl2
 {
-#if BOOST_WORKAROUND(BOOST_MSVC, > 1400)
+#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400)
 #pragma warning(push)
 #pragma warning(disable:6334)
 #endif
@@ -152,7 +152,7 @@
 
     BOOST_STATIC_CONSTANT(bool, value =
         sizeof(bd_helper<B,D>::check_sig(Host(), 0)) == sizeof(type_traits::yes_type));
-#if BOOST_WORKAROUND(BOOST_MSVC, > 1400)
+#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400)
 #pragma warning(pop)
 #endif
 };

Modified: branches/proto/v3/boost/type_traits/is_convertible.hpp
==============================================================================
--- branches/proto/v3/boost/type_traits/is_convertible.hpp (original)
+++ branches/proto/v3/boost/type_traits/is_convertible.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -249,7 +249,10 @@
     static From _m_from;
 #ifdef BOOST_MSVC
 #pragma warning(push)
-#pragma warning(disable:4244 6334)
+#pragma warning(disable:4244)
+#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400)
+#pragma warning(disable:6334)
+#endif
 #endif
     BOOST_STATIC_CONSTANT(bool, value =
         sizeof( _m_check(_m_from) ) == sizeof(::boost::type_traits::yes_type)

Modified: branches/proto/v3/boost/type_traits/is_function.hpp
==============================================================================
--- branches/proto/v3/boost/type_traits/is_function.hpp (original)
+++ branches/proto/v3/boost/type_traits/is_function.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -62,7 +62,7 @@
 template <typename T>
 struct is_function_impl
 {
-#if BOOST_WORKAROUND(BOOST_MSVC, > 1400)
+#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400)
 #pragma warning(push)
 #pragma warning(disable:6334)
 #endif
@@ -71,7 +71,7 @@
         bool, value = sizeof(::boost::type_traits::is_function_ptr_tester(t))
         == sizeof(::boost::type_traits::yes_type)
         );
-#if BOOST_WORKAROUND(BOOST_MSVC, > 1400)
+#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400)
 #pragma warning(pop)
 #endif
 };

Modified: branches/proto/v3/boost/type_traits/is_member_function_pointer.hpp
==============================================================================
--- branches/proto/v3/boost/type_traits/is_member_function_pointer.hpp (original)
+++ branches/proto/v3/boost/type_traits/is_member_function_pointer.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -62,7 +62,7 @@
 {
     template <typename T> struct result_
     {
-#if BOOST_WORKAROUND(BOOST_MSVC, > 1400)
+#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400)
 #pragma warning(push)
 #pragma warning(disable:6334)
 #endif
@@ -73,7 +73,7 @@
             bool, value = (
                 1 == sizeof(::boost::type_traits::is_mem_fun_pointer_tester(self_type::make_t))
             ));
-#if BOOST_WORKAROUND(BOOST_MSVC, > 1400)
+#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400)
 #pragma warning(pop)
 #endif
     };

Modified: branches/proto/v3/boost/typeof/msvc/typeof_impl.hpp
==============================================================================
--- branches/proto/v3/boost/typeof/msvc/typeof_impl.hpp (original)
+++ branches/proto/v3/boost/typeof/msvc/typeof_impl.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -153,7 +153,7 @@
             };
         };
 # endif
-# if BOOST_WORKAROUND(BOOST_MSVC,>=1310)
+# if BOOST_WORKAROUND(BOOST_MSVC,==1310)
         template<const std::type_info& ref_type_info>
         struct msvc_typeid_wrapper {
             typedef typename msvc_extract_type<msvc_typeid_wrapper>::id2type id2type;
@@ -184,6 +184,7 @@
         template<typename Organizer, typename T>
         msvc_register_type<T,Organizer> typeof_register_type(const T&);
 
+
 # define BOOST_TYPEOF(expr) \
     boost::type_of::msvc_typeid_wrapper<typeid(boost::type_of::encode_start(expr))>::type
 
@@ -239,10 +240,18 @@
         {
             typedef char(*type)[encode_type<T>::value];
         };
+# if BOOST_WORKAROUND(BOOST_MSVC,>=1310)
+ template<typename T> typename disable_if<
+ typename is_function<T>::type,
+ typename sizer<T>::type>::type encode_start(T const&);
 
+ template<typename T> typename enable_if<
+ typename is_function<T>::type,
+ typename sizer<T>::type>::type encode_start(T&);
+# else
         template<typename T>
             typename sizer<T>::type encode_start(T const&);
-
+# endif
         template<typename Organizer, typename T>
         msvc_register_type<T,Organizer> typeof_register_type(const T&,Organizer* =0);
 

Modified: branches/proto/v3/doc/html/boostbook.css
==============================================================================
--- branches/proto/v3/doc/html/boostbook.css (original)
+++ branches/proto/v3/doc/html/boostbook.css 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -555,4 +555,28 @@
     span.inlinemediaobject img
     {
         vertical-align: middle;
- }
\ No newline at end of file
+ }
+
+/*==============================================================================
+ Super and Subscript: style so that line spacing isn't effected, see
+ http://www.adobe.com/cfusion/communityengine/index.cfm?event=showdetails&productId=1&postId=5341
+==============================================================================*/
+
+sup,
+sub {
+ height: 0;
+ line-height: 1;
+ vertical-align: baseline;
+ _vertical-align: bottom;
+ position: relative;
+
+}
+
+sup {
+ bottom: 1ex;
+}
+
+sub {
+ top: .5ex;
+}
+

Modified: branches/proto/v3/doc/src/boostbook.css
==============================================================================
--- branches/proto/v3/doc/src/boostbook.css (original)
+++ branches/proto/v3/doc/src/boostbook.css 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -10,7 +10,7 @@
     Body defaults
 =============================================================================*/
 
- body
+ body
     {
         margin: 1em;
         font-family: sans-serif;
@@ -20,10 +20,10 @@
     Paragraphs
 =============================================================================*/
 
- p
+ p
     {
         text-align: left;
- font-size: 10pt;
+ font-size: 10pt;
         line-height: 1.15;
     }
 
@@ -44,7 +44,7 @@
         padding: 0.5pc 0.5pc 0.5pc 0.5pc;
     }
 
- .programlisting,
+ .programlisting,
     .screen
     {
         font-size: 9pt;
@@ -54,7 +54,7 @@
     }
 
     /* Program listings in tables don't get borders */
- td .programlisting,
+ td .programlisting,
     td .screen
     {
         margin: 0pc 0pc 0pc 0pc;
@@ -65,9 +65,9 @@
     Headings
 =============================================================================*/
 
- h1, h2, h3, h4, h5, h6
- {
- text-align: left;
+ h1, h2, h3, h4, h5, h6
+ {
+ text-align: left;
         margin: 1em 0em 0.5em 0em;
         font-weight: bold;
     }
@@ -80,13 +80,13 @@
     h6 { font: italic 100% }
 
     /* Top page titles */
- title,
- h1.title,
+ title,
+ h1.title,
     h2.title
- h3.title,
- h4.title,
- h5.title,
- h6.title,
+ h3.title,
+ h4.title,
+ h5.title,
+ h6.title,
     .refentrytitle
     {
         font-weight: bold;
@@ -100,7 +100,7 @@
     h5.title { font-size: 110% }
     h6.title { font-size: 100% }
 
- .section h1
+ .section h1
     {
         margin: 0em 0em 0.5em 0em;
         font-size: 140%;
@@ -124,9 +124,9 @@
     Author
 =============================================================================*/
 
- h3.author
- {
- font-size: 100%
+ h3.author
+ {
+ font-size: 100%
     }
 
 /*=============================================================================
@@ -138,15 +138,15 @@
         font-size: 10pt;
         line-height: 1.3;
     }
-
+
     /* Unordered lists */
- ul
+ ul
     {
         text-align: left;
     }
-
+
     /* Ordered lists */
- ol
+ ol
     {
         text-align: left;
     }
@@ -159,7 +159,7 @@
     {
         text-decoration: none; /* no underline */
     }
-
+
     a:hover
     {
         text-decoration: underline;
@@ -173,18 +173,34 @@
     {
         text-align: right;
     }
-
+
     .spirit-nav a
     {
+ color: white;
         padding-left: 0.5em;
     }
-
+
     .spirit-nav img
     {
         border-width: 0px;
     }
 
 /*=============================================================================
+ Copyright footer
+=============================================================================*/
+ .copyright-footer
+ {
+ text-align: right;
+ font-size: 70%;
+ }
+
+ .copyright-footer p
+ {
+ text-align: right;
+ font-size: 80%;
+ }
+
+/*=============================================================================
     Table of contents
 =============================================================================*/
 
@@ -192,10 +208,10 @@
     {
        margin: 1pc 4% 0pc 4%;
        padding: 0.1pc 1pc 0.1pc 1pc;
- font-size: 80%;
+ font-size: 80%;
        line-height: 1.15;
     }
-
+
     .boost-toc
     {
        float: right;
@@ -206,30 +222,30 @@
     Tables
 =============================================================================*/
 
- .table-title,
+ .table-title,
     div.table p.title
     {
         margin-left: 4%;
- padding-right: 0.5em;
+ padding-right: 0.5em;
         padding-left: 0.5em;
     }
-
- .informaltable table,
+
+ .informaltable table,
     .table table
     {
         width: 92%;
         margin-left: 4%;
         margin-right: 4%;
     }
-
- div.informaltable table,
+
+ div.informaltable table,
     div.table table
     {
         padding: 4px;
     }
-
+
     /* Table Cells */
- div.informaltable table tr td,
+ div.informaltable table tr td,
     div.table table tr td
     {
         padding: 0.5em;
@@ -237,7 +253,7 @@
         font-size: 9pt;
     }
 
- div.informaltable table tr th,
+ div.informaltable table tr th,
     div.table table tr th
     {
         padding: 0.5em 0.5em 0.5em 0.5em;
@@ -276,7 +292,7 @@
         margin: 1pc 4% 0pc 4%;
         padding: 0.5pc 0.5pc 0.5pc 0.5pc;
     }
-
+
     p.blurb img
     {
         padding: 1pt;
@@ -359,7 +375,7 @@
         {
             color: #005a9c;
         }
-
+
         a:visited
         {
             color: #9c5a9c;
@@ -372,7 +388,7 @@
             text-decoration: none; /* no underline */
             color: #000000;
         }
-
+
     /* Syntax Highlighting */
         .keyword { color: #0000AA; }
         .identifier { color: #000000; }
@@ -384,37 +400,37 @@
         .number { color: teal; }
         .white_bkd { background-color: #FFFFFF; }
         .dk_grey_bkd { background-color: #999999; }
-
+
     /* Copyright, Legal Notice */
- .copyright
- {
- color: #666666;
- font-size: small;
+ .copyright
+ {
+ color: #666666;
+ font-size: small;
         }
-
+
         div div.legalnotice p
         {
             color: #666666;
         }
-
+
     /* Program listing */
         pre.synopsis
         {
             border: 1px solid #DCDCDC;
         }
-
- .programlisting,
+
+ .programlisting,
         .screen
         {
             border: 1px solid #DCDCDC;
         }
-
- td .programlisting,
+
+ td .programlisting,
         td .screen
         {
             border: 0px solid #DCDCDC;
         }
-
+
     /* Blurbs */
         div.note,
         div.tip,
@@ -425,39 +441,39 @@
         {
             border: 1px solid #DCDCDC;
         }
-
+
     /* Table of contents */
         .toc
         {
             border: 1px solid #DCDCDC;
         }
-
+
     /* Tables */
- div.informaltable table tr td,
+ div.informaltable table tr td,
         div.table table tr td
         {
             border: 1px solid #DCDCDC;
         }
-
- div.informaltable table tr th,
+
+ div.informaltable table tr th,
         div.table table tr th
         {
             background-color: #F0F0F0;
             border: 1px solid #DCDCDC;
         }
 
- table.simplelist tr td
+ .copyright-footer
         {
- border: none !important;
+ color: #8F8F8F;
         }
-
+
     /* Misc */
         span.highlight
         {
             color: #00A000;
         }
     }
-
+
     @media print
     {
     /* Links */
@@ -465,56 +481,56 @@
         {
             color: black;
         }
-
+
         a:visited
         {
             color: black;
         }
-
+
         .spirit-nav
         {
             display: none;
         }
-
+
     /* Program listing */
         pre.synopsis
         {
             border: 1px solid gray;
         }
-
- .programlisting,
+
+ .programlisting,
         .screen
         {
             border: 1px solid gray;
         }
-
- td .programlisting,
+
+ td .programlisting,
         td .screen
         {
             border: 0px solid #DCDCDC;
         }
-
+
     /* Table of contents */
         .toc
         {
             border: 1px solid gray;
         }
-
- .informaltable table,
+
+ .informaltable table,
         .table table
         {
             border: 1px solid gray;
             border-collapse: collapse;
         }
-
+
     /* Tables */
- div.informaltable table tr td,
+ div.informaltable table tr td,
         div.table table tr td
         {
             border: 1px solid gray;
         }
-
- div.informaltable table tr th,
+
+ div.informaltable table tr th,
         div.table table tr th
         {
             border: 1px solid gray;
@@ -524,7 +540,7 @@
         {
             border: none !important;
         }
-
+
     /* Misc */
         span.highlight
         {
@@ -539,4 +555,28 @@
     span.inlinemediaobject img
     {
         vertical-align: middle;
- }
\ No newline at end of file
+ }
+
+/*==============================================================================
+ Super and Subscript: style so that line spacing isn't effected, see
+ http://www.adobe.com/cfusion/communityengine/index.cfm?event=showdetails&productId=1&postId=5341
+==============================================================================*/
+
+sup,
+sub {
+ height: 0;
+ line-height: 1;
+ vertical-align: baseline;
+ _vertical-align: bottom;
+ position: relative;
+
+}
+
+sup {
+ bottom: 1ex;
+}
+
+sub {
+ top: .5ex;
+}
+

Modified: branches/proto/v3/libs/conversion/lexical_cast_test.cpp
==============================================================================
--- branches/proto/v3/libs/conversion/lexical_cast_test.cpp (original)
+++ branches/proto/v3/libs/conversion/lexical_cast_test.cpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -24,6 +24,9 @@
 #include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 
+#include <string>
+#include <memory>
+
 #if defined(BOOST_NO_STRINGSTREAM) || \
     defined(BOOST_NO_STD_WSTRING) || \
     defined(BOOST_NO_STD_LOCALE)
@@ -35,6 +38,16 @@
 #define LCAST_TEST_LONGLONG
 #endif
 
+template<class CharT>
+struct my_traits : std::char_traits<CharT>
+{
+};
+
+template<class CharT>
+struct my_allocator : std::allocator<CharT>
+{
+};
+
 // Test all 65536 values if true:
 bool const lcast_test_small_integral_types_completely = false;
 
@@ -57,15 +70,21 @@
 void test_conversion_to_wstring();
 void test_bad_lexical_cast();
 void test_no_whitespace_stripping();
-void test_conversion_from_short();
-void test_conversion_from_ushort();
-void test_conversion_from_int();
-void test_conversion_from_uint();
-void test_conversion_from_long();
-void test_conversion_from_ulong();
+void test_conversion_from_to_short();
+void test_conversion_from_to_ushort();
+void test_conversion_from_to_int();
+void test_conversion_from_to_uint();
+void test_conversion_from_to_long();
+void test_conversion_from_to_ulong();
 #ifdef LCAST_TEST_LONGLONG
-void test_conversion_from_longlong();
-void test_conversion_from_ulonglong();
+void test_conversion_from_to_longlong();
+void test_conversion_from_to_ulonglong();
+#endif
+#ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
+void test_traits();
+void test_wtraits();
+void test_allocator();
+void test_wallocator();
 #endif
 
 unit_test::test_suite *init_unit_test_suite(int, char *[])
@@ -87,15 +106,21 @@
     #endif
     suite->add(BOOST_TEST_CASE(test_bad_lexical_cast));
     suite->add(BOOST_TEST_CASE(test_no_whitespace_stripping));
- suite->add(BOOST_TEST_CASE(&test_conversion_from_short));
- suite->add(BOOST_TEST_CASE(&test_conversion_from_ushort));
- suite->add(BOOST_TEST_CASE(&test_conversion_from_int));
- suite->add(BOOST_TEST_CASE(&test_conversion_from_uint));
- suite->add(BOOST_TEST_CASE(&test_conversion_from_ulong));
- suite->add(BOOST_TEST_CASE(&test_conversion_from_long));
+ suite->add(BOOST_TEST_CASE(&test_conversion_from_to_short));
+ suite->add(BOOST_TEST_CASE(&test_conversion_from_to_ushort));
+ suite->add(BOOST_TEST_CASE(&test_conversion_from_to_int));
+ suite->add(BOOST_TEST_CASE(&test_conversion_from_to_uint));
+ suite->add(BOOST_TEST_CASE(&test_conversion_from_to_ulong));
+ suite->add(BOOST_TEST_CASE(&test_conversion_from_to_long));
     #ifdef LCAST_TEST_LONGLONG
- suite->add(BOOST_TEST_CASE(&test_conversion_from_longlong));
- suite->add(BOOST_TEST_CASE(&test_conversion_from_ulonglong));
+ suite->add(BOOST_TEST_CASE(&test_conversion_from_to_longlong));
+ suite->add(BOOST_TEST_CASE(&test_conversion_from_to_ulonglong));
+ #endif
+ #ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
+ suite->add(BOOST_TEST_CASE(&test_traits));
+ suite->add(BOOST_TEST_CASE(&test_wtraits));
+ suite->add(BOOST_TEST_CASE(&test_allocator));
+ suite->add(BOOST_TEST_CASE(&test_wallocator));
     #endif
 
     return suite;
@@ -129,10 +154,15 @@
     BOOST_CHECK_EQUAL(0, lexical_cast<int>('0'));
     BOOST_CHECK_THROW(lexical_cast<int>('A'), bad_lexical_cast);
     BOOST_CHECK_EQUAL(1, lexical_cast<int>(1));
+ BOOST_CHECK_EQUAL(1, lexical_cast<int>(1.0));
+
     BOOST_CHECK_EQUAL(
         (std::numeric_limits<int>::max)(),
         lexical_cast<int>((std::numeric_limits<int>::max)()));
- BOOST_CHECK_EQUAL(1, lexical_cast<int>(1.0));
+
+ BOOST_CHECK_EQUAL(
+ (std::numeric_limits<int>::min)(),
+ lexical_cast<int>((std::numeric_limits<int>::min)()));
 
     BOOST_CHECK_THROW(lexical_cast<int>(1.23), bad_lexical_cast);
 
@@ -407,7 +437,7 @@
 
     BOOST_CHECK_THROW(lexical_cast<CharT>(static_cast<T>(10)), bad_lexical_cast);
 
- T t = std::numeric_limits<T>::max();
+ T t = (std::numeric_limits<T>::max)();
     BOOST_CHECK_THROW(lexical_cast<CharT>(t), bad_lexical_cast);
 }
 
@@ -427,10 +457,10 @@
     BOOST_CHECK(lexical_cast<long>(t) == st);
     BOOST_CHECK(lexical_cast<unsigned long>(t) == ut);
 
- t = std::numeric_limits<T>::max();
+ t = (std::numeric_limits<T>::max)();
     BOOST_CHECK(lexical_cast<T>(t) == t);
 
- t = std::numeric_limits<T>::min();
+ t = (std::numeric_limits<T>::min)();
     BOOST_CHECK(lexical_cast<T>(t) == t);
 }
 
@@ -442,19 +472,20 @@
 
     T t;
 
- t = limits::min();
+ t = (limits::min)();
     BOOST_CHECK(lexical_cast<string_type>(t) == to_str<CharT>(t));
 
- t = limits::max();
+ t = (limits::max)();
     BOOST_CHECK(lexical_cast<string_type>(t) == to_str<CharT>(t));
 
     if(limits::digits <= 16 && lcast_test_small_integral_types_completely)
- for(t = 1 + limits::min(); t != limits::max(); ++t)
+ // min and max have already been tested.
+ for(t = 1 + (limits::min)(); t != (limits::max)(); ++t)
             BOOST_CHECK(lexical_cast<string_type>(t) == to_str<CharT>(t));
     else
     {
- T const min_val = limits::min();
- T const max_val = limits::max();
+ T const min_val = (limits::min)();
+ T const max_val = (limits::max)();
         T const half_max_val = max_val / 2;
         T const cnt = lcast_integral_test_counter; // to supress warnings
         unsigned int const counter = cnt < half_max_val ? cnt : half_max_val;
@@ -480,20 +511,75 @@
         T ten_power = 100;
         for(int e = 2; e <= limits::digits10; ++e, ten_power *= 10)
         {
- // I believe that (ten_power + 100) never overflows
+ // ten_power + 100 probably never overflows
             for(t = ten_power - 100; t != ten_power + 100; ++t)
                 BOOST_CHECK(lexical_cast<string_type>(t) == to_str<CharT>(t));
         }
     }
 }
 
+template<class T, class CharT>
+void test_conversion_from_string_to_integral(CharT)
+{
+ typedef std::numeric_limits<T> limits;
+
+ T t;
+
+ t = (limits::min)();
+ BOOST_CHECK(lexical_cast<T>(to_str<CharT>(t)) == t);
+
+ t = (limits::max)();
+ BOOST_CHECK(lexical_cast<T>(to_str<CharT>(t)) == t);
+
+ if(limits::digits <= 16 && lcast_test_small_integral_types_completely)
+ // min and max have already been tested.
+ for(t = 1 + (limits::min)(); t != (limits::max)(); ++t)
+ BOOST_CHECK(lexical_cast<T>(to_str<CharT>(t)) == t);
+ else
+ {
+ T const min_val = (limits::min)();
+ T const max_val = (limits::max)();
+ T const half_max_val = max_val / 2;
+ T const cnt = lcast_integral_test_counter; // to supress warnings
+ unsigned int const counter = cnt < half_max_val ? cnt : half_max_val;
+
+ unsigned int i;
+
+ // Test values around min:
+ t = min_val;
+ for(i = 0; i < counter; ++i, ++t)
+ BOOST_CHECK(lexical_cast<T>(to_str<CharT>(t)) == t);
+
+ // Test values around max:
+ t = max_val;
+ for(i = 0; i < counter; ++i, --t)
+ BOOST_CHECK(lexical_cast<T>(to_str<CharT>(t)) == t);
+
+ // Test values around zero:
+ if(limits::is_signed)
+ for(t = -counter; t < static_cast<T>(counter); ++t)
+ BOOST_CHECK(lexical_cast<T>(to_str<CharT>(t)) == t);
+
+ // Test values around 100, 1000, 10000, ...
+ T ten_power = 100;
+ for(int e = 2; e <= limits::digits10; ++e, ten_power *= 10)
+ {
+ // ten_power + 100 probably never overflows
+ for(t = ten_power - 100; t != ten_power + 100; ++t)
+ BOOST_CHECK(lexical_cast<T>(to_str<CharT>(t)) == t);
+ }
+ }
+}
+
 template<class T>
-void test_conversion_from_integral_for_locale()
+void test_conversion_from_to_integral_for_locale()
 {
     test_conversion_from_integral_to_integral<T>();
     test_conversion_from_integral_to_string<T>('0');
+ test_conversion_from_string_to_integral<T>('0');
 #if !defined(DISABLE_WIDE_CHAR_SUPPORT) && !defined(BOOST_NO_INTRINSIC_WCHAR_T)
     test_conversion_from_integral_to_string<T>(L'0');
+ test_conversion_from_string_to_integral<T>(L'0');
 #endif
 }
 
@@ -504,7 +590,7 @@
 };
 
 template<class T>
-void test_conversion_from_integral()
+void test_conversion_from_to_integral()
 {
     char const zero = '0';
     signed char const szero = '0';
@@ -517,7 +603,7 @@
     test_conversion_from_integral_to_char<T>(wzero);
 #endif
 
- // test_conversion_from_integral_for_locale
+ // test_conversion_from_to_integral_for_locale
 
     typedef std::numpunct<char> numpunct;
 
@@ -527,7 +613,7 @@
     std::string grouping1 = BOOST_USE_FACET(numpunct, oldloc).grouping();
     std::string grouping2(grouping1);
 
- test_conversion_from_integral_for_locale<T>();
+ test_conversion_from_to_integral_for_locale<T>();
 
     try
     {
@@ -544,64 +630,121 @@
     }
 
     if(grouping1 != grouping2)
- test_conversion_from_integral_for_locale<T>();
+ test_conversion_from_to_integral_for_locale<T>();
 
     if(grouping1.empty() && grouping2.empty())
         BOOST_TEST_MESSAGE("Formatting with thousands_sep has not been tested");
 }
 
-void test_conversion_from_short()
+void test_conversion_from_to_short()
 {
- test_conversion_from_integral<short>();
+ test_conversion_from_to_integral<short>();
 }
 
-void test_conversion_from_ushort()
+void test_conversion_from_to_ushort()
 {
- test_conversion_from_integral<unsigned short>();
+ test_conversion_from_to_integral<unsigned short>();
 }
 
-void test_conversion_from_int()
+void test_conversion_from_to_int()
 {
- test_conversion_from_integral<int>();
+ test_conversion_from_to_integral<int>();
 }
 
-void test_conversion_from_uint()
+void test_conversion_from_to_uint()
 {
- test_conversion_from_integral<unsigned int>();
+ test_conversion_from_to_integral<unsigned int>();
 }
 
-void test_conversion_from_ulong()
+void test_conversion_from_to_ulong()
 {
- test_conversion_from_integral<unsigned long>();
+ test_conversion_from_to_integral<unsigned long>();
 }
 
-void test_conversion_from_long()
+void test_conversion_from_to_long()
 {
- test_conversion_from_integral<long>();
+ test_conversion_from_to_integral<long>();
 }
 
 #if defined(BOOST_HAS_LONG_LONG)
 
-void test_conversion_from_longlong()
+void test_conversion_from_to_longlong()
 {
- test_conversion_from_integral<boost::long_long_type>();
+ test_conversion_from_to_integral<boost::long_long_type>();
 }
 
-void test_conversion_from_ulonglong()
+void test_conversion_from_to_ulonglong()
 {
- test_conversion_from_integral<boost::ulong_long_type>();
+ test_conversion_from_to_integral<boost::ulong_long_type>();
 }
 
 #elif defined(LCAST_TEST_LONGLONG)
 
-void test_conversion_from_longlong()
+void test_conversion_from_to_longlong()
 {
- test_conversion_from_integral<__int64>();
+ test_conversion_from_to_integral<__int64>();
 }
 
-void test_conversion_from_ulonglong()
+void test_conversion_from_to_ulonglong()
 {
- test_conversion_from_integral<unsigned __int64>();
+ test_conversion_from_to_integral<unsigned __int64>();
+}
+
+#endif
+
+#ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
+void test_traits()
+{
+ typedef std::basic_string<char, my_traits<char> > my_string;
+
+ my_string const s("s");
+ BOOST_CHECK(boost::lexical_cast<char>(s) == s[0]);
+ BOOST_CHECK(boost::lexical_cast<my_string>(s) == s);
+ BOOST_CHECK(boost::lexical_cast<my_string>(-1) == "-1");
+}
+
+void test_wtraits()
+{
+ typedef std::basic_string<wchar_t, my_traits<wchar_t> > my_string;
+
+ my_string const s(L"s");
+ BOOST_CHECK(boost::lexical_cast<wchar_t>(s) == s[0]);
+ BOOST_CHECK(boost::lexical_cast<my_string>(s) == s);
+ //BOOST_CHECK(boost::lexical_cast<my_string>(-1) == L"-1");
+ // Commented out because gcc 3.3 doesn't support this:
+ // basic_ostream<wchar_t, my_traits<wchar_t> > o; o << -1;
+}
+
+void test_allocator()
+{
+ typedef std::basic_string< char
+ , std::char_traits<char>
+ , my_allocator<char>
+ > my_string;
+
+ my_string s("s");
+ BOOST_CHECK(boost::lexical_cast<char>(s) == s[0]);
+ BOOST_CHECK(boost::lexical_cast<std::string>(s) == "s");
+ BOOST_CHECK(boost::lexical_cast<my_string>(s) == s);
+ BOOST_CHECK(boost::lexical_cast<my_string>(1) == "1");
+ BOOST_CHECK(boost::lexical_cast<my_string>("s") == s);
+ BOOST_CHECK(boost::lexical_cast<my_string>(std::string("s")) == s);
+}
+
+void test_wallocator()
+{
+ typedef std::basic_string< wchar_t
+ , std::char_traits<wchar_t>
+ , my_allocator<wchar_t>
+ > my_string;
+
+ my_string s(L"s");
+ BOOST_CHECK(boost::lexical_cast<wchar_t>(s) == s[0]);
+ BOOST_CHECK(boost::lexical_cast<std::wstring>(s) == L"s");
+ BOOST_CHECK(boost::lexical_cast<my_string>(s) == s);
+ BOOST_CHECK(boost::lexical_cast<my_string>(1) == L"1");
+ BOOST_CHECK(boost::lexical_cast<my_string>(L"s") == s);
+ BOOST_CHECK(boost::lexical_cast<my_string>(std::wstring(L"s")) == s);
 }
 
 #endif

Modified: branches/proto/v3/libs/filesystem/src/path.cpp
==============================================================================
--- branches/proto/v3/libs/filesystem/src/path.cpp (original)
+++ branches/proto/v3/libs/filesystem/src/path.cpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -118,7 +118,7 @@
       locked = true;
       std::size_t work_size( converter()->max_length() * (src.size()+1) );
       boost::scoped_array<char> work( new char[ work_size ] );
- std::mbstate_t state;
+ std::mbstate_t state = std::mbstate_t(); // perhaps unneeded, but cuts bug reports
       const internal_string_type::value_type * from_next;
       external_string_type::value_type * to_next;
       if ( converter()->out(
@@ -137,7 +137,7 @@
       locked = true;
       std::size_t work_size( src.size()+1 );
       boost::scoped_array<wchar_t> work( new wchar_t[ work_size ] );
- std::mbstate_t state;
+ std::mbstate_t state = std::mbstate_t(); // perhaps unneeded, but cuts bug reports
       const external_string_type::value_type * from_next;
       internal_string_type::value_type * to_next;
       if ( converter()->in(

Modified: branches/proto/v3/libs/interprocess/proj/vc7ide/Interprocess.sln
==============================================================================
--- branches/proto/v3/libs/interprocess/proj/vc7ide/Interprocess.sln (original)
+++ branches/proto/v3/libs/interprocess/proj/vc7ide/Interprocess.sln 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -411,6 +411,10 @@
         ProjectSection(ProjectDependencies) = postProject
         EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "offset_ptr_test", "offset_ptr_test.vcproj", "{5CE11C83-096A-84FE-4FA2-D3A6BA792002}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
 Global
         GlobalSection(SolutionConfiguration) = preSolution
                 Debug = Debug
@@ -831,6 +835,10 @@
                 {818C43EE-3561-F3AE-4FD7-8A2076E76A31}.Debug.Build.0 = Debug|Win32
                 {818C43EE-3561-F3AE-4FD7-8A2076E76A31}.Release.ActiveCfg = Release|Win32
                 {818C43EE-3561-F3AE-4FD7-8A2076E76A31}.Release.Build.0 = Release|Win32
+ {5CE11C83-096A-84FE-4FA2-D3A6BA792002}.Debug.ActiveCfg = Debug|Win32
+ {5CE11C83-096A-84FE-4FA2-D3A6BA792002}.Debug.Build.0 = Debug|Win32
+ {5CE11C83-096A-84FE-4FA2-D3A6BA792002}.Release.ActiveCfg = Release|Win32
+ {5CE11C83-096A-84FE-4FA2-D3A6BA792002}.Release.Build.0 = Release|Win32
         EndGlobalSection
         GlobalSection(ExtensibilityGlobals) = postSolution
         EndGlobalSection

Modified: branches/proto/v3/libs/interprocess/proj/vc7ide/interprocesslib.vcproj
==============================================================================
--- branches/proto/v3/libs/interprocess/proj/vc7ide/interprocesslib.vcproj (original)
+++ branches/proto/v3/libs/interprocess/proj/vc7ide/interprocesslib.vcproj 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -435,6 +435,9 @@
                                 RelativePath="..\..\..\..\boost\interprocess\detail\segment_manager_helper.hpp">
                         </File>
                         <File
+ RelativePath="..\..\..\..\boost\interprocess\detail\tmp_dir_helpers.hpp">
+ </File>
+ <File
                                 RelativePath="..\..\..\..\boost\interprocess\detail\type_traits.hpp">
                         </File>
                         <File

Modified: branches/proto/v3/libs/interprocess/test/expand_bwd_test_template.hpp
==============================================================================
--- branches/proto/v3/libs/interprocess/test/expand_bwd_test_template.hpp (original)
+++ branches/proto/v3/libs/interprocess/test/expand_bwd_test_template.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -76,7 +76,7 @@
 
 //Function to check if both sets are equal
 template <class Vector1, class Vector2>
-bool CheckEqualVector(const Vector1 &vector1, const Vector2 &vector2)
+static bool CheckEqualVector(const Vector1 &vector1, const Vector2 &vector2)
 {
    if(vector1.size() != vector2.size())
       return false;
@@ -84,7 +84,7 @@
 }
 
 template<class Vector>
-bool CheckUninitializedIsZero(const Vector & v)
+static bool CheckUninitializedIsZero(const Vector & v)
 {
    typedef typename Vector::value_type value_type;
    typename Vector::size_type sz = v.size();

Modified: branches/proto/v3/libs/interprocess/test/named_creation_template.hpp
==============================================================================
--- branches/proto/v3/libs/interprocess/test/named_creation_template.hpp (original)
+++ branches/proto/v3/libs/interprocess/test/named_creation_template.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -20,7 +20,7 @@
 namespace boost { namespace interprocess { namespace test {
 
 template <class NamedResource>
-inline void create_then_open_then_open_or_create()
+static inline void create_then_open_then_open_or_create()
 {
    try{
       //Create it and open it twice
@@ -35,7 +35,7 @@
 }
 
 template <class NamedResource>
-inline void open_or_create_then_create()
+static inline void open_or_create_then_create()
 {
    //Create it with open_or_create and try to create it twice
    NamedResource nresource1(open_or_create);
@@ -48,7 +48,7 @@
 }
 
 template <class NamedResource>
-inline void dont_create_and_open()
+static inline void dont_create_and_open()
 {
    //Try to open it without creating
    try{
@@ -63,7 +63,7 @@
 }
 
 template <class NamedResource>
-void test_named_creation()
+static inline void test_named_creation()
 {
    std::cout << "create_then_open_then_open_or_create<"
                << typeid(NamedResource).name() << ">" << std::endl;

Modified: branches/proto/v3/libs/interprocess/test/vector_test.cpp
==============================================================================
--- branches/proto/v3/libs/interprocess/test/vector_test.cpp (original)
+++ branches/proto/v3/libs/interprocess/test/vector_test.cpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -31,7 +31,6 @@
 #include "dummy_test_allocator.hpp"
 #include <string>
 #include "get_process_id_name.hpp"
-#include <boost/utility.hpp>
 
 using namespace boost::interprocess;
 
@@ -142,11 +141,12 @@
          }
          if(!test::CheckEqualContainers(shmvector, stdvector)) return false;
 
- typename MyShmVector::iterator it;
- typename MyShmVector::const_iterator cit = it;
-
- shmvector->erase(boost::next(shmvector->begin()));
- stdvector->erase(boost::next(stdvector->begin()));
+ typename MyShmVector::iterator shmit(shmvector->begin());
+ typename MyStdVector::iterator stdit(stdvector->begin());
+ typename MyShmVector::const_iterator cshmit = shmit;
+ ++shmit; ++stdit;
+ shmvector->erase(shmit);
+ stdvector->erase(stdit);
          if(!test::CheckEqualContainers(shmvector, stdvector)) return false;
 
          shmvector->erase(shmvector->begin());

Modified: branches/proto/v3/libs/intrusive/proj/vc7ide/_intrusivelib/_intrusivelib.vcproj
==============================================================================
--- branches/proto/v3/libs/intrusive/proj/vc7ide/_intrusivelib/_intrusivelib.vcproj (original)
+++ branches/proto/v3/libs/intrusive/proj/vc7ide/_intrusivelib/_intrusivelib.vcproj 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -402,6 +402,15 @@
                         Name="perf"
                         Filter="">
                         <File
+ RelativePath="..\..\..\perf\Jamfile.v2">
+ <FileConfiguration
+ Name="Debug|Win32"
+ ExcludedFromBuild="TRUE">
+ <Tool
+ Name="VCCustomBuildTool"/>
+ </FileConfiguration>
+ </File>
+ <File
                                 RelativePath="..\..\..\perf\perf_list.cpp">
                         </File>
                 </Filter>

Modified: branches/proto/v3/libs/intrusive/test/Jamfile.v2
==============================================================================
--- branches/proto/v3/libs/intrusive/test/Jamfile.v2 (original)
+++ branches/proto/v3/libs/intrusive/test/Jamfile.v2 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,5 +1,4 @@
 # Boost Intrusive Library Test Jamfile
-
 # (C) Copyright Ion Gaztañaga 2006.
 # Use, modification and distribution are subject to the
 # Boost Software License, Version 1.0. (See accompanying file
@@ -31,4 +30,4 @@
    return $(all_rules) ;
 }
 
-test-suite intrusive_test : [ test_all r ] : <threading>multi ;
+test-suite intrusive_test : [ test_all r ] : <threading>multi ;
\ No newline at end of file

Deleted: branches/proto/v3/libs/math/performance/gcc-3.4-w32.log
==============================================================================
--- branches/proto/v3/libs/math/performance/gcc-3.4-w32.log 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
+++ (empty file)
@@ -1,86 +0,0 @@
-Currently, polynomial evaluation uses method 3
-Currently, rational function evaluation uses method 3
-Currently, the largest order of polynomial or rational function that uses a method other than 0, is 17
-Currently, rational functions with integer coefficients are evaluated using all real arithmetic (integer coefficients are actually stored as reals)
-
-Policies are currently set as follows:
-
-Policy Value
-BOOST_MATH_DOMAIN_ERROR_POLICY ignore_error
-BOOST_MATH_POLE_ERROR_POLICY throw_on_error
-BOOST_MATH_OVERFLOW_ERROR_POLICY ignore_error
-BOOST_MATH_UNDERFLOW_ERROR_POLICY ignore_error
-BOOST_MATH_DENORM_ERROR_POLICY ignore_error
-BOOST_MATH_EVALUATION_ERROR_POLICY throw_on_error
-BOOST_MATH_DIGITS10_POLICY 0
-BOOST_MATH_PROMOTE_FLOAT_POLICY true
-BOOST_MATH_PROMOTE_DOUBLE_POLICY false
-BOOST_MATH_DISCRETE_QUANTILE_POLICY integer_round_outwards
-BOOST_MATH_ASSERT_UNDEFINED_POLICY true
-BOOST_MATH_MAX_ITER 1000000
-Testing gcc-Polynomial-method-0 2.102e-07
-Testing gcc-Polynomial-method-1 1.002e-07
-Testing gcc-Polynomial-method-2 1.025e-07
-Testing gcc-Polynomial-method-3 7.688e-08
-Testing gcc-Polynomial-mixed-method-0 1.115e-06
-Testing gcc-Polynomial-mixed-method-1 3.032e-07
-Testing gcc-Polynomial-mixed-method-2 2.690e-07
-Testing gcc-Polynomial-mixed-method-3 3.227e-07
-Testing gcc-Rational-method-0 1.638e-07
-Testing gcc-Rational-method-1 1.711e-07
-Testing gcc-Rational-method-2 1.711e-07
-Testing gcc-Rational-method-3 1.418e-07
-Testing gcc-Rational-mixed-method-0 6.748e-07
-Testing gcc-Rational-mixed-method-1 6.357e-07
-Testing gcc-Rational-mixed-method-2 5.674e-07
-Testing gcc-Rational-mixed-method-3 5.674e-07
-Testing gcc-dist-beta-cdf 3.786e-06
-Testing gcc-dist-beta-pdf 1.825e-06
-Testing gcc-dist-beta-quantile 1.350e-05
-Testing gcc-dist-binomial-cdf 1.378e-06
-Testing gcc-dist-binomial-pdf 1.378e-06
-Testing gcc-dist-binomial-quantile 6.768e-06
-Testing gcc-dist-cauchy-cdf 1.089e-07
-Testing gcc-dist-cauchy-pdf 3.025e-08
-Testing gcc-dist-cauchy-quantile 2.341e-07
-Testing gcc-dist-chi_squared-cdf 1.289e-06
-Testing gcc-dist-chi_squared-pdf 1.243e-06
-Testing gcc-dist-chi_squared-quantile 7.392e-06
-Testing gcc-dist-exponential-cdf 1.021e-07
-Testing gcc-dist-exponential-pdf 1.174e-07
-Testing gcc-dist-exponential-quantile 3.667e-07
-Testing gcc-dist-fisher_f-cdf 2.683e-06
-Testing gcc-dist-fisher_f-pdf 1.617e-06
-Testing gcc-dist-fisher_f-quantile 1.550e-05
-Testing gcc-dist-gamma-cdf 2.031e-06
-Testing gcc-dist-gamma-pdf 1.662e-06
-Testing gcc-dist-gamma-quantile 1.005e-05
-Testing gcc-dist-lognormal-cdf 2.734e-07
-Testing gcc-dist-lognormal-pdf 3.667e-07
-Testing gcc-dist-lognormal-quantile 6.486e-07
-Testing gcc-dist-negative_binomial-cdf 2.042e-06
-Testing gcc-dist-negative_binomial-pdf 1.869e-06
-Testing gcc-dist-negative_binomial-quantile 1.766e-05
-Testing gcc-dist-normal-cdf 8.677e-08
-Testing gcc-dist-normal-pdf 1.198e-07
-Testing gcc-dist-normal-quantile 1.776e-07
-Testing gcc-dist-poisson-cdf 1.400e-06
-Testing gcc-dist-poisson-pdf 8.998e-07
-Testing gcc-dist-poisson-quantile 2.418e-06
-Testing gcc-dist-students_t-cdf 2.486e-06
-Testing gcc-dist-students_t-pdf 2.224e-06
-Testing gcc-dist-students_t-quantile 5.897e-06
-Testing gcc-dist-weibull-cdf 9.004e-07
-Testing gcc-dist-weibull-pdf 1.801e-06
-Testing gcc-dist-weibull-quantile 1.585e-06
-Testing gcc-erf 1.336e-07
-Testing gcc-erf_inv 3.500e-07
-Testing gcc-gamma 9.655e-07
-Testing gcc-ibeta 4.975e-06
-Testing gcc-ibeta_inv 1.597e-05
-Testing gcc-ibeta_invab 6.947e-05
-Testing gcc-igamma 1.872e-06
-Testing gcc-igamma_inv 8.736e-06
-Testing gcc-igamma_inva 1.974e-05
-Testing gcc-lgamma 8.679e-07
-

Deleted: branches/proto/v3/libs/math/performance/gcc-4.2-linux.log
==============================================================================
--- branches/proto/v3/libs/math/performance/gcc-4.2-linux.log 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
+++ (empty file)
@@ -1,105 +0,0 @@
-Testing gcc-4_2-Polynomial-method-0 1.220e-07
-Testing gcc-4_2-Polynomial-method-1 1.269e-07
-Testing gcc-4_2-Polynomial-method-2 9.275e-08
-Testing gcc-4_2-Polynomial-method-3 7.566e-08
-Testing gcc-4_2-Polynomial-mixed-method-0 4.590e-07
-Testing gcc-4_2-Polynomial-mixed-method-1 1.269e-07
-Testing gcc-4_2-Polynomial-mixed-method-2 9.275e-08
-Testing gcc-4_2-Polynomial-mixed-method-3 7.566e-08
-Testing gcc-4_2-Rational-method-0 1.660e-07
-Testing gcc-4_2-Rational-method-1 1.758e-07
-Testing gcc-4_2-Rational-method-2 1.318e-07
-Testing gcc-4_2-Rational-method-3 1.489e-07
-Testing gcc-4_2-Rational-mixed-method-0 5.273e-07
-Testing gcc-4_2-Rational-mixed-method-1 1.758e-07
-Testing gcc-4_2-Rational-mixed-method-2 1.318e-07
-Testing gcc-4_2-Rational-mixed-method-3 1.513e-07
-Testing gcc-4_2-dist-beta-R-cdf 2.050e-06
-Testing gcc-4_2-dist-beta-R-pdf 1.458e-06
-Testing gcc-4_2-dist-beta-R-quantile 5.701e-04
-Testing gcc-4_2-dist-beta-cdf 3.508e-06
-Testing gcc-4_2-dist-beta-pdf 2.551e-06
-Testing gcc-4_2-dist-beta-quantile 1.294e-05
-Testing gcc-4_2-dist-binom-R-cdf 1.104e-06
-Testing gcc-4_2-dist-binom-R-pdf 7.561e-07
-Testing gcc-4_2-dist-binom-R-quantile 5.194e-06
-Testing gcc-4_2-dist-binomial-cdf 1.342e-06
-Testing gcc-4_2-dist-binomial-pdf 2.073e-06
-Testing gcc-4_2-dist-binomial-quantile 7.083e-06
-Testing gcc-4_2-dist-cauchy-R-cdf 2.017e-07
-Testing gcc-4_2-dist-cauchy-R-pdf 5.849e-08
-Testing gcc-4_2-dist-cauchy-R-quantile 1.752e-07
-Testing gcc-4_2-dist-cauchy-cdf 1.372e-07
-Testing gcc-4_2-dist-cauchy-pdf 3.125e-08
-Testing gcc-4_2-dist-cauchy-quantile 1.542e-07
-Testing gcc-4_2-dist-chi_squared-cdf 1.820e-06
-Testing gcc-4_2-dist-chi_squared-pdf 1.731e-06
-Testing gcc-4_2-dist-chi_squared-quantile 9.345e-06
-Testing gcc-4_2-dist-chisq-R-cdf 1.753e-06
-Testing gcc-4_2-dist-chisq-R-pdf 5.768e-07
-Testing gcc-4_2-dist-chisq-R-quantile 6.728e-06
-Testing gcc-4_2-dist-exp-R-cdf 2.561e-07
-Testing gcc-4_2-dist-exp-R-pdf 2.439e-07
-Testing gcc-4_2-dist-exp-R-quantile 1.155e-07
-Testing gcc-4_2-dist-exponential-cdf 2.195e-07
-Testing gcc-4_2-dist-exponential-pdf 2.164e-07
-Testing gcc-4_2-dist-exponential-quantile 1.123e-07
-Testing gcc-4_2-dist-f-R-cdf 2.970e-06
-Testing gcc-4_2-dist-f-R-pdf 1.114e-06
-Testing gcc-4_2-dist-f-R-quantile 1.359e-05
-Testing gcc-4_2-dist-fisher_f-cdf 2.744e-06
-Testing gcc-4_2-dist-fisher_f-pdf 1.969e-06
-Testing gcc-4_2-dist-fisher_f-quantile 1.550e-05
-Testing gcc-4_2-dist-gamma-R-cdf 1.992e-06
-Testing gcc-4_2-dist-gamma-R-pdf 7.812e-07
-Testing gcc-4_2-dist-gamma-R-quantile 5.757e-06
-Testing gcc-4_2-dist-gamma-cdf 2.578e-06
-Testing gcc-4_2-dist-gamma-pdf 1.934e-06
-Testing gcc-4_2-dist-gamma-quantile 1.020e-05
-Testing gcc-4_2-dist-lnorm-R-cdf 3.564e-07
-Testing gcc-4_2-dist-lnorm-R-pdf 4.052e-07
-Testing gcc-4_2-dist-lnorm-R-quantile 7.607e-07
-Testing gcc-4_2-dist-lognormal-cdf 1.782e-07
-Testing gcc-4_2-dist-lognormal-pdf 3.857e-07
-Testing gcc-4_2-dist-lognormal-quantile 7.093e-07
-Testing gcc-4_2-dist-nbinom-R-cdf 2.141e-06
-Testing gcc-4_2-dist-nbinom-R-pdf 1.376e-06
-Testing gcc-4_2-dist-nbinom-R-quantile 5.490e-04
-Testing gcc-4_2-dist-negative_binomial-cdf 2.209e-06
-Testing gcc-4_2-dist-negative_binomial-pdf 2.956e-06
-Testing gcc-4_2-dist-negative_binomial-quantile 1.826e-05
-Testing gcc-4_2-dist-norm-R-cdf 1.782e-07
-Testing gcc-4_2-dist-norm-R-pdf 3.027e-07
-Testing gcc-4_2-dist-norm-R-quantile 1.722e-07
-Testing gcc-4_2-dist-normal-cdf 8.542e-08
-Testing gcc-4_2-dist-normal-pdf 2.539e-07
-Testing gcc-4_2-dist-normal-quantile 1.362e-07
-Testing gcc-4_2-dist-pois-R-cdf 1.775e-06
-Testing gcc-4_2-dist-pois-R-pdf 6.545e-07
-Testing gcc-4_2-dist-pois-R-quantile 3.752e-06
-Testing gcc-4_2-dist-poisson-cdf 1.953e-06
-Testing gcc-4_2-dist-poisson-pdf 1.864e-06
-Testing gcc-4_2-dist-poisson-quantile 4.214e-06
-Testing gcc-4_2-dist-students_t-cdf 2.441e-06
-Testing gcc-4_2-dist-students_t-pdf 2.885e-06
-Testing gcc-4_2-dist-students_t-quantile 3.972e-06
-Testing gcc-4_2-dist-t-R-cdf 1.576e-06
-Testing gcc-4_2-dist-t-R-pdf 6.545e-07
-Testing gcc-4_2-dist-t-R-quantile 2.990e-06
-Testing gcc-4_2-dist-weibull-R-cdf 7.031e-07
-Testing gcc-4_2-dist-weibull-R-pdf 1.016e-06
-Testing gcc-4_2-dist-weibull-R-quantile 7.710e-07
-Testing gcc-4_2-dist-weibull-cdf 6.640e-07
-Testing gcc-4_2-dist-weibull-pdf 1.484e-06
-Testing gcc-4_2-dist-weibull-quantile 7.504e-07
-Testing gcc-4_2-erf 9.377e-08
-Testing gcc-4_2-erf_inv 3.598e-07
-Testing gcc-4_2-gamma 1.294e-06
-Testing gcc-4_2-ibeta 4.137e-06
-Testing gcc-4_2-ibeta_inv 1.538e-05
-Testing gcc-4_2-ibeta_invab 5.607e-05
-Testing gcc-4_2-igamma 2.464e-06
-Testing gcc-4_2-igamma_inv 9.291e-06
-Testing gcc-4_2-igamma_inva 2.311e-05
-Testing gcc-4_2-lgamma 1.343e-06
-

Deleted: branches/proto/v3/libs/math/performance/gcc-4.2-long-double-linux.log
==============================================================================
--- branches/proto/v3/libs/math/performance/gcc-4.2-long-double-linux.log 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
+++ (empty file)
@@ -1,105 +0,0 @@
-Testing gcc-4_2-ld-Polynomial-method-0 1.220e-07
-Testing gcc-4_2-ld-Polynomial-method-1 1.269e-07
-Testing gcc-4_2-ld-Polynomial-method-2 9.275e-08
-Testing gcc-4_2-ld-Polynomial-method-3 7.566e-08
-Testing gcc-4_2-ld-Polynomial-mixed-method-0 4.590e-07
-Testing gcc-4_2-ld-Polynomial-mixed-method-1 1.269e-07
-Testing gcc-4_2-ld-Polynomial-mixed-method-2 9.275e-08
-Testing gcc-4_2-ld-Polynomial-mixed-method-3 7.566e-08
-Testing gcc-4_2-ld-Rational-method-0 1.660e-07
-Testing gcc-4_2-ld-Rational-method-1 1.758e-07
-Testing gcc-4_2-ld-Rational-method-2 1.318e-07
-Testing gcc-4_2-ld-Rational-method-3 1.513e-07
-Testing gcc-4_2-ld-Rational-mixed-method-0 5.273e-07
-Testing gcc-4_2-ld-Rational-mixed-method-1 1.758e-07
-Testing gcc-4_2-ld-Rational-mixed-method-2 1.318e-07
-Testing gcc-4_2-ld-Rational-mixed-method-3 1.513e-07
-Testing gcc-4_2-ld-dist-beta-R-cdf 2.050e-06
-Testing gcc-4_2-ld-dist-beta-R-pdf 1.458e-06
-Testing gcc-4_2-ld-dist-beta-R-quantile 5.715e-04
-Testing gcc-4_2-ld-dist-beta-cdf 4.556e-06
-Testing gcc-4_2-ld-dist-beta-pdf 2.916e-06
-Testing gcc-4_2-ld-dist-beta-quantile 1.658e-05
-Testing gcc-4_2-ld-dist-binom-R-cdf 1.104e-06
-Testing gcc-4_2-ld-dist-binom-R-pdf 7.561e-07
-Testing gcc-4_2-ld-dist-binom-R-quantile 5.194e-06
-Testing gcc-4_2-ld-dist-binomial-cdf 1.512e-06
-Testing gcc-4_2-ld-dist-binomial-pdf 2.345e-06
-Testing gcc-4_2-ld-dist-binomial-quantile 8.814e-06
-Testing gcc-4_2-ld-dist-cauchy-R-cdf 2.017e-07
-Testing gcc-4_2-ld-dist-cauchy-R-pdf 5.748e-08
-Testing gcc-4_2-ld-dist-cauchy-R-quantile 1.752e-07
-Testing gcc-4_2-ld-dist-cauchy-cdf 1.352e-07
-Testing gcc-4_2-ld-dist-cauchy-pdf 3.125e-08
-Testing gcc-4_2-ld-dist-cauchy-quantile 1.542e-07
-Testing gcc-4_2-ld-dist-chi_squared-cdf 2.175e-06
-Testing gcc-4_2-ld-dist-chi_squared-pdf 2.175e-06
-Testing gcc-4_2-ld-dist-chi_squared-quantile 1.159e-05
-Testing gcc-4_2-ld-dist-chisq-R-cdf 1.753e-06
-Testing gcc-4_2-ld-dist-chisq-R-pdf 5.657e-07
-Testing gcc-4_2-ld-dist-chisq-R-quantile 6.728e-06
-Testing gcc-4_2-ld-dist-exp-R-cdf 2.561e-07
-Testing gcc-4_2-ld-dist-exp-R-pdf 2.439e-07
-Testing gcc-4_2-ld-dist-exp-R-quantile 1.139e-07
-Testing gcc-4_2-ld-dist-exponential-cdf 2.195e-07
-Testing gcc-4_2-ld-dist-exponential-pdf 2.164e-07
-Testing gcc-4_2-ld-dist-exponential-quantile 1.123e-07
-Testing gcc-4_2-ld-dist-f-R-cdf 2.938e-06
-Testing gcc-4_2-ld-dist-f-R-pdf 1.114e-06
-Testing gcc-4_2-ld-dist-f-R-quantile 1.359e-05
-Testing gcc-4_2-ld-dist-fisher_f-cdf 3.422e-06
-Testing gcc-4_2-ld-dist-fisher_f-pdf 2.357e-06
-Testing gcc-4_2-ld-dist-fisher_f-quantile 2.175e-05
-Testing gcc-4_2-ld-dist-gamma-R-cdf 1.992e-06
-Testing gcc-4_2-ld-dist-gamma-R-pdf 7.812e-07
-Testing gcc-4_2-ld-dist-gamma-R-quantile 5.757e-06
-Testing gcc-4_2-ld-dist-gamma-cdf 3.086e-06
-Testing gcc-4_2-ld-dist-gamma-pdf 2.305e-06
-Testing gcc-4_2-ld-dist-gamma-quantile 1.266e-05
-Testing gcc-4_2-ld-dist-lnorm-R-cdf 3.515e-07
-Testing gcc-4_2-ld-dist-lnorm-R-pdf 4.052e-07
-Testing gcc-4_2-ld-dist-lnorm-R-quantile 7.607e-07
-Testing gcc-4_2-ld-dist-lognormal-cdf 2.075e-07
-Testing gcc-4_2-ld-dist-lognormal-pdf 3.857e-07
-Testing gcc-4_2-ld-dist-lognormal-quantile 7.710e-07
-Testing gcc-4_2-ld-dist-nbinom-R-cdf 2.141e-06
-Testing gcc-4_2-ld-dist-nbinom-R-pdf 1.376e-06
-Testing gcc-4_2-ld-dist-nbinom-R-quantile 5.515e-04
-Testing gcc-4_2-ld-dist-negative_binomial-cdf 2.583e-06
-Testing gcc-4_2-ld-dist-negative_binomial-pdf 3.398e-06
-Testing gcc-4_2-ld-dist-negative_binomial-quantile 2.329e-05
-Testing gcc-4_2-ld-dist-norm-R-cdf 1.782e-07
-Testing gcc-4_2-ld-dist-norm-R-pdf 3.027e-07
-Testing gcc-4_2-ld-dist-norm-R-quantile 1.722e-07
-Testing gcc-4_2-ld-dist-normal-cdf 9.885e-08
-Testing gcc-4_2-ld-dist-normal-pdf 2.490e-07
-Testing gcc-4_2-ld-dist-normal-quantile 2.081e-07
-Testing gcc-4_2-ld-dist-pois-R-cdf 1.775e-06
-Testing gcc-4_2-ld-dist-pois-R-pdf 6.656e-07
-Testing gcc-4_2-ld-dist-pois-R-quantile 3.752e-06
-Testing gcc-4_2-ld-dist-poisson-cdf 2.308e-06
-Testing gcc-4_2-ld-dist-poisson-pdf 1.908e-06
-Testing gcc-4_2-ld-dist-poisson-quantile 5.345e-06
-Testing gcc-4_2-ld-dist-students_t-cdf 3.151e-06
-Testing gcc-4_2-ld-dist-students_t-pdf 3.196e-06
-Testing gcc-4_2-ld-dist-students_t-quantile 5.233e-06
-Testing gcc-4_2-ld-dist-t-R-cdf 1.598e-06
-Testing gcc-4_2-ld-dist-t-R-pdf 6.434e-07
-Testing gcc-4_2-ld-dist-t-R-quantile 2.990e-06
-Testing gcc-4_2-ld-dist-weibull-R-cdf 7.031e-07
-Testing gcc-4_2-ld-dist-weibull-R-pdf 1.035e-06
-Testing gcc-4_2-ld-dist-weibull-R-quantile 7.710e-07
-Testing gcc-4_2-ld-dist-weibull-cdf 6.543e-07
-Testing gcc-4_2-ld-dist-weibull-pdf 1.484e-06
-Testing gcc-4_2-ld-dist-weibull-quantile 7.504e-07
-Testing gcc-4_2-ld-erf 1.387e-07
-Testing gcc-4_2-ld-erf_inv 4.009e-07
-Testing gcc-4_2-ld-gamma 1.489e-06
-Testing gcc-4_2-ld-ibeta 5.354e-06
-Testing gcc-4_2-ld-ibeta_inv 2.220e-05
-Testing gcc-4_2-ld-ibeta_invab 7.009e-05
-Testing gcc-4_2-ld-igamma 3.116e-06
-Testing gcc-4_2-ld-igamma_inv 1.178e-05
-Testing gcc-4_2-ld-igamma_inva 2.765e-05
-Testing gcc-4_2-ld-lgamma 1.562e-06
-

Deleted: branches/proto/v3/libs/math/performance/intel-10-linux.log
==============================================================================
--- branches/proto/v3/libs/math/performance/intel-10-linux.log 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
+++ (empty file)
@@ -1,100 +0,0 @@
-Testing intel-linux-Polynomial-method-0 9.154e-08
-Testing intel-linux-Polynomial-method-1 9.154e-08
-Testing intel-linux-Polynomial-method-2 7.934e-08
-Testing intel-linux-Polynomial-method-3 7.934e-08
-Testing intel-linux-Polynomial-mixed-method-0 9.154e-08
-Testing intel-linux-Polynomial-mixed-method-1 9.154e-08
-Testing intel-linux-Polynomial-mixed-method-2 7.934e-08
-Testing intel-linux-Polynomial-mixed-method-3 7.934e-08
-Testing intel-linux-Rational-method-0 1.245e-07
-Testing intel-linux-Rational-method-1 1.245e-07
-Testing intel-linux-Rational-method-2 1.684e-07
-Testing intel-linux-Rational-method-3 1.294e-07
-Testing intel-linux-Rational-mixed-method-0 1.245e-07
-Testing intel-linux-Rational-mixed-method-1 1.245e-07
-Testing intel-linux-Rational-mixed-method-2 1.684e-07
-Testing intel-linux-Rational-mixed-method-3 1.294e-07
-Testing intel-linux-dist-beta-R-cdf 1.709e-06
-Testing intel-linux-dist-beta-R-pdf 1.276e-06
-Testing intel-linux-dist-beta-R-quantile 4.243e-04
-Testing intel-linux-dist-beta-cdf 3.371e-06
-Testing intel-linux-dist-beta-pdf 2.460e-06
-Testing intel-linux-dist-beta-quantile 1.203e-05
-Testing intel-linux-dist-binom-R-cdf 8.835e-07
-Testing intel-linux-dist-binom-R-pdf 5.692e-07
-Testing intel-linux-dist-binom-R-quantile 4.486e-06
-Testing intel-linux-dist-binomial-cdf 1.308e-06
-Testing intel-linux-dist-binomial-pdf 2.073e-06
-Testing intel-linux-dist-binomial-quantile 6.532e-06
-Testing intel-linux-dist-cauchy-R-cdf 1.291e-07
-Testing intel-linux-dist-cauchy-R-pdf 5.548e-08
-Testing intel-linux-dist-cauchy-R-quantile 1.145e-07
-Testing intel-linux-dist-cauchy-cdf 8.171e-08
-Testing intel-linux-dist-cauchy-pdf 3.278e-08
-Testing intel-linux-dist-cauchy-quantile 1.098e-07
-Testing intel-linux-dist-chi_squared-cdf 1.842e-06
-Testing intel-linux-dist-chi_squared-pdf 1.864e-06
-Testing intel-linux-dist-chi_squared-quantile 9.532e-06
-Testing intel-linux-dist-chisq-R-cdf 1.398e-06
-Testing intel-linux-dist-chisq-R-pdf 3.550e-07
-Testing intel-linux-dist-chisq-R-quantile 5.794e-06
-Testing intel-linux-dist-exp-R-cdf 8.077e-08
-Testing intel-linux-dist-exp-R-pdf 1.113e-07
-Testing intel-linux-dist-exp-R-quantile 8.026e-08
-Testing intel-linux-dist-exponential-cdf 4.568e-08
-Testing intel-linux-dist-exponential-pdf 7.161e-08
-Testing intel-linux-dist-exponential-quantile 9.311e-08
-Testing intel-linux-dist-f-R-cdf 2.486e-06
-Testing intel-linux-dist-f-R-pdf 8.394e-07
-Testing intel-linux-dist-f-R-quantile 1.115e-05
-Testing intel-linux-dist-fisher_f-cdf 2.615e-06
-Testing intel-linux-dist-fisher_f-pdf 2.002e-06
-Testing intel-linux-dist-fisher_f-quantile 1.468e-05
-Testing intel-linux-dist-gamma-R-cdf 1.562e-06
-Testing intel-linux-dist-gamma-R-pdf 4.980e-07
-Testing intel-linux-dist-gamma-R-quantile 4.852e-06
-Testing intel-linux-dist-gamma-cdf 2.461e-06
-Testing intel-linux-dist-gamma-pdf 1.953e-06
-Testing intel-linux-dist-gamma-quantile 1.036e-05
-Testing intel-linux-dist-lnorm-R-cdf 2.685e-07
-Testing intel-linux-dist-lnorm-R-pdf 1.782e-07
-Testing intel-linux-dist-lnorm-R-quantile 5.551e-07
-Testing intel-linux-dist-lognormal-cdf 1.147e-07
-Testing intel-linux-dist-lognormal-pdf 1.489e-07
-Testing intel-linux-dist-lognormal-quantile 5.140e-07
-Testing intel-linux-dist-nbinom-R-cdf 1.699e-06
-Testing intel-linux-dist-nbinom-R-pdf 1.036e-06
-Testing intel-linux-dist-nbinom-R-quantile 4.734e-04
-Testing intel-linux-dist-negative_binomial-cdf 2.107e-06
-Testing intel-linux-dist-negative_binomial-pdf 3.058e-06
-Testing intel-linux-dist-negative_binomial-quantile 1.700e-05
-Testing intel-linux-dist-norm-R-cdf 1.538e-07
-Testing intel-linux-dist-norm-R-pdf 1.172e-07
-Testing intel-linux-dist-norm-R-quantile 1.490e-07
-Testing intel-linux-dist-normal-cdf 5.736e-08
-Testing intel-linux-dist-normal-pdf 5.919e-08
-Testing intel-linux-dist-normal-quantile 1.066e-07
-Testing intel-linux-dist-pois-R-cdf 1.443e-06
-Testing intel-linux-dist-pois-R-pdf 4.549e-07
-Testing intel-linux-dist-pois-R-quantile 3.289e-06
-Testing intel-linux-dist-poisson-cdf 1.953e-06
-Testing intel-linux-dist-poisson-pdf 2.020e-06
-Testing intel-linux-dist-poisson-quantile 4.317e-06
-Testing intel-linux-dist-students_t-cdf 2.486e-06
-Testing intel-linux-dist-students_t-pdf 3.152e-06
-Testing intel-linux-dist-students_t-quantile 3.037e-06
-Testing intel-linux-dist-t-R-cdf 1.198e-06
-Testing intel-linux-dist-t-R-pdf 4.993e-07
-Testing intel-linux-dist-t-R-quantile 2.313e-06
-Testing intel-linux-dist-weibull-R-cdf 1.733e-07
-Testing intel-linux-dist-weibull-R-pdf 5.371e-07
-Testing intel-linux-dist-weibull-R-quantile 5.243e-07
-Testing intel-linux-dist-weibull-cdf 1.611e-07
-Testing intel-linux-dist-weibull-pdf 4.736e-07
-Testing intel-linux-dist-weibull-quantile 5.243e-07
-Testing intel-linux-erf 5.396e-08
-Testing intel-linux-erf_inv 3.392e-07
-Testing intel-linux-gamma 1.392e-06
-Testing intel-linux-ibeta 3.602e-06
-Testing intel-linux-ibeta_inv 1.382e-05
-Testing intel-linux-ibeta_invab

Deleted: branches/proto/v3/libs/math/performance/intel-10-w32.log
==============================================================================
--- branches/proto/v3/libs/math/performance/intel-10-w32.log 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
+++ (empty file)
@@ -1,85 +0,0 @@
-Currently, polynomial evaluation uses method 2
-Currently, rational function evaluation uses method 2
-Currently, the largest order of polynomial or rational function that uses a method other than 0, is 17
-Currently, rational functions with integer coefficients are evaluated using mixed integer/real arithmetic
-Policies are currently set as follows:
-
-Policy Value
-BOOST_MATH_DOMAIN_ERROR_POLICY ignore_error
-BOOST_MATH_POLE_ERROR_POLICY throw_on_error
-BOOST_MATH_OVERFLOW_ERROR_POLICY ignore_error
-BOOST_MATH_UNDERFLOW_ERROR_POLICY ignore_error
-BOOST_MATH_DENORM_ERROR_POLICY ignore_error
-BOOST_MATH_EVALUATION_ERROR_POLICY throw_on_error
-BOOST_MATH_DIGITS10_POLICY 0
-BOOST_MATH_PROMOTE_FLOAT_POLICY true
-BOOST_MATH_PROMOTE_DOUBLE_POLICY true
-BOOST_MATH_DISCRETE_QUANTILE_POLICY integer_round_outwards
-BOOST_MATH_ASSERT_UNDEFINED_POLICY true
-BOOST_MATH_MAX_ITER 1000000
-Testing intel-Polynomial-method-0 7.702e-008
-Testing intel-Polynomial-method-1 7.702e-008
-Testing intel-Polynomial-method-2 7.446e-008
-Testing intel-Polynomial-method-3 7.690e-008
-Testing intel-Polynomial-mixed-method-0 7.702e-008
-Testing intel-Polynomial-mixed-method-1 7.702e-008
-Testing intel-Polynomial-mixed-method-2 6.591e-008
-Testing intel-Polynomial-mixed-method-3 7.934e-008
-Testing intel-Rational-method-0 1.245e-007
-Testing intel-Rational-method-1 1.245e-007
-Testing intel-Rational-method-2 1.465e-007
-Testing intel-Rational-method-3 1.318e-007
-Testing intel-Rational-mixed-method-0 1.245e-007
-Testing intel-Rational-mixed-method-1 1.245e-007
-Testing intel-Rational-mixed-method-2 1.443e-007
-Testing intel-Rational-mixed-method-3 1.294e-007
-Testing intel-dist-beta-cdf 1.779e-006
-Testing intel-dist-beta-pdf 6.959e-007
-Testing intel-dist-beta-quantile 5.112e-006
-Testing intel-dist-binomial-cdf 4.163e-007
-Testing intel-dist-binomial-pdf 4.673e-007
-Testing intel-dist-binomial-quantile 3.935e-006
-Testing intel-dist-cauchy-cdf 6.456e-008
-Testing intel-dist-cauchy-pdf 2.830e-008
-Testing intel-dist-cauchy-quantile 1.264e-007
-Testing intel-dist-chi_squared-cdf 4.999e-007
-Testing intel-dist-chi_squared-pdf 4.278e-007
-Testing intel-dist-chi_squared-quantile 2.902e-006
-Testing intel-dist-exponential-cdf 6.032e-008
-Testing intel-dist-exponential-pdf 5.498e-008
-Testing intel-dist-exponential-quantile 3.087e-007
-Testing intel-dist-fisher_f-cdf 1.180e-006
-Testing intel-dist-fisher_f-pdf 8.087e-007
-Testing intel-dist-fisher_f-quantile 6.056e-006
-Testing intel-dist-gamma-cdf 6.943e-007
-Testing intel-dist-gamma-pdf 5.371e-007
-Testing intel-dist-gamma-quantile 3.335e-006
-Testing intel-dist-lognormal-cdf 1.663e-007
-Testing intel-dist-lognormal-pdf 1.736e-007
-Testing intel-dist-lognormal-quantile 2.315e-007
-Testing intel-dist-negative_binomial-cdf 7.570e-007
-Testing intel-dist-negative_binomial-pdf 8.343e-007
-Testing intel-dist-negative_binomial-quantile 9.774e-006
-Testing intel-dist-normal-cdf 4.583e-008
-Testing intel-dist-normal-pdf 4.767e-008
-Testing intel-dist-normal-quantile 2.033e-007
-Testing intel-dist-poisson-cdf 5.443e-007
-Testing intel-dist-poisson-pdf 2.774e-007
-Testing intel-dist-poisson-quantile 1.311e-006
-Testing intel-dist-students_t-cdf 1.044e-006
-Testing intel-dist-students_t-pdf 6.225e-007
-Testing intel-dist-students_t-quantile 2.152e-006
-Testing intel-dist-weibull-cdf 2.446e-007
-Testing intel-dist-weibull-pdf 2.642e-007
-Testing intel-dist-weibull-quantile 4.734e-007
-Testing intel-erf 4.118e-008
-Testing intel-erf_inv 4.439e-008
-Testing intel-gamma 1.987e-007
-Testing intel-ibeta 1.631e-006
-Testing intel-ibeta_inv 6.133e-006
-Testing intel-ibeta_invab 2.453e-005
-Testing intel-igamma 6.735e-007
-Testing intel-igamma_inv 2.637e-006
-Testing intel-igamma_inva 7.716e-006
-Testing intel-lgamma 2.048e-007
-

Deleted: branches/proto/v3/libs/math/performance/msvc-8-debug.log
==============================================================================
--- branches/proto/v3/libs/math/performance/msvc-8-debug.log 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
+++ (empty file)
@@ -1,85 +0,0 @@
-Currently, polynomial evaluation uses method 3
-Currently, rational function evaluation uses method 0
-Currently, the largest order of polynomial or rational function that uses a method other than 0, is 17
-Currently, rational functions with integer coefficients are evaluated using mixed integer/real arithmetic
-Policies are currently set as follows:
-
-Policy Value
-BOOST_MATH_DOMAIN_ERROR_POLICY ignore_error
-BOOST_MATH_POLE_ERROR_POLICY throw_on_error
-BOOST_MATH_OVERFLOW_ERROR_POLICY ignore_error
-BOOST_MATH_UNDERFLOW_ERROR_POLICY ignore_error
-BOOST_MATH_DENORM_ERROR_POLICY ignore_error
-BOOST_MATH_EVALUATION_ERROR_POLICY throw_on_error
-BOOST_MATH_DIGITS10_POLICY 0
-BOOST_MATH_PROMOTE_FLOAT_POLICY true
-BOOST_MATH_PROMOTE_DOUBLE_POLICY true
-BOOST_MATH_DISCRETE_QUANTILE_POLICY integer_round_outwards
-BOOST_MATH_ASSERT_UNDEFINED_POLICY true
-BOOST_MATH_MAX_ITER 1000000
-Testing msvc-debug-Polynomial-method-0 1.369e-006
-Testing msvc-debug-Polynomial-method-1 7.625e-007
-Testing msvc-debug-Polynomial-method-2 5.955e-007
-Testing msvc-debug-Polynomial-method-3 9.393e-007
-Testing msvc-debug-Polynomial-mixed-method-0 1.758e-006
-Testing msvc-debug-Polynomial-mixed-method-1 1.330e-006
-Testing msvc-debug-Polynomial-mixed-method-2 1.252e-006
-Testing msvc-debug-Polynomial-mixed-method-3 1.467e-006
-Testing msvc-debug-Rational-method-0 8.016e-007
-Testing msvc-debug-Rational-method-1 4.495e-007
-Testing msvc-debug-Rational-method-2 4.691e-007
-Testing msvc-debug-Rational-method-3 6.551e-007
-Testing msvc-debug-Rational-mixed-method-0 1.191e-006
-Testing msvc-debug-Rational-mixed-method-1 9.979e-007
-Testing msvc-debug-Rational-mixed-method-2 9.588e-007
-Testing msvc-debug-Rational-mixed-method-3 1.172e-006
-Testing msvc-debug-dist-beta-cdf 1.895e-005
-Testing msvc-debug-dist-beta-pdf 8.301e-006
-Testing msvc-debug-dist-beta-quantile 6.276e-005
-Testing msvc-debug-dist-binomial-cdf 4.085e-006
-Testing msvc-debug-dist-binomial-pdf 4.696e-006
-Testing msvc-debug-dist-binomial-quantile 3.777e-005
-Testing msvc-debug-dist-cauchy-cdf 9.700e-007
-Testing msvc-debug-dist-cauchy-pdf 5.979e-007
-Testing msvc-debug-dist-cauchy-quantile 9.167e-007
-Testing msvc-debug-dist-chi_squared-cdf 5.689e-006
-Testing msvc-debug-dist-chi_squared-pdf 4.176e-006
-Testing msvc-debug-dist-chi_squared-quantile 4.269e-005
-Testing msvc-debug-dist-exponential-cdf 1.585e-006
-Testing msvc-debug-dist-exponential-pdf 6.099e-007
-Testing msvc-debug-dist-exponential-quantile 6.801e-007
-Testing msvc-debug-dist-fisher_f-cdf 1.021e-005
-Testing msvc-debug-dist-fisher_f-pdf 6.586e-006
-Testing msvc-debug-dist-fisher_f-quantile 7.732e-005
-Testing msvc-debug-dist-gamma-cdf 7.969e-006
-Testing msvc-debug-dist-gamma-pdf 5.078e-006
-Testing msvc-debug-dist-gamma-quantile 5.270e-005
-Testing msvc-debug-dist-lognormal-cdf 1.953e-006
-Testing msvc-debug-dist-lognormal-pdf 1.408e-006
-Testing msvc-debug-dist-lognormal-quantile 2.718e-006
-Testing msvc-debug-dist-negative_binomial-cdf 7.204e-006
-Testing msvc-debug-dist-negative_binomial-pdf 6.932e-006
-Testing msvc-debug-dist-negative_binomial-quantile 8.701e-005
-Testing msvc-debug-dist-normal-cdf 1.074e-006
-Testing msvc-debug-dist-normal-pdf 6.258e-007
-Testing msvc-debug-dist-normal-quantile 1.832e-006
-Testing msvc-debug-dist-poisson-cdf 6.133e-006
-Testing msvc-debug-dist-poisson-pdf 2.178e-006
-Testing msvc-debug-dist-poisson-quantile 2.097e-005
-Testing msvc-debug-dist-students_t-cdf 9.409e-006
-Testing msvc-debug-dist-students_t-pdf 4.526e-006
-Testing msvc-debug-dist-students_t-quantile 1.906e-005
-Testing msvc-debug-dist-weibull-cdf 2.621e-006
-Testing msvc-debug-dist-weibull-pdf 2.347e-006
-Testing msvc-debug-dist-weibull-quantile 2.348e-006
-Testing msvc-debug-erf 1.028e-006
-Testing msvc-debug-erf_inv 1.215e-006
-Testing msvc-debug-gamma 2.321e-006
-Testing msvc-debug-ibeta 1.540e-005
-Testing msvc-debug-ibeta_inv 7.492e-005
-Testing msvc-debug-ibeta_invab 2.441e-004
-Testing msvc-debug-igamma 1.044e-005
-Testing msvc-debug-igamma_inv 3.721e-005
-Testing msvc-debug-igamma_inva 1.124e-004
-Testing msvc-debug-lgamma 2.490e-006
-

Deleted: branches/proto/v3/libs/math/performance/msvc-8.log
==============================================================================
--- branches/proto/v3/libs/math/performance/msvc-8.log 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
+++ (empty file)
@@ -1,141 +0,0 @@
-Currently, polynomial evaluation uses method 3
-Currently, rational function evaluation uses method 0
-Currently, the largest order of polynomial or rational function that uses a method other than 0, is 17
-Currently, rational functions with integer coefficients are evaluated using mixed integer/real arithmetic
-Policies are currently set as follows:
-
-Policy Value
-BOOST_MATH_DOMAIN_ERROR_POLICY ignore_error
-BOOST_MATH_POLE_ERROR_POLICY throw_on_error
-BOOST_MATH_OVERFLOW_ERROR_POLICY ignore_error
-BOOST_MATH_UNDERFLOW_ERROR_POLICY ignore_error
-BOOST_MATH_DENORM_ERROR_POLICY ignore_error
-BOOST_MATH_EVALUATION_ERROR_POLICY throw_on_error
-BOOST_MATH_DIGITS10_POLICY 0
-BOOST_MATH_PROMOTE_FLOAT_POLICY true
-BOOST_MATH_PROMOTE_DOUBLE_POLICY true
-BOOST_MATH_DISCRETE_QUANTILE_POLICY integer_round_outwards
-BOOST_MATH_ASSERT_UNDEFINED_POLICY true
-BOOST_MATH_MAX_ITER 1000000
-Testing msvc-Polynomial-method-0 1.161e-007
-Testing msvc-Polynomial-method-1 9.777e-008
-Testing msvc-Polynomial-method-2 9.289e-008
-Testing msvc-Polynomial-method-3 8.678e-008
-Testing msvc-Polynomial-mixed-method-0 1.638e-007
-Testing msvc-Polynomial-mixed-method-1 9.777e-008
-Testing msvc-Polynomial-mixed-method-2 9.289e-008
-Testing msvc-Polynomial-mixed-method-3 8.678e-008
-Testing msvc-Rational-method-0 1.443e-007
-Testing msvc-Rational-method-1 1.492e-007
-Testing msvc-Rational-method-2 1.736e-007
-Testing msvc-Rational-method-3 1.540e-007
-Testing msvc-Rational-mixed-method-0 1.418e-007
-Testing msvc-Rational-mixed-method-1 1.514e-007
-Testing msvc-Rational-mixed-method-2 1.736e-007
-Testing msvc-Rational-mixed-method-3 1.540e-007
-Testing msvc-dist-beta-R-cdf 1.597e-006
-Testing msvc-dist-beta-R-pdf 1.412e-006
-Testing msvc-dist-beta-R-quantile 4.905e-004
-Testing msvc-dist-beta-cdf 1.916e-006
-Testing msvc-dist-beta-pdf 7.643e-007
-Testing msvc-dist-beta-quantile 6.570e-006
-Testing msvc-dist-binom-R-cdf 1.293e-006
-Testing msvc-dist-binom-R-pdf 1.055e-006
-Testing msvc-dist-binom-R-quantile 5.280e-006
-Testing msvc-dist-binomial-cdf 5.276e-007
-Testing msvc-dist-binomial-pdf 9.685e-007
-Testing msvc-dist-binomial-quantile 4.013e-006
-Testing msvc-dist-cauchy-R-cdf 1.576e-007
-Testing msvc-dist-cauchy-R-pdf 3.586e-008
-Testing msvc-dist-cauchy-R-quantile 1.498e-007
-Testing msvc-dist-cauchy-cdf 1.231e-007
-Testing msvc-dist-cauchy-pdf 4.191e-008
-Testing msvc-dist-cauchy-quantile 1.498e-007
-Testing msvc-dist-ch-cephes-cdf 1.067e-006
-Testing msvc-dist-ch-cephes-quantile 4.336e-005
-Testing msvc-dist-chi_squared-cdf 7.889e-007
-Testing msvc-dist-chi_squared-pdf 7.324e-007
-Testing msvc-dist-chi_squared-quantile 4.303e-006
-Testing msvc-dist-chisq-R-cdf 1.955e-006
-Testing msvc-dist-chisq-R-pdf 8.111e-007
-Testing msvc-dist-chisq-R-quantile 6.925e-006
-Testing msvc-dist-exp-R-cdf 3.844e-007
-Testing msvc-dist-exp-R-pdf 4.400e-007
-Testing msvc-dist-exp-R-quantile 1.126e-007
-Testing msvc-dist-exponential-cdf 1.955e-007
-Testing msvc-dist-exponential-pdf 2.016e-007
-Testing msvc-dist-exponential-quantile 1.206e-007
-Testing msvc-dist-f-R-cdf 2.780e-006
-Testing msvc-dist-f-R-pdf 1.115e-006
-Testing msvc-dist-f-R-quantile 1.280e-005
-Testing msvc-dist-f-cephes-cdf 1.390e-006
-Testing msvc-dist-f-cephes-quantile 2.719e-005
-Testing msvc-dist-fisher_f-cdf 1.309e-006
-Testing msvc-dist-fisher_f-pdf 8.555e-007
-Testing msvc-dist-fisher_f-quantile 7.204e-006
-Testing msvc-dist-gamma-R-cdf 2.227e-006
-Testing msvc-dist-gamma-R-pdf 9.785e-007
-Testing msvc-dist-gamma-R-quantile 5.937e-006
-Testing msvc-dist-gamma-cdf 1.076e-006
-Testing msvc-dist-gamma-pdf 9.092e-007
-Testing msvc-dist-gamma-quantile 5.189e-006
-Testing msvc-dist-lnorm-R-cdf 2.930e-007
-Testing msvc-dist-lnorm-R-pdf 5.576e-007
-Testing msvc-dist-lnorm-R-quantile 1.090e-006
-Testing msvc-dist-lognormal-cdf 2.078e-007
-Testing msvc-dist-lognormal-pdf 4.546e-007
-Testing msvc-dist-lognormal-quantile 6.692e-007
-Testing msvc-dist-nbinom-R-cdf 2.178e-006
-Testing msvc-dist-nbinom-R-pdf 1.531e-006
-Testing msvc-dist-nbinom-R-quantile 5.145e-004
-Testing msvc-dist-negative_binomial-cdf 9.005e-007
-Testing msvc-dist-negative_binomial-pdf 9.515e-007
-Testing msvc-dist-negative_binomial-quantile 9.601e-006
-Testing msvc-dist-norm-R-cdf 1.785e-007
-Testing msvc-dist-norm-R-pdf 5.273e-007
-Testing msvc-dist-norm-R-quantile 1.311e-007
-Testing msvc-dist-normal-cdf 5.926e-008
-Testing msvc-dist-normal-pdf 2.539e-007
-Testing msvc-dist-normal-quantile 1.248e-007
-Testing msvc-dist-pois-R-cdf 2.175e-006
-Testing msvc-dist-pois-R-pdf 1.287e-006
-Testing msvc-dist-pois-R-quantile 4.014e-006
-Testing msvc-dist-poisson-cdf 8.999e-007
-Testing msvc-dist-poisson-pdf 5.770e-007
-Testing msvc-dist-poisson-quantile 1.853e-006
-Testing msvc-dist-students_t-cdf 1.223e-006
-Testing msvc-dist-students_t-pdf 7.668e-007
-Testing msvc-dist-students_t-quantile 2.570e-006
-Testing msvc-dist-t-R-cdf 1.376e-006
-Testing msvc-dist-t-R-pdf 8.333e-007
-Testing msvc-dist-t-R-quantile 2.668e-006
-Testing msvc-dist-weibull-R-cdf 6.943e-007
-Testing msvc-dist-weibull-R-pdf 1.074e-006
-Testing msvc-dist-weibull-R-quantile 8.542e-007
-Testing msvc-dist-weibull-cdf 4.741e-007
-Testing msvc-dist-weibull-pdf 7.725e-007
-Testing msvc-dist-weibull-quantile 7.926e-007
-Testing msvc-erf 6.173e-008
-Testing msvc-erf-cephes 8.094e-008
-Testing msvc-erf-gsl 4.374e-007
-Testing msvc-erf_inv 6.302e-008
-Testing msvc-gamma 2.566e-007
-Testing msvc-gamma-cephes 1.709e-007
-Testing msvc-gamma-gsl 2.627e-007
-Testing msvc-ibeta 1.852e-006
-Testing msvc-ibeta-cephes 1.974e-006
-Testing msvc-ibeta-gsl 2.095e-006
-Testing msvc-ibeta_inv 7.311e-006
-Testing msvc-ibeta_inv-cephes 1.637e-005
-Testing msvc-ibeta_invab 2.847e-005
-Testing msvc-igamma 9.504e-007
-Testing msvc-igamma-cephes 2.439e-006
-Testing msvc-igamma-gsl 2.042e-006
-Testing msvc-igamma_inv 3.631e-006
-Testing msvc-igamma_inva 9.982e-006
-Testing msvc-lgamma 2.688e-007
-Testing msvc-lgamma-cephes 1.556e-007
-Testing msvc-lgamma-gsl 5.621e-007
-
-
-

Modified: branches/proto/v3/libs/multi_index/test/Jamfile.v2
==============================================================================
--- branches/proto/v3/libs/multi_index/test/Jamfile.v2 (original)
+++ branches/proto/v3/libs/multi_index/test/Jamfile.v2 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -7,6 +7,25 @@
 #
 # See http://www.boost.org/libs/multi_index for library home page.
 
+import os ;
+import type ;
+
+# Windows Vista UAC has an heuristic by which executable files whose name
+# contains any of the words "install", "setup", "update", etc. are assumed
+# to be installation packages needing administrative rights, which causes
+# the system to bring up a window asking for execution confirmation by the
+# user, thus interferring in the unattended bjam process.
+# Problem bypassed by changing the EXE names containing a taboo word.
+# Thanks to Rene Rivera for guidance on the use of the <tag> feature.
+
+rule change-test_update-exe-name ( name : type ? : property-set )
+{
+ if [ os.on-windows ] && [ type.is-subtype $(type) EXE ]
+ {
+ return test_updat.exe ;
+ }
+}
+
 test-suite "multi_index" :
     [ run test_basic.cpp test_basic_main.cpp ]
     [ run test_capacity.cpp test_capacity_main.cpp ]
@@ -27,9 +46,12 @@
     [ run test_safe_mode.cpp test_safe_mode_main.cpp ]
     [ run test_serialization.cpp test_serialization1.cpp
           test_serialization2.cpp test_serialization3.cpp
- test_serialization_main.cpp
+ test_serialization_main.cpp
                 /boost/serialization//boost_serialization ]
     [ run test_set_ops.cpp test_set_ops_main.cpp ]
     [ run test_special_set_ops.cpp test_special_set_ops_main.cpp ]
- [ run test_update.cpp test_update_main.cpp ]
+ [ run test_update.cpp test_update_main.cpp
+ : : :
+ -<tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag
+ <tag>@change-test_update-exe-name ]
     ;

Modified: branches/proto/v3/libs/platform_maintainers.txt
==============================================================================
--- branches/proto/v3/libs/platform_maintainers.txt (original)
+++ branches/proto/v3/libs/platform_maintainers.txt 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,6 +1,6 @@
 gcc-3_3-darwin Noel Belcourt <kbelco -at- sandia.gov>
 cw-9_5-darwin Noel Belcourt <kbelco -at- sandia.gov>
+hp_cxx-*_tru64 Markus Schöpflin <markus.schoepflin -at- comsoft.de>
 
 © Copyright Douglas Gregor 2005
 Distributed under the Boost Software License, Version 1.0. See www.boost.org/LICENSE_1_0.txt
-

Modified: branches/proto/v3/libs/regex/example/timer/regex_timer.cpp
==============================================================================
--- branches/proto/v3/libs/regex/example/timer/regex_timer.cpp (original)
+++ branches/proto/v3/libs/regex/example/timer/regex_timer.cpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -143,7 +143,7 @@
    boost::match_results<std::deque<char>::iterator> dm;
    std::string s1, s2, ts;
    std::deque<char> ds;
- boost::regex_t r;
+ boost::regex_tA r;
    boost::scoped_array<boost::regmatch_t> matches;
    std::size_t nsubs;
    boost::timer t;
@@ -175,12 +175,12 @@
          cout << "Error in expression: \"" << e.what() << "\"" << endl;
          continue;
       }
- int code = regcomp(&r, s1.c_str(), boost::REG_PERL);
+ int code = regcompA(&r, s1.c_str(), boost::REG_PERL);
       if(code != 0)
       {
          char buf[256];
- regerror(code, &r, buf, 256);
- cout << "regcomp error: \"" << buf << "\"" << endl;
+ regerrorA(code, &r, buf, 256);
+ cout << "regcompA error: \"" << buf << "\"" << endl;
          continue;
       }
       nsubs = r.re_nsub + 1;
@@ -324,17 +324,17 @@
          iters = 10;
          tim = 1.1;
          // cache load:
- regexec(&r, s2.c_str(), nsubs, matches.get(), 0);
+ regexecA(&r, s2.c_str(), nsubs, matches.get(), 0);
          do{
             iters *= (tim > 0.001) ? (1.1/tim) : 100;
             t.restart();
             for(i = 0; i < iters; ++i)
             {
- result = regexec(&r, s2.c_str(), nsubs, matches.get(), 0);
+ result = regexecA(&r, s2.c_str(), nsubs, matches.get(), 0);
             }
             tim = t.elapsed();
          }while(tim < wait_time);
- cout << "POSIX regexec time: " << (tim * 1000000 / iters) << "us" << endl;
+ cout << "POSIX regexecA time: " << (tim * 1000000 / iters) << "us" << endl;
 
          if(result == 0)
          {
@@ -360,7 +360,7 @@
             cout << "\" (matched=" << (matches[0].rm_eo != s2.size()) << ")" << endl << endl;
          }
       }
- regfree(&r);
+ regfreeA(&r);
    }
 
    if(pbuf)
@@ -372,7 +372,7 @@
    return 0;
 }
 
-#if defined(_WIN32) && defined(BOOST_REGEX_USE_WIN32_LOCALE)
+#if defined(_WIN32) && defined(BOOST_REGEX_USE_WIN32_LOCALE) && !defined(UNDER_CE)
 #pragma comment(lib, "user32.lib")
 #endif
 

Modified: branches/proto/v3/libs/regex/src/cregex.cpp
==============================================================================
--- branches/proto/v3/libs/regex/src/cregex.cpp (original)
+++ branches/proto/v3/libs/regex/src/cregex.cpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -354,7 +354,7 @@
 
       while(dstart != dend)
       {
-#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400) && !defined(_WIN32_WCE)
+#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400) && !defined(_WIN32_WCE) && !defined(UNDER_CE)
          (::sprintf_s)(buf, sizeof(buf), "%s%s%s", dstart.path(), directory_iterator::separator(), ptr);
 #else
          (std::sprintf)(buf, "%s%s%s", dstart.path(), directory_iterator::separator(), ptr);

Modified: branches/proto/v3/libs/regex/src/fileiter.cpp
==============================================================================
--- branches/proto/v3/libs/regex/src/fileiter.cpp (original)
+++ branches/proto/v3/libs/regex/src/fileiter.cpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -86,7 +86,14 @@
 
 void mapfile::open(const char* file)
 {
-#if defined(__CYGWIN__)||defined(__CYGWIN32__)
+#if defined(BOOST_NO_ANSI_APIS)
+ int filename_size = strlen(file);
+ LPWSTR wide_file = (LPWSTR)_alloca( (filename_size + 1) * sizeof(WCHAR) );
+ if(::MultiByteToWideChar(CP_ACP, 0, file, filename_size, wide_file, filename_size + 1) == 0)
+ hfile = INVALID_HANDLE_VALUE;
+ else
+ hfile = CreateFileW(wide_file, GENERIC_READ, FILE_SHARE_READ, 0, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
+#elif defined(__CYGWIN__)||defined(__CYGWIN32__)
    char win32file[ MAX_PATH ];
    cygwin_conv_to_win32_path( file, win32file );
    hfile = CreateFileA(win32file, GENERIC_READ, FILE_SHARE_READ, 0, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
@@ -350,6 +357,48 @@
 
 #endif
 
+inline _fi_find_handle find_first_file(const char* wild, _fi_find_data& data)
+{
+#ifdef BOOST_NO_ANSI_APIS
+ std::size_t wild_size = std::strlen(wild);
+ LPWSTR wide_wild = (LPWSTR)_alloca( (wild_size + 1) * sizeof(WCHAR) );
+ if (::MultiByteToWideChar(CP_ACP, 0, wild, wild_size, wide_wild, wild_size + 1) == 0)
+ return _fi_invalid_handle;
+
+ return FindFirstFileW(wide_wild, &data);
+#else
+ return FindFirstFileA(wild, &data);
+#endif
+}
+
+inline bool find_next_file(_fi_find_handle hf, _fi_find_data& data)
+{
+#ifdef BOOST_NO_ANSI_APIS
+ return FindNextFileW(hf, &data);
+#else
+ return FindNextFileA(hf, &data);
+#endif
+}
+
+inline void copy_find_file_result_with_overflow_check(const _fi_find_data& data, char* path, size_t max_size)
+{
+#ifdef BOOST_NO_ANSI_APIS
+ if (::WideCharToMultiByte(CP_ACP, 0, data.cFileName, -1, path, max_size, NULL, NULL) == 0)
+ re_detail::overflow_error_if_not_zero(1);
+#else
+ re_detail::overflow_error_if_not_zero(re_detail::strcpy_s(path, max_size, data.cFileName));
+#endif
+}
+
+inline bool is_not_current_or_parent_path_string(const _fi_find_data& data)
+{
+#ifdef BOOST_NO_ANSI_APIS
+ return (std::wcscmp(data.cFileName, L".") && std::wcscmp(data.cFileName, L".."));
+#else
+ return (std::strcmp(data.cFileName, ".") && std::strcmp(data.cFileName, ".."));
+#endif
+}
+
 
 file_iterator::file_iterator()
 {
@@ -413,7 +462,7 @@
 
    ref = new file_iterator_ref();
    BOOST_REGEX_NOEH_ASSERT(ref)
- ref->hf = FindFirstFileA(wild, &(ref->_data));
+ ref->hf = find_first_file(wild, ref->_data);
    ref->count = 1;
 
    if(ref->hf == _fi_invalid_handle)
@@ -423,7 +472,7 @@
    }
    else
    {
- re_detail::overflow_error_if_not_zero(re_detail::strcpy_s(ptr, (MAX_PATH - (ptr - _path)), ref->_data.cFileName));
+ copy_find_file_result_with_overflow_check(ref->_data, ptr, (MAX_PATH - (ptr - _path)));
       if(ref->_data.dwFileAttributes & _fi_dir)
          next();
    }
@@ -510,7 +559,7 @@
       bool cont = true;
       while(cont)
       {
- cont = FindNextFileA(ref->hf, &(ref->_data));
+ cont = find_next_file(ref->hf, ref->_data);
          if(cont && ((ref->_data.dwFileAttributes & _fi_dir) == 0))
             break;
       }
@@ -523,7 +572,7 @@
          ptr = _path;
       }
       else
- re_detail::overflow_error_if_not_zero(re_detail::strcpy_s(ptr, MAX_PATH - (ptr - _path), ref->_data.cFileName));
+ copy_find_file_result_with_overflow_check(ref->_data, ptr, MAX_PATH - (ptr - _path));
    }
 }
 
@@ -593,7 +642,7 @@
    ref = new file_iterator_ref();
    BOOST_REGEX_NOEH_ASSERT(ref)
    ref->count = 1;
- ref->hf = FindFirstFileA(wild, &(ref->_data));
+ ref->hf = find_first_file(wild, ref->_data);
    if(ref->hf == _fi_invalid_handle)
    {
       *_path = 0;
@@ -601,8 +650,8 @@
    }
    else
    {
- re_detail::overflow_error_if_not_zero(re_detail::strcpy_s(ptr, MAX_PATH - (ptr - _path), ref->_data.cFileName));
- if(((ref->_data.dwFileAttributes & _fi_dir) == 0) || (std::strcmp(ref->_data.cFileName, ".") == 0) || (std::strcmp(ref->_data.cFileName, "..") == 0))
+ copy_find_file_result_with_overflow_check(ref->_data, ptr, MAX_PATH - (ptr - _path));
+ if(((ref->_data.dwFileAttributes & _fi_dir) == 0) || (std::strcmp(ptr, ".") == 0) || (std::strcmp(ptr, "..") == 0))
          next();
    }
 #ifndef BOOST_NO_EXCEPTIONS
@@ -686,10 +735,10 @@
       bool cont = true;
       while(cont)
       {
- cont = FindNextFileA(ref->hf, &(ref->_data));
+ cont = find_next_file(ref->hf, ref->_data);
          if(cont && (ref->_data.dwFileAttributes & _fi_dir))
          {
- if(std::strcmp(ref->_data.cFileName, ".") && std::strcmp(ref->_data.cFileName, ".."))
+ if(is_not_current_or_parent_path_string(ref->_data))
                break;
          }
       }
@@ -702,7 +751,7 @@
          ptr = _path;
       }
       else
- re_detail::overflow_error_if_not_zero(re_detail::strcpy_s(ptr, MAX_PATH - (ptr - _path), ref->_data.cFileName));
+ copy_find_file_result_with_overflow_check(ref->_data, ptr, MAX_PATH - (ptr - _path));
    }
 }
 

Modified: branches/proto/v3/libs/regex/src/posix_api.cpp
==============================================================================
--- branches/proto/v3/libs/regex/src/posix_api.cpp (original)
+++ branches/proto/v3/libs/regex/src/posix_api.cpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -164,7 +164,7 @@
       {
          if(std::strcmp(e->re_endp, names[i]) == 0)
          {
-#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400) && !defined(_WIN32_WCE)
+#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400) && !defined(_WIN32_WCE) && !defined(UNDER_CE)
             (::sprintf_s)(localbuf, 5, "%d", i);
 #else
             (std::sprintf)(localbuf, "%d", i);
@@ -174,7 +174,7 @@
             return std::strlen(localbuf) + 1;
          }
       }
-#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400) && !defined(_WIN32_WCE)
+#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400) && !defined(_WIN32_WCE) && !defined(UNDER_CE)
       (::sprintf_s)(localbuf, 5, "%d", 0);
 #else
       (std::sprintf)(localbuf, "%d", 0);

Modified: branches/proto/v3/libs/regex/src/w32_regex_traits.cpp
==============================================================================
--- branches/proto/v3/libs/regex/src/w32_regex_traits.cpp (original)
+++ branches/proto/v3/libs/regex/src/w32_regex_traits.cpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -30,7 +30,7 @@
 #define NOGDI
 #include <windows.h>
 
-#if defined(_MSC_VER) && !defined(_WIN32_WCE)
+#if defined(_MSC_VER) && !defined(_WIN32_WCE) && !defined(UNDER_CE)
 #pragma comment(lib, "user32.lib")
 #endif
 
@@ -42,6 +42,18 @@
 
 namespace boost{ namespace re_detail{
 
+#ifdef BOOST_NO_ANSI_APIS
+UINT get_code_page_for_locale_id(lcid_type id)
+{
+ WCHAR code_page_string[7];
+ if (::GetLocaleInfoW(id, LOCALE_IDEFAULTANSICODEPAGE, code_page_string, 7) == 0)
+ return 0;
+
+ return static_cast<UINT>(_wtol(code_page_string));
+}
+#endif
+
+
 void w32_regex_traits_char_layer<char>::init()
 {
    // we need to start by initialising our syntax map so we know which
@@ -106,8 +118,24 @@
    char char_map[1 << CHAR_BIT];
    for(int ii = 0; ii < (1 << CHAR_BIT); ++ii)
       char_map[ii] = static_cast<char>(ii);
+#ifndef BOOST_NO_ANSI_APIS
    int r = ::LCMapStringA(this->m_locale, LCMAP_LOWERCASE, char_map, 1 << CHAR_BIT, this->m_lower_map, 1 << CHAR_BIT);
    BOOST_ASSERT(r != 0);
+#else
+ UINT code_page = get_code_page_for_locale_id(this->m_locale);
+ BOOST_ASSERT(code_page != 0);
+
+ WCHAR wide_char_map[1 << CHAR_BIT];
+ int conv_r = ::MultiByteToWideChar(code_page, 0, char_map, 1 << CHAR_BIT, wide_char_map, 1 << CHAR_BIT);
+ BOOST_ASSERT(conv_r != 0);
+
+ WCHAR wide_lower_map[1 << CHAR_BIT];
+ int r = ::LCMapStringW(this->m_locale, LCMAP_LOWERCASE, wide_char_map, 1 << CHAR_BIT, wide_lower_map, 1 << CHAR_BIT);
+ BOOST_ASSERT(r != 0);
+
+ conv_r = ::WideCharToMultiByte(code_page, 0, wide_lower_map, r, this->m_lower_map, 1 << CHAR_BIT, NULL, NULL);
+ BOOST_ASSERT(conv_r != 0);
+#endif
    if(r < (1 << CHAR_BIT))
    {
       // if we have multibyte characters then not all may have been given
@@ -115,7 +143,12 @@
       for(int jj = r; jj < (1 << CHAR_BIT); ++jj)
          this->m_lower_map[jj] = static_cast<char>(jj);
    }
+
+#ifndef BOOST_NO_ANSI_APIS
    r = ::GetStringTypeExA(this->m_locale, CT_CTYPE1, char_map, 1 << CHAR_BIT, this->m_type_map);
+#else
+ r = ::GetStringTypeExW(this->m_locale, CT_CTYPE1, wide_char_map, 1 << CHAR_BIT, this->m_type_map);
+#endif
    BOOST_ASSERT(0 != r);
 }
 
@@ -126,10 +159,25 @@
 
 BOOST_REGEX_DECL bool BOOST_REGEX_CALL w32_is_lower(char c, lcid_type id)
 {
+#ifndef BOOST_NO_ANSI_APIS
    WORD mask;
    if(::GetStringTypeExA(id, CT_CTYPE1, &c, 1, &mask) && (mask & C1_LOWER))
       return true;
    return false;
+#else
+ UINT code_page = get_code_page_for_locale_id(id);
+ if (code_page == 0)
+ return false;
+
+ WCHAR wide_c;
+ if (::MultiByteToWideChar(code_page, 0, &c, 1, &wide_c, 1) == 0)
+ return false;
+
+ WORD mask;
+ if(::GetStringTypeExW(id, CT_CTYPE1, &wide_c, 1, &mask) && (mask & C1_LOWER))
+ return true;
+ return false;
+#endif
 }
 
 BOOST_REGEX_DECL bool BOOST_REGEX_CALL w32_is_lower(wchar_t c, lcid_type id)
@@ -152,10 +200,25 @@
 
 BOOST_REGEX_DECL bool BOOST_REGEX_CALL w32_is_upper(char c, lcid_type id)
 {
+#ifndef BOOST_NO_ANSI_APIS
    WORD mask;
    if(::GetStringTypeExA(id, CT_CTYPE1, &c, 1, &mask) && (mask & C1_UPPER))
       return true;
    return false;
+#else
+ UINT code_page = get_code_page_for_locale_id(id);
+ if (code_page == 0)
+ return false;
+
+ WCHAR wide_c;
+ if (::MultiByteToWideChar(code_page, 0, &c, 1, &wide_c, 1) == 0)
+ return false;
+
+ WORD mask;
+ if(::GetStringTypeExW(id, CT_CTYPE1, &wide_c, 1, &mask) && (mask & C1_UPPER))
+ return true;
+ return false;
+#endif
 }
 
 BOOST_REGEX_DECL bool BOOST_REGEX_CALL w32_is_upper(wchar_t c, lcid_type id)
@@ -183,12 +246,22 @@
 
 BOOST_REGEX_DECL cat_type BOOST_REGEX_CALL w32_cat_open(const std::string& name)
 {
+#ifndef BOOST_NO_ANSI_APIS
    cat_type result(::LoadLibraryA(name.c_str()), &free_module);
    return result;
+#else
+ LPWSTR wide_name = (LPWSTR)_alloca( (name.size() + 1) * sizeof(WCHAR) );
+ if (::MultiByteToWideChar(CP_ACP, 0, name.c_str(), name.size(), wide_name, name.size() + 1) == 0)
+ return cat_type();
+
+ cat_type result(::LoadLibraryW(wide_name), &free_module);
+ return result;
+#endif
 }
 
 BOOST_REGEX_DECL std::string BOOST_REGEX_CALL w32_cat_get(const cat_type& cat, lcid_type, int i, const std::string& def)
 {
+#ifndef BOOST_NO_ANSI_APIS
    char buf[256];
    if(0 == ::LoadStringA(
       static_cast<HMODULE>(cat.get()),
@@ -199,6 +272,21 @@
    {
       return def;
    }
+#else
+ WCHAR wbuf[256];
+ int r = ::LoadStringW(
+ static_cast<HMODULE>(cat.get()),
+ i,
+ wbuf,
+ 256
+ );
+ if (r == 0)
+ return def;
+
+ LPSTR buf = (LPSTR)_alloca( (r + 1) * 2 );
+ if (::WideCharToMultiByte(CP_ACP, 0, wbuf, r, buf, (r + 1) * 2, NULL, NULL) == 0)
+ return def;
+#endif
    return std::string(buf);
 }
 
@@ -236,6 +324,7 @@
 #endif
 BOOST_REGEX_DECL std::string BOOST_REGEX_CALL w32_transform(lcid_type id, const char* p1, const char* p2)
 {
+#ifndef BOOST_NO_ANSI_APIS
    int bytes = ::LCMapStringA(
       id, // locale identifier
       LCMAP_SORTKEY, // mapping transformation type
@@ -255,6 +344,36 @@
       &*result.begin(), // destination buffer
       bytes // size of destination buffer
       );
+#else
+ UINT code_page = get_code_page_for_locale_id(id);
+ if(code_page == 0)
+ return std::string(p1, p2);
+
+ int src_len = static_cast<int>(p2 - p1);
+ LPWSTR wide_p1 = (LPWSTR)_alloca( (src_len + 1) * 2 );
+ if(::MultiByteToWideChar(code_page, 0, p1, src_len, wide_p1, src_len + 1) == 0)
+ return std::string(p1, p2);
+
+ int bytes = ::LCMapStringW(
+ id, // locale identifier
+ LCMAP_SORTKEY, // mapping transformation type
+ wide_p1, // source string
+ src_len, // number of characters in source string
+ 0, // destination buffer
+ 0 // size of destination buffer
+ );
+ if(!bytes)
+ return std::string(p1, p2);
+ std::string result(++bytes, '\0');
+ bytes = ::LCMapStringW(
+ id, // locale identifier
+ LCMAP_SORTKEY, // mapping transformation type
+ wide_p1, // source string
+ src_len, // number of characters in source string
+ (LPWSTR)&*result.begin(), // destination buffer
+ bytes // size of destination buffer
+ );
+#endif
    if(bytes > static_cast<int>(result.size()))
       return std::string(p1, p2);
    while(result.size() && result[result.size()-1] == '\0')
@@ -335,6 +454,7 @@
 BOOST_REGEX_DECL char BOOST_REGEX_CALL w32_tolower(char c, lcid_type id)
 {
    char result[2];
+#ifndef BOOST_NO_ANSI_APIS
    int b = ::LCMapStringA(
       id, // locale identifier
       LCMAP_LOWERCASE, // mapping transformation type
@@ -344,6 +464,29 @@
       1); // size of destination buffer
    if(b == 0)
       return c;
+#else
+ UINT code_page = get_code_page_for_locale_id(id);
+ if (code_page == 0)
+ return c;
+
+ WCHAR wide_c;
+ if (::MultiByteToWideChar(code_page, 0, &c, 1, &wide_c, 1) == 0)
+ return c;
+
+ WCHAR wide_result;
+ int b = ::LCMapStringW(
+ id, // locale identifier
+ LCMAP_LOWERCASE, // mapping transformation type
+ &wide_c, // source string
+ 1, // number of characters in source string
+ &wide_result, // destination buffer
+ 1); // size of destination buffer
+ if(b == 0)
+ return c;
+
+ if (::WideCharToMultiByte(code_page, 0, &wide_result, 1, result, 2, NULL, NULL) == 0)
+ return c;
+#endif
    return result[0];
 }
 
@@ -382,6 +525,7 @@
 BOOST_REGEX_DECL char BOOST_REGEX_CALL w32_toupper(char c, lcid_type id)
 {
    char result[2];
+#ifndef BOOST_NO_ANSI_APIS
    int b = ::LCMapStringA(
       id, // locale identifier
       LCMAP_UPPERCASE, // mapping transformation type
@@ -391,6 +535,29 @@
       1); // size of destination buffer
    if(b == 0)
       return c;
+#else
+ UINT code_page = get_code_page_for_locale_id(id);
+ if(code_page == 0)
+ return c;
+
+ WCHAR wide_c;
+ if (::MultiByteToWideChar(code_page, 0, &c, 1, &wide_c, 1) == 0)
+ return c;
+
+ WCHAR wide_result;
+ int b = ::LCMapStringW(
+ id, // locale identifier
+ LCMAP_UPPERCASE, // mapping transformation type
+ &wide_c, // source string
+ 1, // number of characters in source string
+ &wide_result, // destination buffer
+ 1); // size of destination buffer
+ if(b == 0)
+ return c;
+
+ if (::WideCharToMultiByte(code_page, 0, &wide_result, 1, result, 2, NULL, NULL) == 0)
+ return c;
+#endif
    return result[0];
 }
 
@@ -429,8 +596,21 @@
 BOOST_REGEX_DECL bool BOOST_REGEX_CALL w32_is(lcid_type id, boost::uint32_t m, char c)
 {
    WORD mask;
+#ifndef BOOST_NO_ANSI_APIS
    if(::GetStringTypeExA(id, CT_CTYPE1, &c, 1, &mask) && (mask & m & w32_regex_traits_implementation<char>::mask_base))
       return true;
+#else
+ UINT code_page = get_code_page_for_locale_id(id);
+ if(code_page == 0)
+ return false;
+
+ WCHAR wide_c;
+ if (::MultiByteToWideChar(code_page, 0, &c, 1, &wide_c, 1) == 0)
+ return false;
+
+ if(::GetStringTypeExW(id, CT_CTYPE1, &wide_c, 1, &mask) && (mask & m & w32_regex_traits_implementation<char>::mask_base))
+ return true;
+#endif
    if((m & w32_regex_traits_implementation<char>::mask_word) && (c == '_'))
       return true;
    return false;

Modified: branches/proto/v3/libs/regex/src/wide_posix_api.cpp
==============================================================================
--- branches/proto/v3/libs/regex/src/wide_posix_api.cpp (original)
+++ branches/proto/v3/libs/regex/src/wide_posix_api.cpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -157,7 +157,7 @@
       {
          result = std::wcslen(wnames[code]) + 1;
          if(buf_size >= result)
-#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400) && !defined(_WIN32_WCE)
+#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400) && !defined(_WIN32_WCE) && !defined(UNDER_CE)
             ::wcscpy_s(buf, buf_size, wnames[code]);
 #else
             std::wcscpy(buf, wnames[code]);
@@ -176,13 +176,13 @@
       {
          if(std::wcscmp(e->re_endp, wnames[i]) == 0)
          {
-#if defined(_WIN32_WCE)
+#if defined(_WIN32_WCE) && !defined(UNDER_CE)
             (std::swprintf)(localbuf, L"%d", i);
 #else
             (std::swprintf)(localbuf, 5, L"%d", i);
 #endif
             if(std::wcslen(localbuf) < buf_size)
-#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400) && !defined(_WIN32_WCE)
+#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400) && !defined(_WIN32_WCE) && !defined(UNDER_CE)
                ::wcscpy_s(buf, buf_size, localbuf);
 #else
                std::wcscpy(buf, localbuf);
@@ -190,13 +190,13 @@
             return std::wcslen(localbuf) + 1;
          }
       }
-#if defined(_WIN32_WCE)
+#if defined(_WIN32_WCE) && !defined(UNDER_CE)
       (std::swprintf)(localbuf, L"%d", 0);
 #else
       (std::swprintf)(localbuf, 5, L"%d", 0);
 #endif
       if(std::wcslen(localbuf) < buf_size)
-#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400) && !defined(_WIN32_WCE)
+#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400) && !defined(_WIN32_WCE) && !defined(UNDER_CE)
          ::wcscpy_s(buf, buf_size, localbuf);
 #else
          std::wcscpy(buf, localbuf);

Modified: branches/proto/v3/libs/regex/test/c_compiler_checks/posix_api_check.c
==============================================================================
--- branches/proto/v3/libs/regex/test/c_compiler_checks/posix_api_check.c (original)
+++ branches/proto/v3/libs/regex/test/c_compiler_checks/posix_api_check.c 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -32,30 +32,30 @@
 
 int main()
 {
- regex_t re;
+ regex_tA re;
    int result;
- result = regcomp(&re, expression, REG_AWK);
+ result = regcompA(&re, expression, REG_AWK);
    if(result > REG_NOERROR)
    {
       char buf[256];
- regerror(result, &re, buf, sizeof(buf));
+ regerrorA(result, &re, buf, sizeof(buf));
       printf(buf);
       return result;
    }
    assert(re.re_nsub == 0);
    matches[0].rm_so = 0;
    matches[0].rm_eo = strlen(text);
- result = regexec(&re, text, 1, matches, REG_NOTBOL | REG_NOTEOL | REG_STARTEND);
+ result = regexecA(&re, text, 1, matches, REG_NOTBOL | REG_NOTEOL | REG_STARTEND);
    if(result > REG_NOERROR)
    {
       char buf[256];
- regerror(result, &re, buf, sizeof(buf));
+ regerrorA(result, &re, buf, sizeof(buf));
       printf(buf);
- regfree(&re);
+ regfreeA(&re);
       return result;
    }
    assert(matches[0].rm_so == matches[0].rm_eo == 1);
- regfree(&re);
+ regfreeA(&re);
    printf("no errors found\n");
    return 0;
 }

Modified: branches/proto/v3/libs/regex/test/c_compiler_checks/posix_api_check.cpp
==============================================================================
--- branches/proto/v3/libs/regex/test/c_compiler_checks/posix_api_check.cpp (original)
+++ branches/proto/v3/libs/regex/test/c_compiler_checks/posix_api_check.cpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -33,30 +33,30 @@
 
 int main()
 {
- regex_t re;
+ regex_tA re;
    int result;
- result = regcomp(&re, expression, REG_AWK);
+ result = regcompA(&re, expression, REG_AWK);
    if(result > REG_NOERROR)
    {
       char buf[256];
- regerror(result, &re, buf, sizeof(buf));
+ regerrorA(result, &re, buf, sizeof(buf));
       printf(buf);
       return result;
    }
    BOOST_TEST(re.re_nsub == 0);
    matches[0].rm_so = 0;
    matches[0].rm_eo = strlen(text);
- result = regexec(&re, text, 1, matches, REG_NOTBOL | REG_NOTEOL | REG_STARTEND);
+ result = regexecA(&re, text, 1, matches, REG_NOTBOL | REG_NOTEOL | REG_STARTEND);
    if(result > REG_NOERROR)
    {
       char buf[256];
- regerror(result, &re, buf, sizeof(buf));
+ regerrorA(result, &re, buf, sizeof(buf));
       printf(buf);
- regfree(&re);
+ regfreeA(&re);
       return result;
    }
    BOOST_TEST(matches[0].rm_so == matches[0].rm_eo == 1);
- regfree(&re);
+ regfreeA(&re);
    printf("no errors found\n");
    return boost::report_errors();
 }

Modified: branches/proto/v3/libs/regex/test/regress/main.cpp
==============================================================================
--- branches/proto/v3/libs/regex/test/regress/main.cpp (original)
+++ branches/proto/v3/libs/regex/test/regress/main.cpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -70,7 +70,14 @@
 int cpp_main(int /*argc*/, char * /*argv*/[])
 {
 #ifdef TEST_THREADS
- get_array_data(); // initialises data.
+ try{
+ get_array_data(); // initialises data.
+ }
+ catch(const std::exception& e)
+ {
+ std::cerr << "TSS Initialisation failed with message: " << e.what() << std::endl;
+ return -1;
+ }
 
    std::list<boost::shared_ptr<boost::thread> > threads;
    for(int i = 0; i < 5; ++i)

Modified: branches/proto/v3/libs/regex/test/regress/test_locale.cpp
==============================================================================
--- branches/proto/v3/libs/regex/test/regress/test_locale.cpp (original)
+++ branches/proto/v3/libs/regex/test/regress/test_locale.cpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -26,6 +26,7 @@
 
 test_locale::test_locale(const char* c_name, boost::uint32_t lcid)
 {
+#ifndef UNDER_CE
    // store the name:
    m_old_name = m_name;
    m_name = c_name;
@@ -43,6 +44,9 @@
       s_c_locale = no_test;
       std::cout << "The global C locale: " << c_name << " is not available and will not be tested." << std::endl;
    }
+#else
+ s_c_locale = no_test;
+#endif
 #ifndef BOOST_NO_STD_LOCALE
    // back up the C++ locale and create the new one:
    m_old_cpp_locale = s_cpp_locale_inst;
@@ -69,6 +73,7 @@
    // Start by geting the printable name of the locale.
    // We use this for debugging purposes only:
    //
+#ifndef BOOST_NO_ANSI_APIS
    boost::scoped_array<char> p;
    int r = ::GetLocaleInfoA(
                lcid, // locale identifier
@@ -83,6 +88,43 @@
                p.get(), // information buffer
                r+1 // size of buffer
             );
+#else
+ WCHAR code_page_string[7];
+ int r = ::GetLocaleInfoW(
+ lcid,
+ LOCALE_IDEFAULTANSICODEPAGE,
+ code_page_string,
+ 7);
+ BOOST_ASSERT(r != 0);
+
+ UINT code_page = static_cast<UINT>(_wtol(code_page_string));
+
+ boost::scoped_array<wchar_t> wp;
+ r = ::GetLocaleInfoW(
+ lcid, // locale identifier
+ LOCALE_SCOUNTRY, // information type
+ 0, // information buffer
+ 0 // size of buffer
+ );
+ wp.reset(new wchar_t[r+1]);
+ r = ::GetLocaleInfoW(
+ lcid, // locale identifier
+ LOCALE_SCOUNTRY, // information type
+ wp.get(), // information buffer
+ r+1 // size of buffer
+ );
+
+ int name_size = (r+1) * 2;
+ boost::scoped_array<char> p(new char[name_size]);
+ int conv_r = ::WideCharToMultiByte(
+ code_page,
+ 0,
+ wp.get(), r,
+ p.get(), name_size,
+ NULL, NULL
+ );
+ BOOST_ASSERT(conv_r != 0);
+#endif
    //
    // now see if locale is installed and behave accordingly:
    //
@@ -104,8 +146,10 @@
 test_locale::~test_locale()
 {
    // restore to previous state:
+#ifndef UNDER_CE
    std::setlocale(LC_ALL, m_old_c_locale.c_str());
    s_c_locale = m_old_c_state;
+#endif
 #ifndef BOOST_NO_STD_LOCALE
    s_cpp_locale_inst = m_old_cpp_locale;
 #endif

Modified: branches/proto/v3/libs/serialization/test/test_tools.hpp
==============================================================================
--- branches/proto/v3/libs/serialization/test/test_tools.hpp (original)
+++ branches/proto/v3/libs/serialization/test/test_tools.hpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -19,10 +19,28 @@
 #include <boost/config.hpp>
 #include <cstdio> // remove, tmpnam
 
+#if defined(UNDER_CE)
+
+// Windows CE does not supply the tmpnam function in its CRT.
+// Substitute a primitive implementation here.
+namespace boost {
+namespace archive {
+ char * tmpnam(char * buffer){
+ static char ibuffer [512];
+ if(NULL == buffer)
+ buffer = ibuffer;
+
+ static unsigned short index = 0;
+ std::sprintf(buffer, "\\tmpfile%05X.tmp", index++);
+ return buffer;
+ }
+} // archive
+} // boost
+
+#elif defined(_WIN32) || defined(__WIN32__) || defined(WIN32)
 // win32 has a brain-dead tmpnam implementation.
 // which leaves temp files in root directory
 // regardless of environmental settings
-#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32)
 
 #include <cstdlib>
 #include <cstring>

Modified: branches/proto/v3/libs/test/test/online_test.cpp
==============================================================================
--- branches/proto/v3/libs/test/test/online_test.cpp (original)
+++ branches/proto/v3/libs/test/test/online_test.cpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -18,6 +18,8 @@
 
 BOOST_AUTO_TEST_CASE( test )
 {
+ int i = 1;
+ BOOST_CHECK_EQUAL( i*i, 1 );
 }
 
 //____________________________________________________________________________//

Modified: branches/proto/v3/libs/test/test/prg_exec_fail3.cpp
==============================================================================
--- branches/proto/v3/libs/test/test/prg_exec_fail3.cpp (original)
+++ branches/proto/v3/libs/test/test/prg_exec_fail3.cpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -17,11 +17,19 @@
 
 int cpp_main( int, char *[] ) // note the name
 {
- int div = 0;
+ int div = 0;
 
- assert( div != 0 );
+ assert( div != 0 );
 
- return 0;
+#if NDEBUG
+
+# pragma message("assert check turned off under NDEBUG")
+
+ return 1;
+
+#endif
+
+ return 0;
 }
 
 //____________________________________________________________________________//

Modified: branches/proto/v3/libs/test/test/test_files/test_tools_test.pattern
==============================================================================
--- branches/proto/v3/libs/test/test/test_files/test_tools_test.pattern (original)
+++ branches/proto/v3/libs/test/test/test_files/test_tools_test.pattern 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,69 +1,70 @@
-131: warning in "test_BOOST_WARN": condition sizeof(int) == sizeof(short) is not satisfied
-134: info: check sizeof(unsigned char) == sizeof(char) passed
-156: error in "test_BOOST_CHECK": check false failed
-157: error in "test_BOOST_CHECK": check 1==2 failed
-158: error in "test_BOOST_CHECK": check i==1 failed
-161: info: check i==2 passed
-168: error in "test_BOOST_REQUIRE": not aborted
-170: fatal error in "test_BOOST_REQUIRE": critical check false failed
-174: fatal error in "test_BOOST_REQUIRE": critical check j > 5 failed
-177: info: check j < 5 passed
-177: error in "test_BOOST_REQUIRE": not aborted
-191: info: check 'object size 33 is too small' passed
-208: error in "test_BOOST_CHECK_MESSAGE": Well, may be that what I believe in
-210: error in "test_BOOST_CHECK_MESSAGE": Checking predicate failed. Some explanation
-213: info: check 'Could it fail?' passed
-220: fatal error in "test_BOOST_REQUIRE_MESSAGE": Here we should stop
-223: info: check 'That's OK' passed
-223: error in "test_BOOST_REQUIRE_MESSAGE": not aborted
-230: error in "test_BOOST_ERROR": Fail to miss an error
-237: fatal error in "test_BOOST_FAIL": No! No! Show must go on.
-253: error in "test_BOOST_CHECK_THROW": exception my_exception is expected
-256: warning in "test_BOOST_CHECK_THROW": exception my_exception is expected
-259: fatal error in "test_BOOST_CHECK_THROW": exception my_exception is expected
-262: info: check 'exception my_exception is caught' passed
-269: error in "test_BOOST_CHECK_EXCEPTION": incorrect exception my_exception is caught
-272: info: check 'incorrect exception my_exception is caught' passed
-282: error in "test_BOOST_CHECK_NO_THROW": exception thrown by throw my_exception()
-328: error in "test_BOOST_CHECK_EQUAL": check i == j failed [1 != 2]
-334: error in "test_BOOST_CHECK_EQUAL": check str1 == str2 failed [test1 != test12]
-337: error in "test_BOOST_CHECK_EQUAL": check i+1 == j failed [4 != 2]
-340: info: check str1 == str3+1 passed
-349: fatal error in "test_BOOST_CHECK_EQUAL": critical check str1 == str2 failed [test != null string]
-355: warning in "test_BOOST_CHECK_EQUAL": condition b1 == b2 is not satisfied [B(1) != B(2)]
-361: error in "test_BOOST_CHECK_EQUAL": check c1 == c3 failed [C(0,100) != C(1,102)]. Index mismatch
-362: error in "test_BOOST_CHECK_EQUAL": check c1 == c2 failed [C(0,100) != C(0,101)]. Id mismatch
-373: error in "test_BOOST_CHECK_LOGICAL_EXPR": check ++i != j failed [2 == 2]
-375: error in "test_BOOST_CHECK_LOGICAL_EXPR": check i < j failed [2 >= 2]
-376: error in "test_BOOST_CHECK_LOGICAL_EXPR": check i > j failed [2 <= 2]
-383: error in "test_BOOST_CHECK_LOGICAL_EXPR": check i <= j failed [3 > 2]
-384: error in "test_BOOST_CHECK_LOGICAL_EXPR": check j >= i failed [2 < 3]
-389: error in "test_BOOST_CHECK_LOGICAL_EXPR": check str1 != str2 failed [test1 == test1]
-419: error in "test_BOOST_CHECK_PREDICATE": check is_even( i ) failed for ( 17 )
-422: error in "test_BOOST_CHECK_PREDICATE": check not_equal_to<int>()( i, 17 ) failed for ( 17, 17 )
-428: warning in "test_BOOST_CHECK_PREDICATE": condition moo( 12, i, j ) is not satisfied for ( 12, 17, 15 )
-436: error in "test_BOOST_CHECK_PREDICATE": check compare_lists( l1, l2 ) failed for ( , ). Different sizes [2!=0]
-447: error in "test_BOOST_REQUIRE_PREDICATE": not aborted
-449: fatal error in "test_BOOST_REQUIRE_PREDICATE": critical check less_equal<int>()( arg2, arg1 ) failed for ( 2, 1 )
-470: error in "test_BOOST_CHECK_EQUAL_COLLECTIONS": check { testlist.begin(), testlist.end() } == { pattern, pattern+7 } failed.
-Mismatch in a position 2: 4 != 3
-Mismatch in a position 5: 7 != 6
-471: error in "test_BOOST_CHECK_EQUAL_COLLECTIONS": check { testlist.begin(), testlist.end() } == { pattern, pattern+2 } failed.
-Collections size mismatch: 7 != 2
-480: error in "test_BOOST_CHECK_BITWISE_EQUAL": check (char)0x06 =.= (char)0x16 failed.
-Mismatch in a position 4
-483: warning in "test_BOOST_CHECK_BITWISE_EQUAL": condition (char)0x26 =.= (char)0x04 is not satisfied.
-Mismatch in a position 1
-Mismatch in a position 5
-486: fatal error in "test_BOOST_CHECK_BITWISE_EQUAL": critical check (char)0x26 =.= (int)0x26 failed.
-Operands bit sizes mismatch: 8 != 32
-still testing
-1+1=2
-2+2=4
-struct A
-0x14
- 20
-0: fatal error in "test_BOOST_TEST_CHECKPOINT": C string: some error
-521: last checkpoint: Going to do a silly things
-0: fatal error in "test_BOOST_TEST_PASSPOINT": unknown type
-532: last checkpoint
+131: warning in "test_BOOST_WARN": condition sizeof(int) == sizeof(short) is not satisfied
+134: info: check sizeof(unsigned char) == sizeof(char) passed
+156: error in "test_BOOST_CHECK": check false failed
+157: error in "test_BOOST_CHECK": check 1==2 failed
+158: error in "test_BOOST_CHECK": check i==1 failed
+161: info: check i==2 passed
+168: error in "test_BOOST_REQUIRE": not aborted
+170: fatal error in "test_BOOST_REQUIRE": critical check false failed
+174: fatal error in "test_BOOST_REQUIRE": critical check j > 5 failed
+177: info: check j < 5 passed
+177: error in "test_BOOST_REQUIRE": not aborted
+191: info: check 'object size 33 is too small' passed
+208: error in "test_BOOST_CHECK_MESSAGE": Well, may be that what I believe in
+210: error in "test_BOOST_CHECK_MESSAGE": Checking predicate failed. Some explanation
+213: info: check 'Could it fail?' passed
+220: fatal error in "test_BOOST_REQUIRE_MESSAGE": Here we should stop
+223: info: check 'That's OK' passed
+223: error in "test_BOOST_REQUIRE_MESSAGE": not aborted
+230: error in "test_BOOST_ERROR": Fail to miss an error
+237: fatal error in "test_BOOST_FAIL": No! No! Show must go on.
+253: error in "test_BOOST_CHECK_THROW": exception my_exception is expected
+256: warning in "test_BOOST_CHECK_THROW": exception my_exception is expected
+259: fatal error in "test_BOOST_CHECK_THROW": exception my_exception is expected
+262: info: check 'exception my_exception is caught' passed
+269: error in "test_BOOST_CHECK_EXCEPTION": incorrect exception my_exception is caught
+272: info: check 'incorrect exception my_exception is caught' passed
+282: error in "test_BOOST_CHECK_NO_THROW": exception thrown by throw my_exception()
+328: error in "test_BOOST_CHECK_EQUAL": check i == j failed [1 != 2]
+334: error in "test_BOOST_CHECK_EQUAL": check str1 == str2 failed [test1 != test12]
+337: error in "test_BOOST_CHECK_EQUAL": check i+1 == j failed [4 != 2]
+340: info: check str1 == str3+1 passed
+349: fatal error in "test_BOOST_CHECK_EQUAL": critical check str1 == str2 failed [test != null string]
+355: warning in "test_BOOST_CHECK_EQUAL": condition b1 == b2 is not satisfied [B(1) != B(2)]
+361: error in "test_BOOST_CHECK_EQUAL": check c1 == c3 failed [C(0,100) != C(1,102)]. Index mismatch
+362: error in "test_BOOST_CHECK_EQUAL": check c1 == c2 failed [C(0,100) != C(0,101)]. Id mismatch
+366: error in "test_BOOST_CHECK_EQUAL": check ch1 == ch2 failed [0xfffffffe != 0xfffffffd]
+377: error in "test_BOOST_CHECK_LOGICAL_EXPR": check ++i != j failed [2 == 2]
+379: error in "test_BOOST_CHECK_LOGICAL_EXPR": check i < j failed [2 >= 2]
+380: error in "test_BOOST_CHECK_LOGICAL_EXPR": check i > j failed [2 <= 2]
+387: error in "test_BOOST_CHECK_LOGICAL_EXPR": check i <= j failed [3 > 2]
+388: error in "test_BOOST_CHECK_LOGICAL_EXPR": check j >= i failed [2 < 3]
+393: error in "test_BOOST_CHECK_LOGICAL_EXPR": check str1 != str2 failed [test1 == test1]
+423: error in "test_BOOST_CHECK_PREDICATE": check is_even( i ) failed for ( 17 )
+426: error in "test_BOOST_CHECK_PREDICATE": check not_equal_to<int>()( i, 17 ) failed for ( 17, 17 )
+432: warning in "test_BOOST_CHECK_PREDICATE": condition moo( 12, i, j ) is not satisfied for ( 12, 17, 15 )
+440: error in "test_BOOST_CHECK_PREDICATE": check compare_lists( l1, l2 ) failed for ( , ). Different sizes [2!=0]
+451: error in "test_BOOST_REQUIRE_PREDICATE": not aborted
+453: fatal error in "test_BOOST_REQUIRE_PREDICATE": critical check less_equal<int>()( arg2, arg1 ) failed for ( 2, 1 )
+474: error in "test_BOOST_CHECK_EQUAL_COLLECTIONS": check { testlist.begin(), testlist.end() } == { pattern, pattern+7 } failed.
+Mismatch in a position 2: 4 != 3
+Mismatch in a position 5: 7 != 6
+475: error in "test_BOOST_CHECK_EQUAL_COLLECTIONS": check { testlist.begin(), testlist.end() } == { pattern, pattern+2 } failed.
+Collections size mismatch: 7 != 2
+484: error in "test_BOOST_CHECK_BITWISE_EQUAL": check (char)0x06 =.= (char)0x16 failed.
+Mismatch in a position 4
+487: warning in "test_BOOST_CHECK_BITWISE_EQUAL": condition (char)0x26 =.= (char)0x04 is not satisfied.
+Mismatch in a position 1
+Mismatch in a position 5
+490: fatal error in "test_BOOST_CHECK_BITWISE_EQUAL": critical check (char)0x26 =.= (int)0x26 failed.
+Operands bit sizes mismatch: 8 != 32
+still testing
+1+1=2
+2+2=4
+struct A
+0x14
+ 20
+0: fatal error in "test_BOOST_TEST_CHECKPOINT": C string: some error
+525: last checkpoint: Going to do a silly things
+0: fatal error in "test_BOOST_TEST_PASSPOINT": unknown type
+536: last checkpoint

Modified: branches/proto/v3/libs/test/test/test_tools_test.cpp
==============================================================================
--- branches/proto/v3/libs/test/test/test_tools_test.cpp (original)
+++ branches/proto/v3/libs/test/test/test_tools_test.cpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -360,6 +360,10 @@
     C c3( 1, 102 );
     BOOST_CHECK_EQUAL( c1, c3 );
     BOOST_CHECK_EQUAL( c1, c2 );
+
+ char ch1 = -2;
+ char ch2 = -3;
+ BOOST_CHECK_EQUAL(ch1, ch2);
 }
 
 //____________________________________________________________________________//

Modified: branches/proto/v3/libs/thread/build/Jamfile.v2
==============================================================================
--- branches/proto/v3/libs/thread/build/Jamfile.v2 (original)
+++ branches/proto/v3/libs/thread/build/Jamfile.v2 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -157,6 +157,7 @@
 rule requirements ( properties * )
 {
     local result ;
+
     if <threadapi>pthread in $(properties)
     {
         result += <define>BOOST_THREAD_POSIX ;
@@ -190,7 +191,6 @@
     : ## pthread sources ##
       pthread/thread.cpp
       pthread/exceptions.cpp
- pthread/tss.cpp
       pthread/once.cpp
     : ## requirements ##
       <threadapi>pthread
@@ -202,5 +202,7 @@
     : thread_sources
     : <conditional>@requirements
     :
- : <conditional>@usage-requirements
+ : <link>shared:<define>BOOST_THREAD_USE_DLL=1
+ <link>static:<define>BOOST_THREAD_USE_LIB=1
+ <conditional>@usage-requirements
     ;

Modified: branches/proto/v3/libs/thread/src/pthread/once.cpp
==============================================================================
--- branches/proto/v3/libs/thread/src/pthread/once.cpp (original)
+++ branches/proto/v3/libs/thread/src/pthread/once.cpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -12,9 +12,9 @@
 {
     namespace detail
     {
- boost::uintmax_t once_global_epoch=0;
- pthread_mutex_t once_epoch_mutex=PTHREAD_MUTEX_INITIALIZER;
- pthread_cond_t once_epoch_cv = PTHREAD_COND_INITIALIZER;
+ BOOST_THREAD_DECL boost::uintmax_t once_global_epoch=0;
+ BOOST_THREAD_DECL pthread_mutex_t once_epoch_mutex=PTHREAD_MUTEX_INITIALIZER;
+ BOOST_THREAD_DECL pthread_cond_t once_epoch_cv = PTHREAD_COND_INITIALIZER;
 
         namespace
         {
@@ -45,7 +45,6 @@
             }
             return *static_cast<boost::uintmax_t*>(data);
         }
-
     }
     
 }

Modified: branches/proto/v3/libs/thread/src/pthread/thread.cpp
==============================================================================
--- branches/proto/v3/libs/thread/src/pthread/thread.cpp (original)
+++ branches/proto/v3/libs/thread/src/pthread/thread.cpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -12,6 +12,7 @@
 #include <boost/thread/condition.hpp>
 #include <boost/thread/locks.hpp>
 #include <boost/thread/once.hpp>
+#include <boost/thread/tss.hpp>
 
 #include "timeconv.inl"
 
@@ -23,6 +24,24 @@
         {
             boost::detail::thread_exit_function_base* func;
             thread_exit_callback_node* next;
+
+ thread_exit_callback_node(boost::detail::thread_exit_function_base* func_,
+ thread_exit_callback_node* next_):
+ func(func_),next(next_)
+ {}
+ };
+
+ struct tss_data_node
+ {
+ void const* key;
+ boost::shared_ptr<boost::detail::tss_cleanup_function> func;
+ void* value;
+ tss_data_node* next;
+
+ tss_data_node(void const* key_,boost::shared_ptr<boost::detail::tss_cleanup_function> func_,void* value_,
+ tss_data_node* next_):
+ key(key_),func(func_),value(value_),next(next_)
+ {}
         };
 
         namespace
@@ -37,17 +56,31 @@
                     boost::detail::thread_data_base* thread_info=static_cast<boost::detail::thread_data_base*>(data);
                     if(thread_info)
                     {
- while(thread_info->thread_exit_callbacks)
+ while(thread_info->tss_data || thread_info->thread_exit_callbacks)
                         {
- boost::detail::thread_exit_callback_node* const current_node=thread_info->thread_exit_callbacks;
- thread_info->thread_exit_callbacks=current_node->next;
- if(current_node->func)
+ while(thread_info->thread_exit_callbacks)
                             {
- (*current_node->func)();
- delete current_node->func;
+ detail::thread_exit_callback_node* const current_node=thread_info->thread_exit_callbacks;
+ thread_info->thread_exit_callbacks=current_node->next;
+ if(current_node->func)
+ {
+ (*current_node->func)();
+ delete current_node->func;
+ }
+ delete current_node;
+ }
+ while(thread_info->tss_data)
+ {
+ detail::tss_data_node* const current_node=thread_info->tss_data;
+ thread_info->tss_data=current_node->next;
+ if(current_node->func)
+ {
+ (*current_node->func)(current_node->value);
+ }
+ delete current_node;
                             }
- delete current_node;
                         }
+ thread_info->self.reset();
                     }
                 }
             }
@@ -55,7 +88,7 @@
 
             void create_current_thread_tls_key()
             {
- BOOST_VERIFY(!pthread_key_create(&current_thread_tls_key,NULL));
+ BOOST_VERIFY(!pthread_key_create(&current_thread_tls_key,&tls_destructor));
             }
         }
         
@@ -100,8 +133,39 @@
                 thread_info->done_condition.notify_all();
                 return 0;
             }
+ }
+
+ struct externally_launched_thread:
+ detail::thread_data_base
+ {
+ externally_launched_thread()
+ {
+ interrupt_enabled=false;
+ }
+
+ void run()
+ {}
+ };
 
+ detail::thread_data_base* make_external_thread_data()
+ {
+ detail::thread_data_base* const me(new externally_launched_thread());
+ me->self.reset(me);
+ set_current_thread_data(me);
+ return me;
+ }
+
+
+ detail::thread_data_base* get_or_make_current_thread_data()
+ {
+ detail::thread_data_base* current_thread_data(detail::get_current_thread_data());
+ if(!current_thread_data)
+ {
+ current_thread_data=make_external_thread_data();
+ }
+ return current_thread_data;
         }
+
     }
 
 
@@ -428,6 +492,63 @@
         }
     }
 
+ namespace detail
+ {
+ void add_thread_exit_function(thread_exit_function_base* func)
+ {
+ detail::thread_data_base* const current_thread_data(get_or_make_current_thread_data());
+ thread_exit_callback_node* const new_node=
+ new thread_exit_callback_node(func,current_thread_data->thread_exit_callbacks);
+ current_thread_data->thread_exit_callbacks=new_node;
+ }
+
+ tss_data_node* find_tss_data(void const* key)
+ {
+ detail::thread_data_base* const current_thread_data(get_current_thread_data());
+ if(current_thread_data)
+ {
+ detail::tss_data_node* current_node=current_thread_data->tss_data;
+ while(current_node)
+ {
+ if(current_node->key==key)
+ {
+ return current_node;
+ }
+ current_node=current_node->next;
+ }
+ }
+ return NULL;
+ }
+
+ void* get_tss_data(void const* key)
+ {
+ if(tss_data_node* const current_node=find_tss_data(key))
+ {
+ return current_node->value;
+ }
+ return NULL;
+ }
+
+ void set_tss_data(void const* key,boost::shared_ptr<tss_cleanup_function> func,void* tss_data,bool cleanup_existing)
+ {
+ if(tss_data_node* const current_node=find_tss_data(key))
+ {
+ if(cleanup_existing && current_node->func)
+ {
+ (*current_node->func)(current_node->value);
+ }
+ current_node->func=func;
+ current_node->value=tss_data;
+ }
+ else
+ {
+ detail::thread_data_base* const current_thread_data(get_or_make_current_thread_data());
+ tss_data_node* const new_node=new tss_data_node(key,func,tss_data,current_thread_data->tss_data);
+ current_thread_data->tss_data=new_node;
+ }
+ }
+ }
+
     thread_group::thread_group()
     {
     }

Deleted: branches/proto/v3/libs/thread/src/pthread/tss.cpp
==============================================================================
--- branches/proto/v3/libs/thread/src/pthread/tss.cpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
+++ (empty file)
@@ -1,187 +0,0 @@
-// Copyright (C) 2001-2003 William E. Kempf
-// Copyright (C) 2006 Roland Schwarz
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/thread/detail/config.hpp>
-
-#include <boost/thread/tss.hpp>
-#ifndef BOOST_THREAD_NO_TSS_CLEANUP
-
-#include <boost/thread/once.hpp>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/exceptions.hpp>
-#include <vector>
-#include <string>
-#include <stdexcept>
-#include <cassert>
-
-namespace {
-
-typedef std::vector<void*> tss_slots;
-typedef std::vector<boost::function1<void, void*>*> tss_data_cleanup_handlers_type;
-
-boost::once_flag tss_data_once = BOOST_ONCE_INIT;
-boost::mutex* tss_data_mutex = 0;
-tss_data_cleanup_handlers_type* tss_data_cleanup_handlers = 0;
- pthread_key_t tss_data_native_key;
-int tss_data_use = 0;
-
-void tss_data_inc_use(boost::mutex::scoped_lock& lk)
-{
- ++tss_data_use;
-}
-
-void tss_data_dec_use(boost::mutex::scoped_lock& lk)
-{
- if (0 == --tss_data_use)
- {
- tss_data_cleanup_handlers_type::size_type i;
- for (i = 0; i < tss_data_cleanup_handlers->size(); ++i)
- {
- delete (*tss_data_cleanup_handlers)[i];
- }
- delete tss_data_cleanup_handlers;
- tss_data_cleanup_handlers = 0;
- lk.unlock();
- delete tss_data_mutex;
- tss_data_mutex = 0;
- pthread_key_delete(tss_data_native_key);
- }
-}
-
-extern "C" void cleanup_slots(void* p)
-{
- tss_slots* slots = static_cast<tss_slots*>(p);
- boost::mutex::scoped_lock lock(*tss_data_mutex);
- for (tss_slots::size_type i = 0; i < slots->size(); ++i)
- {
- (*(*tss_data_cleanup_handlers)[i])((*slots)[i]);
- (*slots)[i] = 0;
- }
- tss_data_dec_use(lock);
- delete slots;
-}
-
-void init_tss_data()
-{
- std::auto_ptr<tss_data_cleanup_handlers_type>
- temp(new tss_data_cleanup_handlers_type);
-
- std::auto_ptr<boost::mutex> temp_mutex(new boost::mutex);
- if (temp_mutex.get() == 0)
- throw boost::thread_resource_error();
-
- int res = pthread_key_create(&tss_data_native_key, &cleanup_slots);
- if (res != 0)
- return;
-
- // The life time of cleanup handlers and mutex is beeing
- // managed by a reference counting technique.
- // This avoids a memory leak by releasing the global data
- // after last use only, since the execution order of cleanup
- // handlers is unspecified on any platform with regards to
- // C++ destructor ordering rules.
- tss_data_cleanup_handlers = temp.release();
- tss_data_mutex = temp_mutex.release();
-}
-
-
-tss_slots* get_slots(bool alloc)
-{
- tss_slots* slots = 0;
-
- slots = static_cast<tss_slots*>(
- pthread_getspecific(tss_data_native_key));
-
- if (slots == 0 && alloc)
- {
- std::auto_ptr<tss_slots> temp(new tss_slots);
-
- if (pthread_setspecific(tss_data_native_key, temp.get()) != 0)
- return 0;
- {
- boost::mutex::scoped_lock lock(*tss_data_mutex);
- tss_data_inc_use(lock);
- }
- slots = temp.release();
- }
-
- return slots;
-}
-
-} // namespace
-
-namespace boost {
-
-namespace detail {
-void tss::init(boost::function1<void, void*>* pcleanup)
-{
- boost::call_once(tss_data_once, &init_tss_data);
- if (tss_data_cleanup_handlers == 0)
- throw thread_resource_error();
- boost::mutex::scoped_lock lock(*tss_data_mutex);
- try
- {
- tss_data_cleanup_handlers->push_back(pcleanup);
- m_slot = tss_data_cleanup_handlers->size() - 1;
- tss_data_inc_use(lock);
- }
- catch (...)
- {
- throw thread_resource_error();
- }
-}
-
-tss::~tss()
-{
- boost::mutex::scoped_lock lock(*tss_data_mutex);
- tss_data_dec_use(lock);
-}
-
-void* tss::get() const
-{
- tss_slots* slots = get_slots(false);
-
- if (!slots)
- return 0;
-
- if (m_slot >= slots->size())
- return 0;
-
- return (*slots)[m_slot];
-}
-
-void tss::set(void* value)
-{
- tss_slots* slots = get_slots(true);
-
- if (!slots)
- throw boost::thread_resource_error();
-
- if (m_slot >= slots->size())
- {
- try
- {
- slots->resize(m_slot + 1);
- }
- catch (...)
- {
- throw boost::thread_resource_error();
- }
- }
-
- (*slots)[m_slot] = value;
-}
-
-void tss::cleanup(void* value)
-{
- boost::mutex::scoped_lock lock(*tss_data_mutex);
- (*(*tss_data_cleanup_handlers)[m_slot])(value);
-}
-
-} // namespace detail
-} // namespace boost
-
-#endif //BOOST_THREAD_NO_TSS_CLEANUP

Modified: branches/proto/v3/libs/thread/src/win32/thread.cpp
==============================================================================
--- branches/proto/v3/libs/thread/src/win32/thread.cpp (original)
+++ branches/proto/v3/libs/thread/src/win32/thread.cpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -128,7 +128,7 @@
     {
         void run_thread_exit_callbacks()
         {
- boost::intrusive_ptr<detail::thread_data_base> current_thread_data(get_current_thread_data(),false);
+ detail::thread_data_ptr current_thread_data(get_current_thread_data(),false);
             if(current_thread_data)
             {
                 while(current_thread_data->tss_data || current_thread_data->thread_exit_callbacks)
@@ -197,7 +197,7 @@
         ResumeThread(thread_info->thread_handle);
     }
 
- thread::thread(boost::intrusive_ptr<detail::thread_data_base> data):
+ thread::thread(detail::thread_data_ptr data):
         thread_info(data)
     {}
 
@@ -210,7 +210,6 @@
             {
                 ++count;
                 interruption_enabled=false;
- thread_handle=detail::win32::duplicate_handle(detail::win32::GetCurrentThread());
             }
             
             void run()
@@ -222,18 +221,20 @@
             externally_launched_thread* me=detail::heap_new<externally_launched_thread>();
             set_current_thread_data(me);
         }
-
- }
 
- thread thread::self()
- {
- if(!get_current_thread_data())
+ detail::thread_data_base* get_or_make_current_thread_data()
         {
- make_external_thread_data();
+ detail::thread_data_base* current_thread_data(get_current_thread_data());
+ if(!current_thread_data)
+ {
+ make_external_thread_data();
+ current_thread_data=get_current_thread_data();
+ }
+ return current_thread_data;
         }
- return thread(boost::intrusive_ptr<detail::thread_data_base>(get_current_thread_data()));
+
     }
-
+
     thread::~thread()
     {
         detach();
@@ -273,16 +274,9 @@
 
     thread::id thread::get_id() const
     {
- boost::intrusive_ptr<detail::thread_data_base> local_thread_info=get_thread_info();
- return local_thread_info?thread::id(local_thread_info->id):thread::id();
+ return thread::id(get_thread_info());
     }
 
- thread::interruption_handle thread::get_interruption_handle() const
- {
- boost::intrusive_ptr<detail::thread_data_base> local_thread_info=get_thread_info();
- return local_thread_info?thread::interruption_handle(local_thread_info->interruption_handle.duplicate()):thread::interruption_handle();
- }
-
     bool thread::joinable() const
     {
         return get_thread_info();
@@ -290,7 +284,7 @@
 
     void thread::join()
     {
- boost::intrusive_ptr<detail::thread_data_base> local_thread_info=get_thread_info();
+ detail::thread_data_ptr local_thread_info=get_thread_info();
         if(local_thread_info)
         {
             this_thread::interruptible_wait(local_thread_info->thread_handle,detail::win32::infinite);
@@ -300,7 +294,7 @@
 
     bool thread::timed_join(boost::system_time const& wait_until)
     {
- boost::intrusive_ptr<detail::thread_data_base> local_thread_info=get_thread_info();
+ detail::thread_data_ptr local_thread_info=get_thread_info();
         if(local_thread_info)
         {
             if(!this_thread::interruptible_wait(local_thread_info->thread_handle,get_milliseconds_until(wait_until)))
@@ -325,16 +319,16 @@
     
     void thread::interrupt()
     {
- boost::intrusive_ptr<detail::thread_data_base> local_thread_info=get_thread_info();
+ detail::thread_data_ptr local_thread_info=get_thread_info();
         if(local_thread_info)
         {
- detail::win32::SetEvent(local_thread_info->interruption_handle);
+ local_thread_info->interrupt();
         }
     }
     
     bool thread::interruption_requested() const
     {
- boost::intrusive_ptr<detail::thread_data_base> local_thread_info=get_thread_info();
+ detail::thread_data_ptr local_thread_info=get_thread_info();
         return local_thread_info.get() && (detail::win32::WaitForSingleObject(local_thread_info->interruption_handle,0)==0);
     }
     
@@ -347,11 +341,11 @@
     
     thread::native_handle_type thread::native_handle()
     {
- boost::intrusive_ptr<detail::thread_data_base> local_thread_info=get_thread_info();
+ detail::thread_data_ptr local_thread_info=get_thread_info();
         return local_thread_info?(detail::win32::handle)local_thread_info->thread_handle:detail::win32::invalid_handle_value;
     }
 
- boost::intrusive_ptr<detail::thread_data_base> thread::get_thread_info() const
+ detail::thread_data_ptr thread::get_thread_info() const
     {
         boost::mutex::scoped_lock l(thread_info_mutex);
         return thread_info;
@@ -359,11 +353,6 @@
 
     namespace this_thread
     {
- thread::interruption_handle get_interruption_handle()
- {
- return get_current_thread_data()?thread::interruption_handle(get_current_thread_data()->interruption_handle.duplicate()):thread::interruption_handle();
- }
-
         bool interruptible_wait(detail::win32::handle handle_to_wait_for,unsigned long milliseconds)
         {
             detail::win32::handle handles[2]={0};
@@ -401,7 +390,7 @@
 
         thread::id get_id()
         {
- return thread::id(detail::win32::GetCurrentThreadId());
+ return thread::id(get_or_make_current_thread_data());
         }
 
         void interruption_point()
@@ -466,12 +455,7 @@
     {
         void add_thread_exit_function(thread_exit_function_base* func)
         {
- detail::thread_data_base* current_thread_data(get_current_thread_data());
- if(!current_thread_data)
- {
- make_external_thread_data();
- current_thread_data=get_current_thread_data();
- }
+ detail::thread_data_base* const current_thread_data(get_or_make_current_thread_data());
             thread_exit_callback_node* const new_node=
                 heap_new<thread_exit_callback_node>(func,
                                                     current_thread_data->thread_exit_callbacks);
@@ -510,7 +494,7 @@
             tss_cleanup_implemented(); // if anyone uses TSS, we need the cleanup linked in
             if(tss_data_node* const current_node=find_tss_data(key))
             {
- if(cleanup_existing && current_node->func)
+ if(cleanup_existing && current_node->func.get())
                 {
                     (*current_node->func)(current_node->value);
                 }
@@ -519,12 +503,7 @@
             }
             else
             {
- detail::thread_data_base* current_thread_data(get_current_thread_data());
- if(!current_thread_data)
- {
- make_external_thread_data();
- current_thread_data=get_current_thread_data();
- }
+ detail::thread_data_base* const current_thread_data(get_or_make_current_thread_data());
                 tss_data_node* const new_node=heap_new<tss_data_node>(key,func,tss_data,current_thread_data->tss_data);
                 current_thread_data->tss_data=new_node;
             }

Modified: branches/proto/v3/libs/thread/test/test_once.cpp
==============================================================================
--- branches/proto/v3/libs/thread/test/test_once.cpp (original)
+++ branches/proto/v3/libs/thread/test/test_once.cpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -19,6 +19,7 @@
     ++var_to_init;
 }
 
+
 void call_once_thread()
 {
     unsigned const loop_count=100;

Modified: branches/proto/v3/libs/thread/test/test_tss.cpp
==============================================================================
--- branches/proto/v3/libs/thread/test/test_tss.cpp (original)
+++ branches/proto/v3/libs/thread/test/test_tss.cpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,5 +1,6 @@
 // Copyright (C) 2001-2003
 // William E. Kempf
+// Copyright (C) 2007 Anthony Williams
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -62,7 +63,7 @@
     }
 }
 
-#if defined(BOOST_HAS_WINTHREADS)
+#if defined(BOOST_THREAD_PLATFORM_WIN32)
     typedef HANDLE native_thread_t;
 
     DWORD WINAPI test_tss_thread_native(LPVOID lpParameter)
@@ -73,7 +74,7 @@
 
     native_thread_t create_native_thread(void)
     {
- return CreateThread(
+ native_thread_t const res=CreateThread(
             0, //security attributes (0 = not inheritable)
             0, //stack size (0 = default)
             &test_tss_thread_native, //function to execute
@@ -81,6 +82,8 @@
             0, //creation flags (0 = run immediately)
             0 //thread id (0 = thread id not returned)
             );
+ BOOST_CHECK(res!=0);
+ return res;
     }
 
     void join_native_thread(native_thread_t thread)
@@ -91,6 +94,33 @@
         res = CloseHandle(thread);
         BOOST_CHECK(SUCCEEDED(res));
     }
+#elif defined(BOOST_THREAD_PLATFORM_PTHREAD)
+ typedef pthread_t native_thread_t;
+
+extern "C"
+{
+ void* test_tss_thread_native(void* lpParameter)
+ {
+ test_tss_thread();
+ return 0;
+ }
+}
+
+ native_thread_t create_native_thread()
+ {
+ native_thread_t thread_handle;
+
+ int const res = pthread_create(&thread_handle, 0, &test_tss_thread_native, 0);
+ BOOST_CHECK(!res);
+ return thread_handle;
+ }
+
+ void join_native_thread(native_thread_t thread)
+ {
+ void* result=0;
+ int const res=pthread_join(thread,&result);
+ BOOST_CHECK(!res);
+ }
 #endif
 
 void do_test_tss()
@@ -123,44 +153,33 @@
     BOOST_CHECK_EQUAL(tss_instances, 0);
     BOOST_CHECK_EQUAL(tss_total, 5);
 
- #if defined(BOOST_HAS_WINTHREADS)
- tss_instances = 0;
- tss_total = 0;
-
- native_thread_t thread1 = create_native_thread();
- BOOST_CHECK(thread1 != 0);
-
- native_thread_t thread2 = create_native_thread();
- BOOST_CHECK(thread2 != 0);
-
- native_thread_t thread3 = create_native_thread();
- BOOST_CHECK(thread3 != 0);
-
- native_thread_t thread4 = create_native_thread();
- BOOST_CHECK(thread3 != 0);
-
- native_thread_t thread5 = create_native_thread();
- BOOST_CHECK(thread3 != 0);
-
- join_native_thread(thread5);
- join_native_thread(thread4);
- join_native_thread(thread3);
- join_native_thread(thread2);
- join_native_thread(thread1);
-
- std::cout
- << "tss_instances = " << tss_instances
- << "; tss_total = " << tss_total
- << "\n";
- std::cout.flush();
-
- // The following is not really an error. TSS cleanup support still is available for boost threads.
- // Also this usually will be triggered only when bound to the static version of thread lib.
- // 2006-10-02 Roland Schwarz
- //BOOST_CHECK_EQUAL(tss_instances, 0);
- BOOST_CHECK_MESSAGE(tss_instances == 0, "Support of automatic tss cleanup for native threading API not available");
- BOOST_CHECK_EQUAL(tss_total, 5);
- #endif
+ tss_instances = 0;
+ tss_total = 0;
+
+ native_thread_t thread1 = create_native_thread();
+ native_thread_t thread2 = create_native_thread();
+ native_thread_t thread3 = create_native_thread();
+ native_thread_t thread4 = create_native_thread();
+ native_thread_t thread5 = create_native_thread();
+
+ join_native_thread(thread5);
+ join_native_thread(thread4);
+ join_native_thread(thread3);
+ join_native_thread(thread2);
+ join_native_thread(thread1);
+
+ std::cout
+ << "tss_instances = " << tss_instances
+ << "; tss_total = " << tss_total
+ << "\n";
+ std::cout.flush();
+
+ // The following is not really an error. TSS cleanup support still is available for boost threads.
+ // Also this usually will be triggered only when bound to the static version of thread lib.
+ // 2006-10-02 Roland Schwarz
+ //BOOST_CHECK_EQUAL(tss_instances, 0);
+ BOOST_CHECK_MESSAGE(tss_instances == 0, "Support of automatic tss cleanup for native threading API not available");
+ BOOST_CHECK_EQUAL(tss_total, 5);
 }
 
 void test_tss()

Modified: branches/proto/v3/libs/tokenizer/examples.cpp
==============================================================================
--- branches/proto/v3/libs/tokenizer/examples.cpp (original)
+++ branches/proto/v3/libs/tokenizer/examples.cpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -16,7 +16,7 @@
 
 #include <boost/test/minimal.hpp>
 
-int test_main( int argc, char* argv[] )
+int test_main( int /*argc*/, char* /*argv*/[] )
 {
   using namespace std;
   using namespace boost;
@@ -95,9 +95,17 @@
     typedef token_iterator_generator<escaped_list_separator<char> >::type Iter;
     Iter begin = make_token_iterator<string>(test_string.begin(),
       test_string.end(),escaped_list_separator<char>());
+ Iter begin_c(begin);
     Iter end;
     BOOST_REQUIRE(equal(begin,end,answer));
 
+ while(begin_c != end)
+ {
+ BOOST_REQUIRE(begin_c.at_end() == 0);
+ ++begin_c;
+ }
+ BOOST_REQUIRE(begin_c.at_end());
+
   }
 
   {

Modified: branches/proto/v3/libs/utility/value_init_test.cpp
==============================================================================
--- branches/proto/v3/libs/utility/value_init_test.cpp (original)
+++ branches/proto/v3/libs/utility/value_init_test.cpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -74,9 +74,15 @@
 { return lhs.f == rhs.f && lhs.c == rhs.c && lhs.i == rhs.i ; }
 
 
+//
+// This test function tests boost::value_initialized<T> for a specific type T.
+// The first argument (y) is assumed have the value of a value-initialized object.
+// Returns true on success.
+//
 template<class T>
-void test ( T const& y, T const& z )
+bool test ( T const& y, T const& z )
 {
+ const boost::unit_test::counter_t counter_before_test = boost::minimal_test::errors_counter();
   boost::value_initialized<T> x ;
   BOOST_CHECK ( y == x ) ;
   BOOST_CHECK ( y == boost::get(x) ) ;
@@ -100,21 +106,22 @@
   BOOST_CHECK ( y == cx_c ) ;
   BOOST_CHECK ( y == boost::get(cx_c) ) ;
 #endif
+ return boost::minimal_test::errors_counter() == counter_before_test ;
 }
 
 int test_main(int, char **)
 {
- test( 0,1234 ) ;
- test( 0.0,12.34 ) ;
- test( POD(0,0,0.0), POD('a',1234,56.78) ) ;
- test( NonPOD( std::string() ), NonPOD( std::string("something") ) ) ;
+ BOOST_CHECK ( test( 0,1234 ) ) ;
+ BOOST_CHECK ( test( 0.0,12.34 ) ) ;
+ BOOST_CHECK ( test( POD(0,0,0.0), POD('a',1234,56.78) ) ) ;
+ BOOST_CHECK ( test( NonPOD( std::string() ), NonPOD( std::string("something") ) ) ) ;
 
   NonPOD NonPOD_object( std::string("NonPOD_object") );
- test<NonPOD *>( 0, &NonPOD_object ) ;
+ BOOST_CHECK ( test<NonPOD *>( 0, &NonPOD_object ) ) ;
 
   AggregatePODStruct zeroInitializedAggregatePODStruct = { 0.0f, '\0', 0 };
   AggregatePODStruct nonZeroInitializedAggregatePODStruct = { 1.25f, 'a', -1 };
- test(zeroInitializedAggregatePODStruct, nonZeroInitializedAggregatePODStruct);
+ BOOST_CHECK ( test(zeroInitializedAggregatePODStruct, nonZeroInitializedAggregatePODStruct) );
 
   return 0;
 }

Modified: branches/proto/v3/libs/wave/samples/waveidl/idllexer/idl_re.cpp
==============================================================================
--- branches/proto/v3/libs/wave/samples/waveidl/idllexer/idl_re.cpp (original)
+++ branches/proto/v3/libs/wave/samples/waveidl/idllexer/idl_re.cpp 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,5 +1,5 @@
-/* Generated by re2c 0.12.1 on Tue Oct 02 12:07:30 2007 */
-#line 1 "..\\..\\idllexer\\idl.re"
+/* Generated by re2c 0.13.1 on Wed Nov 21 11:51:27 2007 */
+#line 1 "idl.re"
 /*=============================================================================
     Boost.Wave: A Standard compliant C++ preprocessor library
 
@@ -358,10 +358,14 @@
 
     uchar *cursor = s->tok = s->cur;
 
-#line 378 "..\\..\\idllexer\\idl.re"
+#line 378 "idl.re"
 
 
+
+#line 366 "idl_re.cpp"
 {
+ YYCTYPE yych;
+ unsigned int yyaccept = 0;
     static const unsigned char yybm[] = {
         /* table 1 .. 8: 0 */
           0, 0, 0, 0, 0, 0, 0, 0,
@@ -431,469 +435,464 @@
          68, 68, 68, 68, 68, 68, 68, 68,
     };
 
-#line 435 "..\\..\\idllexer\\idl_re.cpp"
- {
- YYCTYPE yych;
- unsigned int yyaccept = 0;
-
- if((YYLIMIT - YYCURSOR) < 12) YYFILL(12);
- yych = *YYCURSOR;
- switch(yych) {
- case 0x00: goto yy69;
- case 0x09:
- case 0x0B:
- case 0x0C:
- case ' ': goto yy64;
- case 0x0A: goto yy66;
- case 0x0D: goto yy68;
- case '!': goto yy45;
- case '"': goto yy63;
- case '#': goto yy15;
- case '%': goto yy35;
- case '&': goto yy39;
- case '\'': goto yy62;
- case '(': goto yy17;
- case ')': goto yy19;
- case '*': goto yy33;
- case '+': goto yy29;
- case ',': goto yy53;
- case '-': goto yy31;
- case '.': goto yy27;
- case '/': goto yy2;
- case '0': goto yy59;
- case '1':
- case '2':
- case '3':
- case '4':
- case '5':
- case '6':
- case '7':
- case '8':
- case '9': goto yy61;
- case ':': goto yy23;
- case ';': goto yy21;
- case '<': goto yy49;
- case '=': goto yy47;
- case '>': goto yy51;
- case '?': goto yy25;
- case 'A':
- case 'B':
- case 'C':
- case 'D':
- case 'E':
- case 'G':
- case 'H':
- case 'I':
- case 'J':
- case 'K':
- case 'M':
- case 'N':
- case 'O':
- case 'P':
- case 'Q':
- case 'R':
- case 'S':
- case 'U':
- case 'V':
- case 'W':
- case 'X':
- case 'Y':
- case 'Z':
- case '_':
- case 'a':
- case 'b':
- case 'c':
- case 'd':
- case 'e':
- case 'f':
- case 'g':
- case 'h':
- case 'i':
- case 'j':
- case 'k':
- case 'l':
- case 'm':
- case 'n':
- case 'o':
- case 'p':
- case 'q':
- case 'r':
- case 's':
- case 't':
- case 'u':
- case 'v':
- case 'w':
- case 'x':
- case 'y':
- case 'z': goto yy55;
- case 'F': goto yy6;
- case 'L': goto yy56;
- case 'T': goto yy4;
- case '[': goto yy11;
- case '\\': goto yy57;
- case ']': goto yy13;
- case '^': goto yy37;
- case '{': goto yy7;
- case '|': goto yy41;
- case '}': goto yy9;
- case '~': goto yy43;
- default: goto yy71;
- }
+ if((YYLIMIT - YYCURSOR) < 12) YYFILL(12);
+ yych = *YYCURSOR;
+ switch(yych) {
+ case 0x00: goto yy69;
+ case 0x09:
+ case 0x0B:
+ case 0x0C:
+ case ' ': goto yy64;
+ case 0x0A: goto yy66;
+ case 0x0D: goto yy68;
+ case '!': goto yy45;
+ case '"': goto yy63;
+ case '#': goto yy15;
+ case '%': goto yy35;
+ case '&': goto yy39;
+ case '\'': goto yy62;
+ case '(': goto yy17;
+ case ')': goto yy19;
+ case '*': goto yy33;
+ case '+': goto yy29;
+ case ',': goto yy53;
+ case '-': goto yy31;
+ case '.': goto yy27;
+ case '/': goto yy2;
+ case '0': goto yy59;
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy61;
+ case ':': goto yy23;
+ case ';': goto yy21;
+ case '<': goto yy49;
+ case '=': goto yy47;
+ case '>': goto yy51;
+ case '?': goto yy25;
+ case 'A':
+ case 'B':
+ case 'C':
+ case 'D':
+ case 'E':
+ case 'G':
+ case 'H':
+ case 'I':
+ case 'J':
+ case 'K':
+ case 'M':
+ case 'N':
+ case 'O':
+ case 'P':
+ case 'Q':
+ case 'R':
+ case 'S':
+ case 'U':
+ case 'V':
+ case 'W':
+ case 'X':
+ case 'Y':
+ case 'Z':
+ case '_':
+ case 'a':
+ case 'b':
+ case 'c':
+ case 'd':
+ case 'e':
+ case 'f':
+ case 'g':
+ case 'h':
+ case 'i':
+ case 'j':
+ case 'k':
+ case 'l':
+ case 'm':
+ case 'n':
+ case 'o':
+ case 'p':
+ case 'q':
+ case 'r':
+ case 's':
+ case 't':
+ case 'u':
+ case 'v':
+ case 'w':
+ case 'x':
+ case 'y':
+ case 'z': goto yy55;
+ case 'F': goto yy6;
+ case 'L': goto yy56;
+ case 'T': goto yy4;
+ case '[': goto yy11;
+ case '\\': goto yy57;
+ case ']': goto yy13;
+ case '^': goto yy37;
+ case '{': goto yy7;
+ case '|': goto yy41;
+ case '}': goto yy9;
+ case '~': goto yy43;
+ default: goto yy71;
+ }
 yy2:
- ++YYCURSOR;
- if((yych = *YYCURSOR) == '*') goto yy356;
- if(yych == '/') goto yy354;
-#line 402 "..\\..\\idllexer\\idl.re"
- { BOOST_WAVE_RET(T_DIVIDE); }
-#line 549 "..\\..\\idllexer\\idl_re.cpp"
+ ++YYCURSOR;
+ if((yych = *YYCURSOR) == '*') goto yy356;
+ if(yych == '/') goto yy354;
+#line 402 "idl.re"
+ { BOOST_WAVE_RET(T_DIVIDE); }
+#line 548 "idl_re.cpp"
 yy4:
- yyaccept = 0;
- yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'R') goto yy350;
- goto yy202;
+ yyaccept = 0;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if(yych == 'R') goto yy350;
+ goto yy202;
 yy5:
-#line 425 "..\\..\\idllexer\\idl.re"
- { BOOST_WAVE_RET(T_IDENTIFIER); }
-#line 558 "..\\..\\idllexer\\idl_re.cpp"
+#line 425 "idl.re"
+ { BOOST_WAVE_RET(T_IDENTIFIER); }
+#line 557 "idl_re.cpp"
 yy6:
- yyaccept = 0;
- yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'A') goto yy345;
- goto yy202;
+ yyaccept = 0;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if(yych == 'A') goto yy345;
+ goto yy202;
 yy7:
- ++YYCURSOR;
-#line 387 "..\\..\\idllexer\\idl.re"
- { BOOST_WAVE_RET(T_LEFTBRACE); }
-#line 568 "..\\..\\idllexer\\idl_re.cpp"
+ ++YYCURSOR;
+#line 387 "idl.re"
+ { BOOST_WAVE_RET(T_LEFTBRACE); }
+#line 567 "idl_re.cpp"
 yy9:
- ++YYCURSOR;
-#line 388 "..\\..\\idllexer\\idl.re"
- { BOOST_WAVE_RET(T_RIGHTBRACE); }
-#line 573 "..\\..\\idllexer\\idl_re.cpp"
+ ++YYCURSOR;
+#line 388 "idl.re"
+ { BOOST_WAVE_RET(T_RIGHTBRACE); }
+#line 572 "idl_re.cpp"
 yy11:
- ++YYCURSOR;
-#line 389 "..\\..\\idllexer\\idl.re"
- { BOOST_WAVE_RET(T_LEFTBRACKET); }
-#line 578 "..\\..\\idllexer\\idl_re.cpp"
+ ++YYCURSOR;
+#line 389 "idl.re"
+ { BOOST_WAVE_RET(T_LEFTBRACKET); }
+#line 577 "idl_re.cpp"
 yy13:
- ++YYCURSOR;
-#line 390 "..\\..\\idllexer\\idl.re"
- { BOOST_WAVE_RET(T_RIGHTBRACKET); }
-#line 583 "..\\..\\idllexer\\idl_re.cpp"
+ ++YYCURSOR;
+#line 390 "idl.re"
+ { BOOST_WAVE_RET(T_RIGHTBRACKET); }
+#line 582 "idl_re.cpp"
 yy15:
- yyaccept = 1;
- yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= 'e') {
- if(yych <= '"') {
- if(yych <= 0x09) {
- if(yych >= 0x09) goto yy239;
- } else {
- if(yych == ' ') goto yy239;
- }
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if(yych <= 'e') {
+ if(yych <= '"') {
+ if(yych <= 0x09) {
+ if(yych >= 0x09) goto yy239;
             } else {
- if(yych <= '.') {
- if(yych <= '#') goto yy343;
- } else {
- if(yych <= '/') goto yy239;
- if(yych >= 'd') goto yy239;
- }
+ if(yych == ' ') goto yy239;
             }
         } else {
- if(yych <= 'o') {
- if(yych <= 'i') {
- if(yych >= 'i') goto yy239;
- } else {
- if(yych == 'l') goto yy239;
- }
+ if(yych <= '.') {
+ if(yych <= '#') goto yy343;
             } else {
- if(yych <= 'u') {
- if(yych <= 'p') goto yy239;
- if(yych >= 'u') goto yy239;
- } else {
- if(yych == 'w') goto yy239;
- }
+ if(yych <= '/') goto yy239;
+ if(yych >= 'd') goto yy239;
+ }
+ }
+ } else {
+ if(yych <= 'o') {
+ if(yych <= 'i') {
+ if(yych >= 'i') goto yy239;
+ } else {
+ if(yych == 'l') goto yy239;
+ }
+ } else {
+ if(yych <= 'u') {
+ if(yych <= 'p') goto yy239;
+ if(yych >= 'u') goto yy239;
+ } else {
+ if(yych == 'w') goto yy239;
             }
         }
+ }
 yy16:
-#line 391 "..\\..\\idllexer\\idl.re"
- { BOOST_WAVE_RET(T_POUND); }
-#line 621 "..\\..\\idllexer\\idl_re.cpp"
+#line 391 "idl.re"
+ { BOOST_WAVE_RET(T_POUND); }
+#line 620 "idl_re.cpp"
 yy17:
- ++YYCURSOR;
-#line 393 "..\\..\\idllexer\\idl.re"
- { BOOST_WAVE_RET(T_LEFTPAREN); }
-#line 626 "..\\..\\idllexer\\idl_re.cpp"
+ ++YYCURSOR;
+#line 393 "idl.re"
+ { BOOST_WAVE_RET(T_LEFTPAREN); }
+#line 625 "idl_re.cpp"
 yy19:
- ++YYCURSOR;
-#line 394 "..\\..\\idllexer\\idl.re"
- { BOOST_WAVE_RET(T_RIGHTPAREN); }
-#line 631 "..\\..\\idllexer\\idl_re.cpp"
+ ++YYCURSOR;
+#line 394 "idl.re"
+ { BOOST_WAVE_RET(T_RIGHTPAREN); }
+#line 630 "idl_re.cpp"
 yy21:
- ++YYCURSOR;
-#line 395 "..\\..\\idllexer\\idl.re"
- { BOOST_WAVE_RET(T_SEMICOLON); }
-#line 636 "..\\..\\idllexer\\idl_re.cpp"
+ ++YYCURSOR;
+#line 395 "idl.re"
+ { BOOST_WAVE_RET(T_SEMICOLON); }
+#line 635 "idl_re.cpp"
 yy23:
- ++YYCURSOR;
-#line 396 "..\\..\\idllexer\\idl.re"
- { BOOST_WAVE_RET(T_COLON); }
-#line 641 "..\\..\\idllexer\\idl_re.cpp"
+ ++YYCURSOR;
+#line 396 "idl.re"
+ { BOOST_WAVE_RET(T_COLON); }
+#line 640 "idl_re.cpp"
 yy25:
- yyaccept = 2;
- yych = *(YYMARKER = ++YYCURSOR);
- if(yych == '?') goto yy341;
+ yyaccept = 2;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if(yych == '?') goto yy341;
 yy26:
-#line 397 "..\\..\\idllexer\\idl.re"
- { BOOST_WAVE_RET(T_QUESTION_MARK); }
-#line 649 "..\\..\\idllexer\\idl_re.cpp"
+#line 397 "idl.re"
+ { BOOST_WAVE_RET(T_QUESTION_MARK); }
+#line 648 "idl_re.cpp"
 yy27:
- ++YYCURSOR;
- if((yych = *YYCURSOR) <= '/') goto yy28;
- if(yych <= '9') goto yy168;
+ ++YYCURSOR;
+ if((yych = *YYCURSOR) <= '/') goto yy28;
+ if(yych <= '9') goto yy168;
 yy28:
-#line 398 "..\\..\\idllexer\\idl.re"
- { BOOST_WAVE_RET(T_DOT); }
-#line 657 "..\\..\\idllexer\\idl_re.cpp"
+#line 398 "idl.re"
+ { BOOST_WAVE_RET(T_DOT); }
+#line 656 "idl_re.cpp"
 yy29:
- ++YYCURSOR;
- if((yych = *YYCURSOR) == '+') goto yy339;
-#line 399 "..\\..\\idllexer\\idl.re"
- { BOOST_WAVE_RET(T_PLUS); }
-#line 663 "..\\..\\idllexer\\idl_re.cpp"
+ ++YYCURSOR;
+ if((yych = *YYCURSOR) == '+') goto yy339;
+#line 399 "idl.re"
+ { BOOST_WAVE_RET(T_PLUS); }
+#line 662 "idl_re.cpp"
 yy31:
- ++YYCURSOR;
- if((yych = *YYCURSOR) == '-') goto yy337;
-#line 400 "..\\..\\idllexer\\idl.re"
- { BOOST_WAVE_RET(T_MINUS); }
-#line 669 "..\\..\\idllexer\\idl_re.cpp"
+ ++YYCURSOR;
+ if((yych = *YYCURSOR) == '-') goto yy337;
+#line 400 "idl.re"
+ { BOOST_WAVE_RET(T_MINUS); }
+#line 668 "idl_re.cpp"
 yy33:
- ++YYCURSOR;
-#line 401 "..\\..\\idllexer\\idl.re"
- { BOOST_WAVE_RET(T_STAR); }
-#line 674 "..\\..\\idllexer\\idl_re.cpp"
+ ++YYCURSOR;
+#line 401 "idl.re"
+ { BOOST_WAVE_RET(T_STAR); }
+#line 673 "idl_re.cpp"
 yy35:
- yyaccept = 3;
- yych = *(YYMARKER = ++YYCURSOR);
- if(yych == ':') goto yy238;
+ yyaccept = 3;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if(yych == ':') goto yy238;
 yy36:
-#line 403 "..\\..\\idllexer\\idl.re"
- { BOOST_WAVE_RET(T_PERCENT); }
-#line 682 "..\\..\\idllexer\\idl_re.cpp"
+#line 403 "idl.re"
+ { BOOST_WAVE_RET(T_PERCENT); }
+#line 681 "idl_re.cpp"
 yy37:
- ++YYCURSOR;
-#line 404 "..\\..\\idllexer\\idl.re"
- { BOOST_WAVE_RET(T_XOR); }
-#line 687 "..\\..\\idllexer\\idl_re.cpp"
+ ++YYCURSOR;
+#line 404 "idl.re"
+ { BOOST_WAVE_RET(T_XOR); }
+#line 686 "idl_re.cpp"
 yy39:
- ++YYCURSOR;
- if((yych = *YYCURSOR) == '&') goto yy236;
-#line 405 "..\\..\\idllexer\\idl.re"
- { BOOST_WAVE_RET(T_AND); }
-#line 693 "..\\..\\idllexer\\idl_re.cpp"
+ ++YYCURSOR;
+ if((yych = *YYCURSOR) == '&') goto yy236;
+#line 405 "idl.re"
+ { BOOST_WAVE_RET(T_AND); }
+#line 692 "idl_re.cpp"
 yy41:
- ++YYCURSOR;
- if((yych = *YYCURSOR) == '|') goto yy234;
-#line 406 "..\\..\\idllexer\\idl.re"
- { BOOST_WAVE_RET(T_OR); }
-#line 699 "..\\..\\idllexer\\idl_re.cpp"
+ ++YYCURSOR;
+ if((yych = *YYCURSOR) == '|') goto yy234;
+#line 406 "idl.re"
+ { BOOST_WAVE_RET(T_OR); }
+#line 698 "idl_re.cpp"
 yy43:
- ++YYCURSOR;
-#line 407 "..\\..\\idllexer\\idl.re"
- { BOOST_WAVE_RET(T_COMPL); }
-#line 704 "..\\..\\idllexer\\idl_re.cpp"
+ ++YYCURSOR;
+#line 407 "idl.re"
+ { BOOST_WAVE_RET(T_COMPL); }
+#line 703 "idl_re.cpp"
 yy45:
- ++YYCURSOR;
- if((yych = *YYCURSOR) == '=') goto yy232;
-#line 408 "..\\..\\idllexer\\idl.re"
- { BOOST_WAVE_RET(T_NOT); }
-#line 710 "..\\..\\idllexer\\idl_re.cpp"
+ ++YYCURSOR;
+ if((yych = *YYCURSOR) == '=') goto yy232;
+#line 408 "idl.re"
+ { BOOST_WAVE_RET(T_NOT); }
+#line 709 "idl_re.cpp"
 yy47:
- ++YYCURSOR;
- if((yych = *YYCURSOR) == '=') goto yy230;
-#line 409 "..\\..\\idllexer\\idl.re"
- { BOOST_WAVE_RET(T_ASSIGN); }
-#line 716 "..\\..\\idllexer\\idl_re.cpp"
+ ++YYCURSOR;
+ if((yych = *YYCURSOR) == '=') goto yy230;
+#line 409 "idl.re"
+ { BOOST_WAVE_RET(T_ASSIGN); }
+#line 715 "idl_re.cpp"
 yy49:
- ++YYCURSOR;
- if((yych = *YYCURSOR) <= ';') goto yy50;
- if(yych <= '<') goto yy228;
- if(yych <= '=') goto yy226;
+ ++YYCURSOR;
+ if((yych = *YYCURSOR) <= ';') goto yy50;
+ if(yych <= '<') goto yy228;
+ if(yych <= '=') goto yy226;
 yy50:
-#line 410 "..\\..\\idllexer\\idl.re"
- { BOOST_WAVE_RET(T_LESS); }
-#line 725 "..\\..\\idllexer\\idl_re.cpp"
+#line 410 "idl.re"
+ { BOOST_WAVE_RET(T_LESS); }
+#line 724 "idl_re.cpp"
 yy51:
- ++YYCURSOR;
- if((yych = *YYCURSOR) <= '<') goto yy52;
- if(yych <= '=') goto yy222;
- if(yych <= '>') goto yy224;
+ ++YYCURSOR;
+ if((yych = *YYCURSOR) <= '<') goto yy52;
+ if(yych <= '=') goto yy222;
+ if(yych <= '>') goto yy224;
 yy52:
-#line 411 "..\\..\\idllexer\\idl.re"
- { BOOST_WAVE_RET(T_GREATER); }
-#line 734 "..\\..\\idllexer\\idl_re.cpp"
+#line 411 "idl.re"
+ { BOOST_WAVE_RET(T_GREATER); }
+#line 733 "idl_re.cpp"
 yy53:
- ++YYCURSOR;
-#line 422 "..\\..\\idllexer\\idl.re"
- { BOOST_WAVE_RET(T_COMMA); }
-#line 739 "..\\..\\idllexer\\idl_re.cpp"
+ ++YYCURSOR;
+#line 422 "idl.re"
+ { BOOST_WAVE_RET(T_COMMA); }
+#line 738 "idl_re.cpp"
 yy55:
- yyaccept = 0;
- yych = *(YYMARKER = ++YYCURSOR);
- goto yy202;
+ yyaccept = 0;
+ yych = *(YYMARKER = ++YYCURSOR);
+ goto yy202;
 yy56:
- yyaccept = 0;
- yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 2) {
- goto yy201;
- }
- if(yych <= '\'') {
- if(yych == '"') goto yy75;
- if(yych <= '&') goto yy5;
- goto yy221;
- } else {
- if(yych <= '?') {
- if(yych <= '>') goto yy5;
- goto yy204;
- } else {
- if(yych == '\\') goto yy203;
- goto yy5;
- }
+ yyaccept = 0;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if(yybm[0+yych] & 2) {
+ goto yy201;
+ }
+ if(yych <= '\'') {
+ if(yych == '"') goto yy75;
+ if(yych <= '&') goto yy5;
+ goto yy221;
+ } else {
+ if(yych <= '?') {
+ if(yych <= '>') goto yy5;
+ goto yy204;
+ } else {
+ if(yych == '\\') goto yy203;
+ goto yy5;
         }
+ }
 yy57:
- yyaccept = 4;
- yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'U') goto yy193;
- if(yych == 'u') goto yy192;
+ yyaccept = 4;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if(yych == 'U') goto yy193;
+ if(yych == 'u') goto yy192;
 yy58:
-#line 492 "..\\..\\idllexer\\idl.re"
- {
+#line 492 "idl.re"
+ {
         BOOST_WAVE_RET(TOKEN_FROM_ID(*s->tok, UnknownTokenType));
     }
-#line 773 "..\\..\\idllexer\\idl_re.cpp"
+#line 772 "idl_re.cpp"
 yy59:
- yyaccept = 5;
- yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 1) {
- goto yy185;
+ yyaccept = 5;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if(yybm[0+yych] & 1) {
+ goto yy185;
+ }
+ if(yych <= 'U') {
+ if(yych <= 'C') {
+ if(yych <= '.') {
+ if(yych >= '.') goto yy168;
+ } else {
+ if(yych <= '/') goto yy60;
+ if(yych <= '9') goto yy187;
+ }
+ } else {
+ if(yych <= 'K') {
+ if(yych <= 'D') goto yy164;
+ if(yych <= 'E') goto yy171;
+ } else {
+ if(yych <= 'L') goto yy173;
+ if(yych >= 'U') goto yy172;
+ }
         }
- if(yych <= 'U') {
- if(yych <= 'C') {
- if(yych <= '.') {
- if(yych >= '.') goto yy168;
- } else {
- if(yych <= '/') goto yy60;
- if(yych <= '9') goto yy187;
- }
+ } else {
+ if(yych <= 'k') {
+ if(yych <= 'c') {
+ if(yych == 'X') goto yy189;
             } else {
- if(yych <= 'K') {
- if(yych <= 'D') goto yy164;
- if(yych <= 'E') goto yy171;
- } else {
- if(yych <= 'L') goto yy173;
- if(yych >= 'U') goto yy172;
- }
+ if(yych <= 'd') goto yy164;
+ if(yych <= 'e') goto yy171;
             }
         } else {
- if(yych <= 'k') {
- if(yych <= 'c') {
- if(yych == 'X') goto yy189;
- } else {
- if(yych <= 'd') goto yy164;
- if(yych <= 'e') goto yy171;
- }
+ if(yych <= 'u') {
+ if(yych <= 'l') goto yy173;
+ if(yych >= 'u') goto yy172;
             } else {
- if(yych <= 'u') {
- if(yych <= 'l') goto yy173;
- if(yych >= 'u') goto yy172;
- } else {
- if(yych == 'x') goto yy189;
- }
+ if(yych == 'x') goto yy189;
             }
         }
+ }
 yy60:
-#line 428 "..\\..\\idllexer\\idl.re"
- { BOOST_WAVE_RET(T_INTLIT); }
-#line 817 "..\\..\\idllexer\\idl_re.cpp"
+#line 428 "idl.re"
+ { BOOST_WAVE_RET(T_INTLIT); }
+#line 816 "idl_re.cpp"
 yy61:
- yyaccept = 5;
- yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[256+yych] & 128) {
- goto yy166;
+ yyaccept = 5;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if(yybm[256+yych] & 128) {
+ goto yy166;
+ }
+ if(yych <= 'T') {
+ if(yych <= 'D') {
+ if(yych == '.') goto yy168;
+ if(yych <= 'C') goto yy60;
+ goto yy164;
+ } else {
+ if(yych <= 'E') goto yy171;
+ if(yych == 'L') goto yy173;
+ goto yy60;
         }
- if(yych <= 'T') {
- if(yych <= 'D') {
- if(yych == '.') goto yy168;
- if(yych <= 'C') goto yy60;
- goto yy164;
+ } else {
+ if(yych <= 'e') {
+ if(yych <= 'U') goto yy172;
+ if(yych <= 'c') goto yy60;
+ if(yych <= 'd') goto yy164;
+ goto yy171;
+ } else {
+ if(yych <= 'l') {
+ if(yych <= 'k') goto yy60;
+ goto yy173;
             } else {
- if(yych <= 'E') goto yy171;
- if(yych == 'L') goto yy173;
+ if(yych == 'u') goto yy172;
                 goto yy60;
             }
- } else {
- if(yych <= 'e') {
- if(yych <= 'U') goto yy172;
- if(yych <= 'c') goto yy60;
- if(yych <= 'd') goto yy164;
- goto yy171;
- } else {
- if(yych <= 'l') {
- if(yych <= 'k') goto yy60;
- goto yy173;
- } else {
- if(yych == 'u') goto yy172;
- goto yy60;
- }
- }
         }
+ }
 yy62:
- yyaccept = 4;
- yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy121;
- if(yych <= 0x0A) goto yy58;
- goto yy121;
- } else {
- if(yych <= 0x1F) goto yy58;
- if(yych == '\'') goto yy58;
- goto yy121;
- }
+ yyaccept = 4;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if(yych <= 0x0C) {
+ if(yych == 0x09) goto yy121;
+ if(yych <= 0x0A) goto yy58;
+ goto yy121;
+ } else {
+ if(yych <= 0x1F) goto yy58;
+ if(yych == '\'') goto yy58;
+ goto yy121;
+ }
 yy63:
- yyaccept = 4;
- yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= 0x0A) {
- if(yych == 0x09) goto yy76;
- goto yy58;
- } else {
- if(yych <= 0x0C) goto yy76;
- if(yych <= 0x1F) goto yy58;
- goto yy76;
- }
+ yyaccept = 4;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if(yych <= 0x0A) {
+ if(yych == 0x09) goto yy76;
+ goto yy58;
+ } else {
+ if(yych <= 0x0C) goto yy76;
+ if(yych <= 0x1F) goto yy58;
+ goto yy76;
+ }
 yy64:
- ++YYCURSOR;
- yych = *YYCURSOR;
- goto yy74;
+ ++YYCURSOR;
+ yych = *YYCURSOR;
+ goto yy74;
 yy65:
-#line 467 "..\\..\\idllexer\\idl.re"
- { BOOST_WAVE_RET(T_SPACE); }
-#line 880 "..\\..\\idllexer\\idl_re.cpp"
+#line 467 "idl.re"
+ { BOOST_WAVE_RET(T_SPACE); }
+#line 879 "idl_re.cpp"
 yy66:
- ++YYCURSOR;
+ ++YYCURSOR;
 yy67:
-#line 470 "..\\..\\idllexer\\idl.re"
- {
+#line 470 "idl.re"
+ {
         s->line++;
         BOOST_WAVE_RET(T_NEWLINE);
     }
-#line 889 "..\\..\\idllexer\\idl_re.cpp"
+#line 888 "idl_re.cpp"
 yy68:
- yych = *++YYCURSOR;
- if(yych == 0x0A) goto yy72;
- goto yy67;
+ yych = *++YYCURSOR;
+ if(yych == 0x0A) goto yy72;
+ goto yy67;
 yy69:
- ++YYCURSOR;
-#line 476 "..\\..\\idllexer\\idl.re"
- {
+ ++YYCURSOR;
+#line 476 "idl.re"
+ {
         if(cursor != s->eof)
         {
             using namespace std; // some systems have printf in std
@@ -907,2731 +906,2729 @@
         }
         BOOST_WAVE_RET(T_EOF);
     }
-#line 911 "..\\..\\idllexer\\idl_re.cpp"
+#line 910 "idl_re.cpp"
 yy71:
- yych = *++YYCURSOR;
- goto yy58;
+ yych = *++YYCURSOR;
+ goto yy58;
 yy72:
- yych = *++YYCURSOR;
- goto yy67;
+ yych = *++YYCURSOR;
+ goto yy67;
 yy73:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
 yy74:
- if(yybm[256+yych] & 2) {
- goto yy73;
- }
- goto yy65;
+ if(yybm[256+yych] & 2) {
+ goto yy73;
+ }
+ goto yy65;
 yy75:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
 yy76:
- if(yybm[256+yych] & 4) {
- goto yy75;
- }
- if(yych <= '!') goto yy77;
- if(yych <= '"') goto yy80;
- if(yych <= '[') goto yy78;
- goto yy79;
+ if(yybm[256+yych] & 4) {
+ goto yy75;
+ }
+ if(yych <= '!') goto yy77;
+ if(yych <= '"') goto yy80;
+ if(yych <= '[') goto yy78;
+ goto yy79;
 yy77:
- YYCURSOR = YYMARKER;
- if(yyaccept <= 6) {
- if(yyaccept <= 3) {
- if(yyaccept <= 1) {
- if(yyaccept <= 0) {
- goto yy5;
- } else {
- goto yy16;
- }
+ YYCURSOR = YYMARKER;
+ if(yyaccept <= 6) {
+ if(yyaccept <= 3) {
+ if(yyaccept <= 1) {
+ if(yyaccept <= 0) {
+ goto yy5;
                 } else {
- if(yyaccept <= 2) {
- goto yy26;
- } else {
- goto yy36;
- }
+ goto yy16;
                 }
             } else {
- if(yyaccept <= 5) {
- if(yyaccept <= 4) {
- goto yy58;
- } else {
- goto yy60;
- }
+ if(yyaccept <= 2) {
+ goto yy26;
                 } else {
- goto yy81;
+ goto yy36;
                 }
             }
         } else {
- if(yyaccept <= 9) {
- if(yyaccept <= 8) {
- if(yyaccept <= 7) {
- goto yy131;
- } else {
- goto yy170;
- }
+ if(yyaccept <= 5) {
+ if(yyaccept <= 4) {
+ goto yy58;
                 } else {
- goto yy294;
+ goto yy60;
                 }
             } else {
- if(yyaccept <= 11) {
- if(yyaccept <= 10) {
- goto yy302;
- } else {
- goto yy349;
- }
- } else {
- goto yy353;
- }
+ goto yy81;
             }
         }
-yy78:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yybm[256+yych] & 4) {
- goto yy75;
- }
- if(yych <= '!') goto yy77;
- if(yych <= '"') goto yy80;
- if(yych <= '[') goto yy91;
-yy79:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '`') {
- if(yych <= '7') {
- if(yych <= '&') {
- if(yych == '"') goto yy75;
- goto yy77;
+ } else {
+ if(yyaccept <= 9) {
+ if(yyaccept <= 8) {
+ if(yyaccept <= 7) {
+ goto yy131;
                 } else {
- if(yych <= '\'') goto yy75;
- if(yych <= '/') goto yy77;
- goto yy86;
+ goto yy170;
                 }
             } else {
- if(yych <= 'T') {
- if(yych == '?') goto yy84;
- goto yy77;
- } else {
- if(yych <= 'U') goto yy83;
- if(yych == '\\') goto yy75;
- goto yy77;
- }
+ goto yy294;
             }
         } else {
- if(yych <= 'r') {
- if(yych <= 'f') {
- if(yych <= 'b') goto yy75;
- if(yych <= 'e') goto yy77;
- goto yy75;
+ if(yyaccept <= 11) {
+ if(yyaccept <= 10) {
+ goto yy302;
                 } else {
- if(yych == 'n') goto yy75;
- if(yych <= 'q') goto yy77;
- goto yy75;
+ goto yy349;
                 }
             } else {
- if(yych <= 'u') {
- if(yych <= 's') goto yy77;
- if(yych <= 't') goto yy75;
- goto yy82;
- } else {
- if(yych <= 'v') goto yy75;
- if(yych == 'x') goto yy85;
- goto yy77;
- }
+ goto yy353;
+ }
+ }
+ }
+yy78:
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yybm[256+yych] & 4) {
+ goto yy75;
+ }
+ if(yych <= '!') goto yy77;
+ if(yych <= '"') goto yy80;
+ if(yych <= '[') goto yy91;
+yy79:
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '`') {
+ if(yych <= '7') {
+ if(yych <= '&') {
+ if(yych == '"') goto yy75;
+ goto yy77;
+ } else {
+ if(yych <= '\'') goto yy75;
+ if(yych <= '/') goto yy77;
+ goto yy86;
+ }
+ } else {
+ if(yych <= 'T') {
+ if(yych == '?') goto yy84;
+ goto yy77;
+ } else {
+ if(yych <= 'U') goto yy83;
+ if(yych == '\\') goto yy75;
+ goto yy77;
+ }
+ }
+ } else {
+ if(yych <= 'r') {
+ if(yych <= 'f') {
+ if(yych <= 'b') goto yy75;
+ if(yych <= 'e') goto yy77;
+ goto yy75;
+ } else {
+ if(yych == 'n') goto yy75;
+ if(yych <= 'q') goto yy77;
+ goto yy75;
+ }
+ } else {
+ if(yych <= 'u') {
+ if(yych <= 's') goto yy77;
+ if(yych <= 't') goto yy75;
+ goto yy82;
+ } else {
+ if(yych <= 'v') goto yy75;
+ if(yych == 'x') goto yy85;
+ goto yy77;
             }
         }
+ }
 yy80:
- ++YYCURSOR;
+ ++YYCURSOR;
 yy81:
-#line 440 "..\\..\\idllexer\\idl.re"
- { BOOST_WAVE_RET(T_STRINGLIT); }
-#line 1052 "..\\..\\idllexer\\idl_re.cpp"
+#line 440 "idl.re"
+ { BOOST_WAVE_RET(T_STRINGLIT); }
+#line 1051 "idl_re.cpp"
 yy82:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy77;
- if(yych <= '9') goto yy117;
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '@') {
+ if(yych <= '/') goto yy77;
+ if(yych <= '9') goto yy117;
+ goto yy77;
+ } else {
+ if(yych <= 'F') goto yy117;
+ if(yych <= '`') goto yy77;
+ if(yych <= 'f') goto yy117;
+ goto yy77;
+ }
+yy83:
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '@') {
+ if(yych <= '/') goto yy77;
+ if(yych <= '9') goto yy110;
+ goto yy77;
+ } else {
+ if(yych <= 'F') goto yy110;
+ if(yych <= '`') goto yy77;
+ if(yych <= 'f') goto yy110;
+ goto yy77;
+ }
+yy84:
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yybm[256+yych] & 4) {
+ goto yy75;
+ }
+ if(yych <= '!') goto yy77;
+ if(yych <= '"') goto yy80;
+ if(yych <= '[') goto yy90;
+ goto yy79;
+yy85:
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yybm[256+yych] & 8) {
+ goto yy88;
+ }
+ goto yy77;
+yy86:
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '"') {
+ if(yych <= 0x0A) {
+ if(yych == 0x09) goto yy75;
             goto yy77;
         } else {
- if(yych <= 'F') goto yy117;
- if(yych <= '`') goto yy77;
- if(yych <= 'f') goto yy117;
- goto yy77;
+ if(yych <= 0x0C) goto yy75;
+ if(yych <= 0x1F) goto yy77;
+ if(yych <= '!') goto yy75;
+ goto yy80;
         }
-yy83:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy77;
- if(yych <= '9') goto yy110;
- goto yy77;
+ } else {
+ if(yych <= '>') {
+ if(yych <= '/') goto yy75;
+ if(yych >= '8') goto yy75;
         } else {
- if(yych <= 'F') goto yy110;
- if(yych <= '`') goto yy77;
- if(yych <= 'f') goto yy110;
- goto yy77;
+ if(yych <= '?') goto yy78;
+ if(yych == '\\') goto yy79;
+ goto yy75;
         }
-yy84:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yybm[256+yych] & 4) {
+ }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yybm[256+yych] & 4) {
+ goto yy75;
+ }
+ if(yych <= '!') goto yy77;
+ if(yych <= '"') goto yy80;
+ if(yych <= '[') goto yy78;
+ goto yy79;
+yy88:
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yybm[256+yych] & 8) {
+ goto yy88;
+ }
+ if(yych <= '!') {
+ if(yych <= 0x0A) {
+ if(yych == 0x09) goto yy75;
+ goto yy77;
+ } else {
+ if(yych <= 0x0C) goto yy75;
+ if(yych <= 0x1F) goto yy77;
             goto yy75;
         }
- if(yych <= '!') goto yy77;
- if(yych <= '"') goto yy80;
- if(yych <= '[') goto yy90;
- goto yy79;
-yy85:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yybm[256+yych] & 8) {
- goto yy88;
+ } else {
+ if(yych <= '?') {
+ if(yych <= '"') goto yy80;
+ if(yych <= '>') goto yy75;
+ goto yy78;
+ } else {
+ if(yych == '\\') goto yy79;
+ goto yy75;
         }
- goto yy77;
-yy86:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '"') {
- if(yych <= 0x0A) {
- if(yych == 0x09) goto yy75;
- goto yy77;
- } else {
- if(yych <= 0x0C) goto yy75;
- if(yych <= 0x1F) goto yy77;
- if(yych <= '!') goto yy75;
- goto yy80;
- }
+ }
+yy90:
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yybm[256+yych] & 4) {
+ goto yy75;
+ }
+ if(yych <= '!') goto yy77;
+ if(yych <= '"') goto yy80;
+ if(yych >= '\\') goto yy79;
+yy91:
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yybm[256+yych] & 16) {
+ goto yy91;
+ }
+ if(yych <= '!') {
+ if(yych <= 0x0A) {
+ if(yych == 0x09) goto yy75;
+ goto yy77;
         } else {
- if(yych <= '>') {
- if(yych <= '/') goto yy75;
- if(yych >= '8') goto yy75;
- } else {
- if(yych <= '?') goto yy78;
- if(yych == '\\') goto yy79;
- goto yy75;
- }
+ if(yych <= 0x0C) goto yy75;
+ if(yych <= 0x1F) goto yy77;
+ goto yy75;
         }
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yybm[256+yych] & 4) {
+ } else {
+ if(yych <= '/') {
+ if(yych <= '"') goto yy80;
+ if(yych <= '.') goto yy75;
+ } else {
+ if(yych == '\\') goto yy79;
             goto yy75;
         }
- if(yych <= '!') goto yy77;
- if(yych <= '"') goto yy80;
- if(yych <= '[') goto yy78;
- goto yy79;
-yy88:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yybm[256+yych] & 8) {
- goto yy88;
- }
- if(yych <= '!') {
- if(yych <= 0x0A) {
- if(yych == 0x09) goto yy75;
- goto yy77;
- } else {
- if(yych <= 0x0C) goto yy75;
+ }
+yy93:
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yybm[256+yych] & 32) {
+ goto yy93;
+ }
+ if(yych <= '7') {
+ if(yych <= 0x0C) {
+ if(yych == 0x09) goto yy75;
+ if(yych <= 0x0A) goto yy77;
+ goto yy75;
+ } else {
+ if(yych <= '!') {
                 if(yych <= 0x1F) goto yy77;
                 goto yy75;
+ } else {
+ if(yych <= '"') goto yy97;
+ if(yych <= '/') goto yy75;
+ goto yy86;
             }
+ }
+ } else {
+ if(yych <= 'U') {
+ if(yych == '?') goto yy98;
+ if(yych <= 'T') goto yy75;
+ goto yy96;
         } else {
- if(yych <= '?') {
- if(yych <= '"') goto yy80;
- if(yych <= '>') goto yy75;
- goto yy78;
+ if(yych <= 'u') {
+ if(yych <= 't') goto yy75;
             } else {
- if(yych == '\\') goto yy79;
+ if(yych == 'x') goto yy88;
                 goto yy75;
             }
         }
-yy90:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yybm[256+yych] & 4) {
+ }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '9') {
+ if(yych <= 0x0C) {
+ if(yych == 0x09) goto yy75;
+ if(yych <= 0x0A) goto yy77;
             goto yy75;
- }
- if(yych <= '!') goto yy77;
- if(yych <= '"') goto yy80;
- if(yych >= '\\') goto yy79;
-yy91:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yybm[256+yych] & 16) {
- goto yy91;
- }
- if(yych <= '!') {
- if(yych <= 0x0A) {
- if(yych == 0x09) goto yy75;
- goto yy77;
- } else {
- if(yych <= 0x0C) goto yy75;
+ } else {
+ if(yych <= '!') {
                 if(yych <= 0x1F) goto yy77;
                 goto yy75;
+ } else {
+ if(yych <= '"') goto yy80;
+ if(yych <= '/') goto yy75;
+ goto yy107;
             }
+ }
+ } else {
+ if(yych <= 'F') {
+ if(yych == '?') goto yy78;
+ if(yych <= '@') goto yy75;
+ goto yy107;
         } else {
- if(yych <= '/') {
- if(yych <= '"') goto yy80;
- if(yych <= '.') goto yy75;
+ if(yych <= '\\') {
+ if(yych <= '[') goto yy75;
+ goto yy79;
             } else {
- if(yych == '\\') goto yy79;
+ if(yych <= '`') goto yy75;
+ if(yych <= 'f') goto yy107;
                 goto yy75;
             }
         }
-yy93:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yybm[256+yych] & 32) {
- goto yy93;
- }
- if(yych <= '7') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy75;
- if(yych <= 0x0A) goto yy77;
+ }
+yy96:
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '9') {
+ if(yych <= 0x0C) {
+ if(yych == 0x09) goto yy75;
+ if(yych <= 0x0A) goto yy77;
+ goto yy75;
+ } else {
+ if(yych <= '!') {
+ if(yych <= 0x1F) goto yy77;
                 goto yy75;
             } else {
- if(yych <= '!') {
- if(yych <= 0x1F) goto yy77;
- goto yy75;
- } else {
- if(yych <= '"') goto yy97;
- if(yych <= '/') goto yy75;
- goto yy86;
- }
+ if(yych <= '"') goto yy80;
+ if(yych <= '/') goto yy75;
+ goto yy100;
             }
+ }
+ } else {
+ if(yych <= 'F') {
+ if(yych == '?') goto yy78;
+ if(yych <= '@') goto yy75;
+ goto yy100;
         } else {
- if(yych <= 'U') {
- if(yych == '?') goto yy98;
- if(yych <= 'T') goto yy75;
- goto yy96;
+ if(yych <= '\\') {
+ if(yych <= '[') goto yy75;
+ goto yy79;
             } else {
- if(yych <= 'u') {
- if(yych <= 't') goto yy75;
- } else {
- if(yych == 'x') goto yy88;
- goto yy75;
- }
- }
- }
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy75;
- if(yych <= 0x0A) goto yy77;
+ if(yych <= '`') goto yy75;
+ if(yych <= 'f') goto yy100;
                 goto yy75;
- } else {
- if(yych <= '!') {
- if(yych <= 0x1F) goto yy77;
- goto yy75;
- } else {
- if(yych <= '"') goto yy80;
- if(yych <= '/') goto yy75;
- goto yy107;
- }
- }
- } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy78;
- if(yych <= '@') goto yy75;
- goto yy107;
- } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy75;
- goto yy79;
- } else {
- if(yych <= '`') goto yy75;
- if(yych <= 'f') goto yy107;
- goto yy75;
- }
- }
- }
-yy96:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy75;
- if(yych <= 0x0A) goto yy77;
- goto yy75;
- } else {
- if(yych <= '!') {
- if(yych <= 0x1F) goto yy77;
- goto yy75;
- } else {
- if(yych <= '"') goto yy80;
- if(yych <= '/') goto yy75;
- goto yy100;
- }
- }
- } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy78;
- if(yych <= '@') goto yy75;
- goto yy100;
- } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy75;
- goto yy79;
- } else {
- if(yych <= '`') goto yy75;
- if(yych <= 'f') goto yy100;
- goto yy75;
- }
             }
         }
+ }
 yy97:
- yyaccept = 6;
- YYMARKER = ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yybm[256+yych] & 4) {
- goto yy75;
- }
- if(yych <= '!') goto yy81;
- if(yych <= '"') goto yy80;
- if(yych <= '[') goto yy78;
- goto yy79;
+ yyaccept = 6;
+ YYMARKER = ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yybm[256+yych] & 4) {
+ goto yy75;
+ }
+ if(yych <= '!') goto yy81;
+ if(yych <= '"') goto yy80;
+ if(yych <= '[') goto yy78;
+ goto yy79;
 yy98:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yybm[256+yych] & 4) {
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yybm[256+yych] & 4) {
+ goto yy75;
+ }
+ if(yych <= '!') goto yy77;
+ if(yych <= '"') goto yy80;
+ if(yych >= '\\') goto yy79;
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yybm[256+yych] & 16) {
+ goto yy91;
+ }
+ if(yych <= '!') {
+ if(yych <= 0x0A) {
+ if(yych == 0x09) goto yy75;
+ goto yy77;
+ } else {
+ if(yych <= 0x0C) goto yy75;
+ if(yych <= 0x1F) goto yy77;
             goto yy75;
         }
- if(yych <= '!') goto yy77;
- if(yych <= '"') goto yy80;
- if(yych >= '\\') goto yy79;
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yybm[256+yych] & 16) {
- goto yy91;
- }
- if(yych <= '!') {
- if(yych <= 0x0A) {
- if(yych == 0x09) goto yy75;
- goto yy77;
- } else {
- if(yych <= 0x0C) goto yy75;
- if(yych <= 0x1F) goto yy77;
- goto yy75;
- }
+ } else {
+ if(yych <= '/') {
+ if(yych <= '"') goto yy80;
+ if(yych <= '.') goto yy75;
+ goto yy93;
         } else {
- if(yych <= '/') {
- if(yych <= '"') goto yy80;
- if(yych <= '.') goto yy75;
- goto yy93;
- } else {
- if(yych == '\\') goto yy79;
- goto yy75;
- }
+ if(yych == '\\') goto yy79;
+ goto yy75;
         }
+ }
 yy100:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy75;
- if(yych <= 0x0A) goto yy77;
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '9') {
+ if(yych <= 0x0C) {
+ if(yych == 0x09) goto yy75;
+ if(yych <= 0x0A) goto yy77;
+ goto yy75;
+ } else {
+ if(yych <= '!') {
+ if(yych <= 0x1F) goto yy77;
                 goto yy75;
             } else {
- if(yych <= '!') {
- if(yych <= 0x1F) goto yy77;
- goto yy75;
- } else {
- if(yych <= '"') goto yy80;
- if(yych <= '/') goto yy75;
- }
+ if(yych <= '"') goto yy80;
+ if(yych <= '/') goto yy75;
             }
+ }
+ } else {
+ if(yych <= 'F') {
+ if(yych == '?') goto yy78;
+ if(yych <= '@') goto yy75;
         } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy78;
- if(yych <= '@') goto yy75;
- } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy75;
- goto yy79;
- } else {
- if(yych <= '`') goto yy75;
- if(yych >= 'g') goto yy75;
- }
+ if(yych <= '\\') {
+ if(yych <= '[') goto yy75;
+ goto yy79;
+ } else {
+ if(yych <= '`') goto yy75;
+ if(yych >= 'g') goto yy75;
             }
         }
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy75;
- if(yych <= 0x0A) goto yy77;
+ }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '9') {
+ if(yych <= 0x0C) {
+ if(yych == 0x09) goto yy75;
+ if(yych <= 0x0A) goto yy77;
+ goto yy75;
+ } else {
+ if(yych <= '!') {
+ if(yych <= 0x1F) goto yy77;
                 goto yy75;
             } else {
- if(yych <= '!') {
- if(yych <= 0x1F) goto yy77;
- goto yy75;
- } else {
- if(yych <= '"') goto yy80;
- if(yych <= '/') goto yy75;
- }
+ if(yych <= '"') goto yy80;
+ if(yych <= '/') goto yy75;
             }
+ }
+ } else {
+ if(yych <= 'F') {
+ if(yych == '?') goto yy78;
+ if(yych <= '@') goto yy75;
         } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy78;
- if(yych <= '@') goto yy75;
- } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy75;
- goto yy79;
- } else {
- if(yych <= '`') goto yy75;
- if(yych >= 'g') goto yy75;
- }
+ if(yych <= '\\') {
+ if(yych <= '[') goto yy75;
+ goto yy79;
+ } else {
+ if(yych <= '`') goto yy75;
+ if(yych >= 'g') goto yy75;
             }
         }
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy75;
- if(yych <= 0x0A) goto yy77;
+ }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '9') {
+ if(yych <= 0x0C) {
+ if(yych == 0x09) goto yy75;
+ if(yych <= 0x0A) goto yy77;
+ goto yy75;
+ } else {
+ if(yych <= '!') {
+ if(yych <= 0x1F) goto yy77;
                 goto yy75;
             } else {
- if(yych <= '!') {
- if(yych <= 0x1F) goto yy77;
- goto yy75;
- } else {
- if(yych <= '"') goto yy80;
- if(yych <= '/') goto yy75;
- }
+ if(yych <= '"') goto yy80;
+ if(yych <= '/') goto yy75;
             }
+ }
+ } else {
+ if(yych <= 'F') {
+ if(yych == '?') goto yy78;
+ if(yych <= '@') goto yy75;
         } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy78;
- if(yych <= '@') goto yy75;
- } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy75;
- goto yy79;
- } else {
- if(yych <= '`') goto yy75;
- if(yych >= 'g') goto yy75;
- }
+ if(yych <= '\\') {
+ if(yych <= '[') goto yy75;
+ goto yy79;
+ } else {
+ if(yych <= '`') goto yy75;
+ if(yych >= 'g') goto yy75;
             }
         }
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy75;
- if(yych <= 0x0A) goto yy77;
+ }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '9') {
+ if(yych <= 0x0C) {
+ if(yych == 0x09) goto yy75;
+ if(yych <= 0x0A) goto yy77;
+ goto yy75;
+ } else {
+ if(yych <= '!') {
+ if(yych <= 0x1F) goto yy77;
                 goto yy75;
             } else {
- if(yych <= '!') {
- if(yych <= 0x1F) goto yy77;
- goto yy75;
- } else {
- if(yych <= '"') goto yy80;
- if(yych <= '/') goto yy75;
- }
+ if(yych <= '"') goto yy80;
+ if(yych <= '/') goto yy75;
             }
+ }
+ } else {
+ if(yych <= 'F') {
+ if(yych == '?') goto yy78;
+ if(yych <= '@') goto yy75;
         } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy78;
- if(yych <= '@') goto yy75;
- } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy75;
- goto yy79;
- } else {
- if(yych <= '`') goto yy75;
- if(yych >= 'g') goto yy75;
- }
+ if(yych <= '\\') {
+ if(yych <= '[') goto yy75;
+ goto yy79;
+ } else {
+ if(yych <= '`') goto yy75;
+ if(yych >= 'g') goto yy75;
             }
         }
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy75;
- if(yych <= 0x0A) goto yy77;
+ }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '9') {
+ if(yych <= 0x0C) {
+ if(yych == 0x09) goto yy75;
+ if(yych <= 0x0A) goto yy77;
+ goto yy75;
+ } else {
+ if(yych <= '!') {
+ if(yych <= 0x1F) goto yy77;
                 goto yy75;
             } else {
- if(yych <= '!') {
- if(yych <= 0x1F) goto yy77;
- goto yy75;
- } else {
- if(yych <= '"') goto yy80;
- if(yych <= '/') goto yy75;
- }
+ if(yych <= '"') goto yy80;
+ if(yych <= '/') goto yy75;
             }
+ }
+ } else {
+ if(yych <= 'F') {
+ if(yych == '?') goto yy78;
+ if(yych <= '@') goto yy75;
         } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy78;
- if(yych <= '@') goto yy75;
- } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy75;
- goto yy79;
- } else {
- if(yych <= '`') goto yy75;
- if(yych >= 'g') goto yy75;
- }
+ if(yych <= '\\') {
+ if(yych <= '[') goto yy75;
+ goto yy79;
+ } else {
+ if(yych <= '`') goto yy75;
+ if(yych >= 'g') goto yy75;
             }
         }
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy75;
- if(yych <= 0x0A) goto yy77;
+ }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '9') {
+ if(yych <= 0x0C) {
+ if(yych == 0x09) goto yy75;
+ if(yych <= 0x0A) goto yy77;
+ goto yy75;
+ } else {
+ if(yych <= '!') {
+ if(yych <= 0x1F) goto yy77;
                 goto yy75;
             } else {
- if(yych <= '!') {
- if(yych <= 0x1F) goto yy77;
- goto yy75;
- } else {
- if(yych <= '"') goto yy80;
- if(yych <= '/') goto yy75;
- }
+ if(yych <= '"') goto yy80;
+ if(yych <= '/') goto yy75;
             }
+ }
+ } else {
+ if(yych <= 'F') {
+ if(yych == '?') goto yy78;
+ if(yych <= '@') goto yy75;
         } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy78;
- if(yych <= '@') goto yy75;
- } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy75;
- goto yy79;
- } else {
- if(yych <= '`') goto yy75;
- if(yych >= 'g') goto yy75;
- }
+ if(yych <= '\\') {
+ if(yych <= '[') goto yy75;
+ goto yy79;
+ } else {
+ if(yych <= '`') goto yy75;
+ if(yych >= 'g') goto yy75;
             }
         }
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yybm[256+yych] & 4) {
- goto yy75;
- }
- if(yych <= '!') goto yy77;
- if(yych <= '"') goto yy80;
- if(yych <= '[') goto yy78;
- goto yy79;
+ }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yybm[256+yych] & 4) {
+ goto yy75;
+ }
+ if(yych <= '!') goto yy77;
+ if(yych <= '"') goto yy80;
+ if(yych <= '[') goto yy78;
+ goto yy79;
 yy107:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy75;
- if(yych <= 0x0A) goto yy77;
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '9') {
+ if(yych <= 0x0C) {
+ if(yych == 0x09) goto yy75;
+ if(yych <= 0x0A) goto yy77;
+ goto yy75;
+ } else {
+ if(yych <= '!') {
+ if(yych <= 0x1F) goto yy77;
                 goto yy75;
             } else {
- if(yych <= '!') {
- if(yych <= 0x1F) goto yy77;
- goto yy75;
- } else {
- if(yych <= '"') goto yy80;
- if(yych <= '/') goto yy75;
- }
+ if(yych <= '"') goto yy80;
+ if(yych <= '/') goto yy75;
             }
+ }
+ } else {
+ if(yych <= 'F') {
+ if(yych == '?') goto yy78;
+ if(yych <= '@') goto yy75;
         } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy78;
- if(yych <= '@') goto yy75;
- } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy75;
- goto yy79;
- } else {
- if(yych <= '`') goto yy75;
- if(yych >= 'g') goto yy75;
- }
+ if(yych <= '\\') {
+ if(yych <= '[') goto yy75;
+ goto yy79;
+ } else {
+ if(yych <= '`') goto yy75;
+ if(yych >= 'g') goto yy75;
             }
         }
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy75;
- if(yych <= 0x0A) goto yy77;
+ }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '9') {
+ if(yych <= 0x0C) {
+ if(yych == 0x09) goto yy75;
+ if(yych <= 0x0A) goto yy77;
+ goto yy75;
+ } else {
+ if(yych <= '!') {
+ if(yych <= 0x1F) goto yy77;
                 goto yy75;
             } else {
- if(yych <= '!') {
- if(yych <= 0x1F) goto yy77;
- goto yy75;
- } else {
- if(yych <= '"') goto yy80;
- if(yych <= '/') goto yy75;
- }
+ if(yych <= '"') goto yy80;
+ if(yych <= '/') goto yy75;
             }
+ }
+ } else {
+ if(yych <= 'F') {
+ if(yych == '?') goto yy78;
+ if(yych <= '@') goto yy75;
         } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy78;
- if(yych <= '@') goto yy75;
- } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy75;
- goto yy79;
- } else {
- if(yych <= '`') goto yy75;
- if(yych >= 'g') goto yy75;
- }
+ if(yych <= '\\') {
+ if(yych <= '[') goto yy75;
+ goto yy79;
+ } else {
+ if(yych <= '`') goto yy75;
+ if(yych >= 'g') goto yy75;
             }
         }
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yybm[256+yych] & 4) {
- goto yy75;
- }
- if(yych <= '!') goto yy77;
- if(yych <= '"') goto yy80;
- if(yych <= '[') goto yy78;
- goto yy79;
+ }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yybm[256+yych] & 4) {
+ goto yy75;
+ }
+ if(yych <= '!') goto yy77;
+ if(yych <= '"') goto yy80;
+ if(yych <= '[') goto yy78;
+ goto yy79;
 yy110:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy77;
- if(yych >= ':') goto yy77;
- } else {
- if(yych <= 'F') goto yy111;
- if(yych <= '`') goto yy77;
- if(yych >= 'g') goto yy77;
- }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '@') {
+ if(yych <= '/') goto yy77;
+ if(yych >= ':') goto yy77;
+ } else {
+ if(yych <= 'F') goto yy111;
+ if(yych <= '`') goto yy77;
+ if(yych >= 'g') goto yy77;
+ }
 yy111:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy77;
- if(yych >= ':') goto yy77;
- } else {
- if(yych <= 'F') goto yy112;
- if(yych <= '`') goto yy77;
- if(yych >= 'g') goto yy77;
- }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '@') {
+ if(yych <= '/') goto yy77;
+ if(yych >= ':') goto yy77;
+ } else {
+ if(yych <= 'F') goto yy112;
+ if(yych <= '`') goto yy77;
+ if(yych >= 'g') goto yy77;
+ }
 yy112:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy77;
- if(yych >= ':') goto yy77;
- } else {
- if(yych <= 'F') goto yy113;
- if(yych <= '`') goto yy77;
- if(yych >= 'g') goto yy77;
- }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '@') {
+ if(yych <= '/') goto yy77;
+ if(yych >= ':') goto yy77;
+ } else {
+ if(yych <= 'F') goto yy113;
+ if(yych <= '`') goto yy77;
+ if(yych >= 'g') goto yy77;
+ }
 yy113:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy77;
- if(yych >= ':') goto yy77;
- } else {
- if(yych <= 'F') goto yy114;
- if(yych <= '`') goto yy77;
- if(yych >= 'g') goto yy77;
- }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '@') {
+ if(yych <= '/') goto yy77;
+ if(yych >= ':') goto yy77;
+ } else {
+ if(yych <= 'F') goto yy114;
+ if(yych <= '`') goto yy77;
+ if(yych >= 'g') goto yy77;
+ }
 yy114:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy77;
- if(yych >= ':') goto yy77;
- } else {
- if(yych <= 'F') goto yy115;
- if(yych <= '`') goto yy77;
- if(yych >= 'g') goto yy77;
- }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '@') {
+ if(yych <= '/') goto yy77;
+ if(yych >= ':') goto yy77;
+ } else {
+ if(yych <= 'F') goto yy115;
+ if(yych <= '`') goto yy77;
+ if(yych >= 'g') goto yy77;
+ }
 yy115:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy77;
- if(yych >= ':') goto yy77;
- } else {
- if(yych <= 'F') goto yy116;
- if(yych <= '`') goto yy77;
- if(yych >= 'g') goto yy77;
- }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '@') {
+ if(yych <= '/') goto yy77;
+ if(yych >= ':') goto yy77;
+ } else {
+ if(yych <= 'F') goto yy116;
+ if(yych <= '`') goto yy77;
+ if(yych >= 'g') goto yy77;
+ }
 yy116:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy77;
- if(yych <= '9') goto yy75;
- goto yy77;
- } else {
- if(yych <= 'F') goto yy75;
- if(yych <= '`') goto yy77;
- if(yych <= 'f') goto yy75;
- goto yy77;
- }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '@') {
+ if(yych <= '/') goto yy77;
+ if(yych <= '9') goto yy75;
+ goto yy77;
+ } else {
+ if(yych <= 'F') goto yy75;
+ if(yych <= '`') goto yy77;
+ if(yych <= 'f') goto yy75;
+ goto yy77;
+ }
 yy117:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy77;
- if(yych >= ':') goto yy77;
- } else {
- if(yych <= 'F') goto yy118;
- if(yych <= '`') goto yy77;
- if(yych >= 'g') goto yy77;
- }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '@') {
+ if(yych <= '/') goto yy77;
+ if(yych >= ':') goto yy77;
+ } else {
+ if(yych <= 'F') goto yy118;
+ if(yych <= '`') goto yy77;
+ if(yych >= 'g') goto yy77;
+ }
 yy118:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy77;
- if(yych >= ':') goto yy77;
- } else {
- if(yych <= 'F') goto yy119;
- if(yych <= '`') goto yy77;
- if(yych >= 'g') goto yy77;
- }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '@') {
+ if(yych <= '/') goto yy77;
+ if(yych >= ':') goto yy77;
+ } else {
+ if(yych <= 'F') goto yy119;
+ if(yych <= '`') goto yy77;
+ if(yych >= 'g') goto yy77;
+ }
 yy119:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy77;
- if(yych <= '9') goto yy75;
- goto yy77;
- } else {
- if(yych <= 'F') goto yy75;
- if(yych <= '`') goto yy77;
- if(yych <= 'f') goto yy75;
- goto yy77;
- }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '@') {
+ if(yych <= '/') goto yy77;
+ if(yych <= '9') goto yy75;
+ goto yy77;
+ } else {
+ if(yych <= 'F') goto yy75;
+ if(yych <= '`') goto yy77;
+ if(yych <= 'f') goto yy75;
+ goto yy77;
+ }
 yy120:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
 yy121:
- if(yybm[256+yych] & 64) {
- goto yy120;
- }
- if(yych <= '&') goto yy77;
- if(yych <= '\'') goto yy130;
- if(yych >= '\\') goto yy123;
+ if(yybm[256+yych] & 64) {
+ goto yy120;
+ }
+ if(yych <= '&') goto yy77;
+ if(yych <= '\'') goto yy130;
+ if(yych >= '\\') goto yy123;
 yy122:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yybm[256+yych] & 64) {
- goto yy120;
- }
- if(yych <= '&') goto yy77;
- if(yych <= '\'') goto yy130;
- if(yych <= '[') goto yy135;
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yybm[256+yych] & 64) {
+ goto yy120;
+ }
+ if(yych <= '&') goto yy77;
+ if(yych <= '\'') goto yy130;
+ if(yych <= '[') goto yy135;
 yy123:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '`') {
- if(yych <= '7') {
- if(yych <= '&') {
- if(yych == '"') goto yy120;
- goto yy77;
- } else {
- if(yych <= '\'') goto yy120;
- if(yych <= '/') goto yy77;
- goto yy128;
- }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '`') {
+ if(yych <= '7') {
+ if(yych <= '&') {
+ if(yych == '"') goto yy120;
+ goto yy77;
             } else {
- if(yych <= 'T') {
- if(yych == '?') goto yy126;
- goto yy77;
- } else {
- if(yych <= 'U') goto yy125;
- if(yych == '\\') goto yy120;
- goto yy77;
- }
+ if(yych <= '\'') goto yy120;
+ if(yych <= '/') goto yy77;
+ goto yy128;
             }
         } else {
- if(yych <= 'r') {
- if(yych <= 'f') {
- if(yych <= 'b') goto yy120;
- if(yych <= 'e') goto yy77;
- goto yy120;
- } else {
- if(yych == 'n') goto yy120;
- if(yych <= 'q') goto yy77;
- goto yy120;
- }
+ if(yych <= 'T') {
+ if(yych == '?') goto yy126;
+ goto yy77;
             } else {
- if(yych <= 'u') {
- if(yych <= 's') goto yy77;
- if(yych <= 't') goto yy120;
- } else {
- if(yych <= 'v') goto yy120;
- if(yych == 'x') goto yy127;
- goto yy77;
- }
+ if(yych <= 'U') goto yy125;
+ if(yych == '\\') goto yy120;
+ goto yy77;
             }
         }
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy77;
- if(yych <= '9') goto yy161;
- goto yy77;
+ } else {
+ if(yych <= 'r') {
+ if(yych <= 'f') {
+ if(yych <= 'b') goto yy120;
+ if(yych <= 'e') goto yy77;
+ goto yy120;
+ } else {
+ if(yych == 'n') goto yy120;
+ if(yych <= 'q') goto yy77;
+ goto yy120;
+ }
         } else {
- if(yych <= 'F') goto yy161;
- if(yych <= '`') goto yy77;
- if(yych <= 'f') goto yy161;
- goto yy77;
+ if(yych <= 'u') {
+ if(yych <= 's') goto yy77;
+ if(yych <= 't') goto yy120;
+ } else {
+ if(yych <= 'v') goto yy120;
+ if(yych == 'x') goto yy127;
+ goto yy77;
+ }
         }
+ }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '@') {
+ if(yych <= '/') goto yy77;
+ if(yych <= '9') goto yy161;
+ goto yy77;
+ } else {
+ if(yych <= 'F') goto yy161;
+ if(yych <= '`') goto yy77;
+ if(yych <= 'f') goto yy161;
+ goto yy77;
+ }
 yy125:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy77;
- if(yych <= '9') goto yy154;
- goto yy77;
- } else {
- if(yych <= 'F') goto yy154;
- if(yych <= '`') goto yy77;
- if(yych <= 'f') goto yy154;
- goto yy77;
- }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '@') {
+ if(yych <= '/') goto yy77;
+ if(yych <= '9') goto yy154;
+ goto yy77;
+ } else {
+ if(yych <= 'F') goto yy154;
+ if(yych <= '`') goto yy77;
+ if(yych <= 'f') goto yy154;
+ goto yy77;
+ }
 yy126:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yybm[256+yych] & 64) {
- goto yy120;
- }
- if(yych <= '&') goto yy77;
- if(yych <= '\'') goto yy130;
- if(yych <= '[') goto yy134;
- goto yy123;
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yybm[256+yych] & 64) {
+ goto yy120;
+ }
+ if(yych <= '&') goto yy77;
+ if(yych <= '\'') goto yy130;
+ if(yych <= '[') goto yy134;
+ goto yy123;
 yy127:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy77;
- if(yych <= '9') goto yy132;
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '@') {
+ if(yych <= '/') goto yy77;
+ if(yych <= '9') goto yy132;
+ goto yy77;
+ } else {
+ if(yych <= 'F') goto yy132;
+ if(yych <= '`') goto yy77;
+ if(yych <= 'f') goto yy132;
+ goto yy77;
+ }
+yy128:
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '\'') {
+ if(yych <= 0x0A) {
+ if(yych == 0x09) goto yy120;
             goto yy77;
         } else {
- if(yych <= 'F') goto yy132;
- if(yych <= '`') goto yy77;
- if(yych <= 'f') goto yy132;
- goto yy77;
+ if(yych <= 0x0C) goto yy120;
+ if(yych <= 0x1F) goto yy77;
+ if(yych <= '&') goto yy120;
+ goto yy130;
         }
-yy128:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '\'') {
- if(yych <= 0x0A) {
- if(yych == 0x09) goto yy120;
- goto yy77;
- } else {
- if(yych <= 0x0C) goto yy120;
- if(yych <= 0x1F) goto yy77;
- if(yych <= '&') goto yy120;
- goto yy130;
- }
+ } else {
+ if(yych <= '>') {
+ if(yych <= '/') goto yy120;
+ if(yych >= '8') goto yy120;
         } else {
- if(yych <= '>') {
- if(yych <= '/') goto yy120;
- if(yych >= '8') goto yy120;
- } else {
- if(yych <= '?') goto yy122;
- if(yych == '\\') goto yy123;
- goto yy120;
- }
- }
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yybm[256+yych] & 64) {
+ if(yych <= '?') goto yy122;
+ if(yych == '\\') goto yy123;
             goto yy120;
         }
- if(yych <= '&') goto yy77;
- if(yych <= '\'') goto yy130;
- if(yych <= '[') goto yy122;
- goto yy123;
+ }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yybm[256+yych] & 64) {
+ goto yy120;
+ }
+ if(yych <= '&') goto yy77;
+ if(yych <= '\'') goto yy130;
+ if(yych <= '[') goto yy122;
+ goto yy123;
 yy130:
- ++YYCURSOR;
+ ++YYCURSOR;
 yy131:
-#line 437 "..\\..\\idllexer\\idl.re"
- { BOOST_WAVE_RET(T_CHARLIT); }
-#line 1899 "..\\..\\idllexer\\idl_re.cpp"
+#line 437 "idl.re"
+ { BOOST_WAVE_RET(T_CHARLIT); }
+#line 1898 "idl_re.cpp"
 yy132:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy120;
- if(yych <= 0x0A) goto yy77;
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '9') {
+ if(yych <= 0x0C) {
+ if(yych == 0x09) goto yy120;
+ if(yych <= 0x0A) goto yy77;
+ goto yy120;
+ } else {
+ if(yych <= '&') {
+ if(yych <= 0x1F) goto yy77;
                 goto yy120;
             } else {
- if(yych <= '&') {
- if(yych <= 0x1F) goto yy77;
- goto yy120;
- } else {
- if(yych <= '\'') goto yy130;
- if(yych <= '/') goto yy120;
- goto yy132;
- }
+ if(yych <= '\'') goto yy130;
+ if(yych <= '/') goto yy120;
+ goto yy132;
             }
+ }
+ } else {
+ if(yych <= 'F') {
+ if(yych == '?') goto yy122;
+ if(yych <= '@') goto yy120;
+ goto yy132;
         } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy122;
- if(yych <= '@') goto yy120;
- goto yy132;
+ if(yych <= '\\') {
+ if(yych <= '[') goto yy120;
+ goto yy123;
             } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy120;
- goto yy123;
- } else {
- if(yych <= '`') goto yy120;
- if(yych <= 'f') goto yy132;
- goto yy120;
- }
+ if(yych <= '`') goto yy120;
+ if(yych <= 'f') goto yy132;
+ goto yy120;
             }
         }
+ }
 yy134:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yybm[256+yych] & 64) {
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yybm[256+yych] & 64) {
+ goto yy120;
+ }
+ if(yych <= '&') goto yy77;
+ if(yych <= '\'') goto yy130;
+ if(yych >= '\\') goto yy123;
+yy135:
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '\'') {
+ if(yych <= 0x0A) {
+ if(yych == 0x09) goto yy120;
+ goto yy77;
+ } else {
+ if(yych <= 0x0C) goto yy120;
+ if(yych <= 0x1F) goto yy77;
+ if(yych <= '&') goto yy120;
+ goto yy130;
+ }
+ } else {
+ if(yych <= '>') {
+ if(yych != '/') goto yy120;
+ } else {
+ if(yych <= '?') goto yy135;
+ if(yych == '\\') goto yy123;
             goto yy120;
         }
- if(yych <= '&') goto yy77;
- if(yych <= '\'') goto yy130;
- if(yych >= '\\') goto yy123;
-yy135:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '\'') {
- if(yych <= 0x0A) {
- if(yych == 0x09) goto yy120;
- goto yy77;
+ }
+yy137:
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '>') {
+ if(yych <= 0x1F) {
+ if(yych <= 0x09) {
+ if(yych <= 0x08) goto yy77;
+ goto yy120;
             } else {
+ if(yych <= 0x0A) goto yy77;
                 if(yych <= 0x0C) goto yy120;
- if(yych <= 0x1F) goto yy77;
- if(yych <= '&') goto yy120;
- goto yy130;
+ goto yy77;
             }
         } else {
- if(yych <= '>') {
- if(yych != '/') goto yy120;
+ if(yych <= '\'') {
+ if(yych <= '&') goto yy120;
+ goto yy141;
             } else {
- if(yych <= '?') goto yy135;
- if(yych == '\\') goto yy123;
+ if(yych <= '/') goto yy120;
+ if(yych <= '7') goto yy128;
                 goto yy120;
             }
         }
-yy137:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '>') {
- if(yych <= 0x1F) {
- if(yych <= 0x09) {
- if(yych <= 0x08) goto yy77;
- goto yy120;
- } else {
- if(yych <= 0x0A) goto yy77;
- if(yych <= 0x0C) goto yy120;
- goto yy77;
- }
+ } else {
+ if(yych <= '\\') {
+ if(yych <= 'T') {
+ if(yych <= '?') goto yy142;
+ goto yy120;
             } else {
- if(yych <= '\'') {
- if(yych <= '&') goto yy120;
- goto yy141;
- } else {
- if(yych <= '/') goto yy120;
- if(yych <= '7') goto yy128;
- goto yy120;
- }
+ if(yych <= 'U') goto yy140;
+ if(yych <= '[') goto yy120;
+ goto yy137;
             }
         } else {
- if(yych <= '\\') {
- if(yych <= 'T') {
- if(yych <= '?') goto yy142;
- goto yy120;
- } else {
- if(yych <= 'U') goto yy140;
- if(yych <= '[') goto yy120;
- goto yy137;
- }
+ if(yych <= 'u') {
+ if(yych <= 't') goto yy120;
             } else {
- if(yych <= 'u') {
- if(yych <= 't') goto yy120;
- } else {
- if(yych == 'x') goto yy132;
- goto yy120;
- }
+ if(yych == 'x') goto yy132;
+ goto yy120;
             }
         }
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy120;
- if(yych <= 0x0A) goto yy77;
+ }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '9') {
+ if(yych <= 0x0C) {
+ if(yych == 0x09) goto yy120;
+ if(yych <= 0x0A) goto yy77;
+ goto yy120;
+ } else {
+ if(yych <= '&') {
+ if(yych <= 0x1F) goto yy77;
                 goto yy120;
             } else {
- if(yych <= '&') {
- if(yych <= 0x1F) goto yy77;
- goto yy120;
- } else {
- if(yych <= '\'') goto yy130;
- if(yych <= '/') goto yy120;
- goto yy151;
- }
+ if(yych <= '\'') goto yy130;
+ if(yych <= '/') goto yy120;
+ goto yy151;
             }
+ }
+ } else {
+ if(yych <= 'F') {
+ if(yych == '?') goto yy122;
+ if(yych <= '@') goto yy120;
+ goto yy151;
         } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy122;
- if(yych <= '@') goto yy120;
- goto yy151;
+ if(yych <= '\\') {
+ if(yych <= '[') goto yy120;
+ goto yy123;
             } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy120;
- goto yy123;
- } else {
- if(yych <= '`') goto yy120;
- if(yych <= 'f') goto yy151;
- goto yy120;
- }
+ if(yych <= '`') goto yy120;
+ if(yych <= 'f') goto yy151;
+ goto yy120;
             }
         }
+ }
 yy140:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy120;
- if(yych <= 0x0A) goto yy77;
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '9') {
+ if(yych <= 0x0C) {
+ if(yych == 0x09) goto yy120;
+ if(yych <= 0x0A) goto yy77;
+ goto yy120;
+ } else {
+ if(yych <= '&') {
+ if(yych <= 0x1F) goto yy77;
                 goto yy120;
             } else {
- if(yych <= '&') {
- if(yych <= 0x1F) goto yy77;
- goto yy120;
- } else {
- if(yych <= '\'') goto yy130;
- if(yych <= '/') goto yy120;
- goto yy144;
- }
+ if(yych <= '\'') goto yy130;
+ if(yych <= '/') goto yy120;
+ goto yy144;
             }
+ }
+ } else {
+ if(yych <= 'F') {
+ if(yych == '?') goto yy122;
+ if(yych <= '@') goto yy120;
+ goto yy144;
         } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy122;
- if(yych <= '@') goto yy120;
- goto yy144;
+ if(yych <= '\\') {
+ if(yych <= '[') goto yy120;
+ goto yy123;
             } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy120;
- goto yy123;
- } else {
- if(yych <= '`') goto yy120;
- if(yych <= 'f') goto yy144;
- goto yy120;
- }
+ if(yych <= '`') goto yy120;
+ if(yych <= 'f') goto yy144;
+ goto yy120;
             }
         }
+ }
 yy141:
- yyaccept = 7;
- YYMARKER = ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yybm[256+yych] & 64) {
- goto yy120;
- }
- if(yych <= '&') goto yy131;
- if(yych <= '\'') goto yy130;
- if(yych <= '[') goto yy122;
- goto yy123;
+ yyaccept = 7;
+ YYMARKER = ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yybm[256+yych] & 64) {
+ goto yy120;
+ }
+ if(yych <= '&') goto yy131;
+ if(yych <= '\'') goto yy130;
+ if(yych <= '[') goto yy122;
+ goto yy123;
 yy142:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yybm[256+yych] & 64) {
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yybm[256+yych] & 64) {
+ goto yy120;
+ }
+ if(yych <= '&') goto yy77;
+ if(yych <= '\'') goto yy130;
+ if(yych >= '\\') goto yy123;
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '\'') {
+ if(yych <= 0x0A) {
+ if(yych == 0x09) goto yy120;
+ goto yy77;
+ } else {
+ if(yych <= 0x0C) goto yy120;
+ if(yych <= 0x1F) goto yy77;
+ if(yych <= '&') goto yy120;
+ goto yy130;
+ }
+ } else {
+ if(yych <= '>') {
+ if(yych == '/') goto yy137;
+ goto yy120;
+ } else {
+ if(yych <= '?') goto yy135;
+ if(yych == '\\') goto yy123;
             goto yy120;
         }
- if(yych <= '&') goto yy77;
- if(yych <= '\'') goto yy130;
- if(yych >= '\\') goto yy123;
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '\'') {
- if(yych <= 0x0A) {
- if(yych == 0x09) goto yy120;
- goto yy77;
- } else {
- if(yych <= 0x0C) goto yy120;
+ }
+yy144:
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '9') {
+ if(yych <= 0x0C) {
+ if(yych == 0x09) goto yy120;
+ if(yych <= 0x0A) goto yy77;
+ goto yy120;
+ } else {
+ if(yych <= '&') {
                 if(yych <= 0x1F) goto yy77;
- if(yych <= '&') goto yy120;
- goto yy130;
+ goto yy120;
+ } else {
+ if(yych <= '\'') goto yy130;
+ if(yych <= '/') goto yy120;
             }
+ }
+ } else {
+ if(yych <= 'F') {
+ if(yych == '?') goto yy122;
+ if(yych <= '@') goto yy120;
         } else {
- if(yych <= '>') {
- if(yych == '/') goto yy137;
- goto yy120;
+ if(yych <= '\\') {
+ if(yych <= '[') goto yy120;
+ goto yy123;
             } else {
- if(yych <= '?') goto yy135;
- if(yych == '\\') goto yy123;
- goto yy120;
+ if(yych <= '`') goto yy120;
+ if(yych >= 'g') goto yy120;
             }
         }
-yy144:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy120;
- if(yych <= 0x0A) goto yy77;
+ }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '9') {
+ if(yych <= 0x0C) {
+ if(yych == 0x09) goto yy120;
+ if(yych <= 0x0A) goto yy77;
+ goto yy120;
+ } else {
+ if(yych <= '&') {
+ if(yych <= 0x1F) goto yy77;
                 goto yy120;
             } else {
- if(yych <= '&') {
- if(yych <= 0x1F) goto yy77;
- goto yy120;
- } else {
- if(yych <= '\'') goto yy130;
- if(yych <= '/') goto yy120;
- }
+ if(yych <= '\'') goto yy130;
+ if(yych <= '/') goto yy120;
             }
+ }
+ } else {
+ if(yych <= 'F') {
+ if(yych == '?') goto yy122;
+ if(yych <= '@') goto yy120;
         } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy122;
- if(yych <= '@') goto yy120;
- } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy120;
- goto yy123;
- } else {
- if(yych <= '`') goto yy120;
- if(yych >= 'g') goto yy120;
- }
+ if(yych <= '\\') {
+ if(yych <= '[') goto yy120;
+ goto yy123;
+ } else {
+ if(yych <= '`') goto yy120;
+ if(yych >= 'g') goto yy120;
             }
         }
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy120;
- if(yych <= 0x0A) goto yy77;
+ }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '9') {
+ if(yych <= 0x0C) {
+ if(yych == 0x09) goto yy120;
+ if(yych <= 0x0A) goto yy77;
+ goto yy120;
+ } else {
+ if(yych <= '&') {
+ if(yych <= 0x1F) goto yy77;
                 goto yy120;
             } else {
- if(yych <= '&') {
- if(yych <= 0x1F) goto yy77;
- goto yy120;
- } else {
- if(yych <= '\'') goto yy130;
- if(yych <= '/') goto yy120;
- }
+ if(yych <= '\'') goto yy130;
+ if(yych <= '/') goto yy120;
             }
+ }
+ } else {
+ if(yych <= 'F') {
+ if(yych == '?') goto yy122;
+ if(yych <= '@') goto yy120;
         } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy122;
- if(yych <= '@') goto yy120;
- } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy120;
- goto yy123;
- } else {
- if(yych <= '`') goto yy120;
- if(yych >= 'g') goto yy120;
- }
+ if(yych <= '\\') {
+ if(yych <= '[') goto yy120;
+ goto yy123;
+ } else {
+ if(yych <= '`') goto yy120;
+ if(yych >= 'g') goto yy120;
             }
         }
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy120;
- if(yych <= 0x0A) goto yy77;
+ }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '9') {
+ if(yych <= 0x0C) {
+ if(yych == 0x09) goto yy120;
+ if(yych <= 0x0A) goto yy77;
+ goto yy120;
+ } else {
+ if(yych <= '&') {
+ if(yych <= 0x1F) goto yy77;
                 goto yy120;
             } else {
- if(yych <= '&') {
- if(yych <= 0x1F) goto yy77;
- goto yy120;
- } else {
- if(yych <= '\'') goto yy130;
- if(yych <= '/') goto yy120;
- }
+ if(yych <= '\'') goto yy130;
+ if(yych <= '/') goto yy120;
             }
+ }
+ } else {
+ if(yych <= 'F') {
+ if(yych == '?') goto yy122;
+ if(yych <= '@') goto yy120;
         } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy122;
- if(yych <= '@') goto yy120;
- } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy120;
- goto yy123;
- } else {
- if(yych <= '`') goto yy120;
- if(yych >= 'g') goto yy120;
- }
+ if(yych <= '\\') {
+ if(yych <= '[') goto yy120;
+ goto yy123;
+ } else {
+ if(yych <= '`') goto yy120;
+ if(yych >= 'g') goto yy120;
             }
         }
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy120;
- if(yych <= 0x0A) goto yy77;
+ }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '9') {
+ if(yych <= 0x0C) {
+ if(yych == 0x09) goto yy120;
+ if(yych <= 0x0A) goto yy77;
+ goto yy120;
+ } else {
+ if(yych <= '&') {
+ if(yych <= 0x1F) goto yy77;
                 goto yy120;
             } else {
- if(yych <= '&') {
- if(yych <= 0x1F) goto yy77;
- goto yy120;
- } else {
- if(yych <= '\'') goto yy130;
- if(yych <= '/') goto yy120;
- }
+ if(yych <= '\'') goto yy130;
+ if(yych <= '/') goto yy120;
             }
+ }
+ } else {
+ if(yych <= 'F') {
+ if(yych == '?') goto yy122;
+ if(yych <= '@') goto yy120;
         } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy122;
- if(yych <= '@') goto yy120;
- } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy120;
- goto yy123;
- } else {
- if(yych <= '`') goto yy120;
- if(yych >= 'g') goto yy120;
- }
+ if(yych <= '\\') {
+ if(yych <= '[') goto yy120;
+ goto yy123;
+ } else {
+ if(yych <= '`') goto yy120;
+ if(yych >= 'g') goto yy120;
             }
         }
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy120;
- if(yych <= 0x0A) goto yy77;
+ }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '9') {
+ if(yych <= 0x0C) {
+ if(yych == 0x09) goto yy120;
+ if(yych <= 0x0A) goto yy77;
+ goto yy120;
+ } else {
+ if(yych <= '&') {
+ if(yych <= 0x1F) goto yy77;
                 goto yy120;
             } else {
- if(yych <= '&') {
- if(yych <= 0x1F) goto yy77;
- goto yy120;
- } else {
- if(yych <= '\'') goto yy130;
- if(yych <= '/') goto yy120;
- }
+ if(yych <= '\'') goto yy130;
+ if(yych <= '/') goto yy120;
             }
+ }
+ } else {
+ if(yych <= 'F') {
+ if(yych == '?') goto yy122;
+ if(yych <= '@') goto yy120;
         } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy122;
- if(yych <= '@') goto yy120;
- } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy120;
- goto yy123;
- } else {
- if(yych <= '`') goto yy120;
- if(yych >= 'g') goto yy120;
- }
- }
- }
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy120;
- if(yych <= 0x0A) goto yy77;
- goto yy120;
+ if(yych <= '\\') {
+ if(yych <= '[') goto yy120;
+ goto yy123;
             } else {
- if(yych <= '&') {
- if(yych <= 0x1F) goto yy77;
- goto yy120;
- } else {
- if(yych <= '\'') goto yy130;
- if(yych <= '/') goto yy120;
- }
- }
- } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy122;
- if(yych <= '@') goto yy120;
- } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy120;
- goto yy123;
- } else {
- if(yych <= '`') goto yy120;
- if(yych >= 'g') goto yy120;
- }
+ if(yych <= '`') goto yy120;
+ if(yych >= 'g') goto yy120;
             }
         }
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yybm[256+yych] & 64) {
- goto yy120;
- }
- if(yych <= '&') goto yy77;
- if(yych <= '\'') goto yy130;
- if(yych <= '[') goto yy122;
- goto yy123;
+ }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yybm[256+yych] & 64) {
+ goto yy120;
+ }
+ if(yych <= '&') goto yy77;
+ if(yych <= '\'') goto yy130;
+ if(yych <= '[') goto yy122;
+ goto yy123;
 yy151:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy120;
- if(yych <= 0x0A) goto yy77;
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '9') {
+ if(yych <= 0x0C) {
+ if(yych == 0x09) goto yy120;
+ if(yych <= 0x0A) goto yy77;
+ goto yy120;
+ } else {
+ if(yych <= '&') {
+ if(yych <= 0x1F) goto yy77;
                 goto yy120;
             } else {
- if(yych <= '&') {
- if(yych <= 0x1F) goto yy77;
- goto yy120;
- } else {
- if(yych <= '\'') goto yy130;
- if(yych <= '/') goto yy120;
- }
+ if(yych <= '\'') goto yy130;
+ if(yych <= '/') goto yy120;
             }
+ }
+ } else {
+ if(yych <= 'F') {
+ if(yych == '?') goto yy122;
+ if(yych <= '@') goto yy120;
         } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy122;
- if(yych <= '@') goto yy120;
- } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy120;
- goto yy123;
- } else {
- if(yych <= '`') goto yy120;
- if(yych >= 'g') goto yy120;
- }
+ if(yych <= '\\') {
+ if(yych <= '[') goto yy120;
+ goto yy123;
+ } else {
+ if(yych <= '`') goto yy120;
+ if(yych >= 'g') goto yy120;
             }
         }
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy120;
- if(yych <= 0x0A) goto yy77;
+ }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '9') {
+ if(yych <= 0x0C) {
+ if(yych == 0x09) goto yy120;
+ if(yych <= 0x0A) goto yy77;
+ goto yy120;
+ } else {
+ if(yych <= '&') {
+ if(yych <= 0x1F) goto yy77;
                 goto yy120;
             } else {
- if(yych <= '&') {
- if(yych <= 0x1F) goto yy77;
- goto yy120;
- } else {
- if(yych <= '\'') goto yy130;
- if(yych <= '/') goto yy120;
- }
+ if(yych <= '\'') goto yy130;
+ if(yych <= '/') goto yy120;
             }
+ }
+ } else {
+ if(yych <= 'F') {
+ if(yych == '?') goto yy122;
+ if(yych <= '@') goto yy120;
         } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy122;
- if(yych <= '@') goto yy120;
- } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy120;
- goto yy123;
- } else {
- if(yych <= '`') goto yy120;
- if(yych >= 'g') goto yy120;
- }
+ if(yych <= '\\') {
+ if(yych <= '[') goto yy120;
+ goto yy123;
+ } else {
+ if(yych <= '`') goto yy120;
+ if(yych >= 'g') goto yy120;
             }
         }
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yybm[256+yych] & 64) {
- goto yy120;
- }
- if(yych <= '&') goto yy77;
- if(yych <= '\'') goto yy130;
- if(yych <= '[') goto yy122;
- goto yy123;
+ }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yybm[256+yych] & 64) {
+ goto yy120;
+ }
+ if(yych <= '&') goto yy77;
+ if(yych <= '\'') goto yy130;
+ if(yych <= '[') goto yy122;
+ goto yy123;
 yy154:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy77;
- if(yych >= ':') goto yy77;
- } else {
- if(yych <= 'F') goto yy155;
- if(yych <= '`') goto yy77;
- if(yych >= 'g') goto yy77;
- }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '@') {
+ if(yych <= '/') goto yy77;
+ if(yych >= ':') goto yy77;
+ } else {
+ if(yych <= 'F') goto yy155;
+ if(yych <= '`') goto yy77;
+ if(yych >= 'g') goto yy77;
+ }
 yy155:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy77;
- if(yych >= ':') goto yy77;
- } else {
- if(yych <= 'F') goto yy156;
- if(yych <= '`') goto yy77;
- if(yych >= 'g') goto yy77;
- }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '@') {
+ if(yych <= '/') goto yy77;
+ if(yych >= ':') goto yy77;
+ } else {
+ if(yych <= 'F') goto yy156;
+ if(yych <= '`') goto yy77;
+ if(yych >= 'g') goto yy77;
+ }
 yy156:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy77;
- if(yych >= ':') goto yy77;
- } else {
- if(yych <= 'F') goto yy157;
- if(yych <= '`') goto yy77;
- if(yych >= 'g') goto yy77;
- }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '@') {
+ if(yych <= '/') goto yy77;
+ if(yych >= ':') goto yy77;
+ } else {
+ if(yych <= 'F') goto yy157;
+ if(yych <= '`') goto yy77;
+ if(yych >= 'g') goto yy77;
+ }
 yy157:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy77;
- if(yych >= ':') goto yy77;
- } else {
- if(yych <= 'F') goto yy158;
- if(yych <= '`') goto yy77;
- if(yych >= 'g') goto yy77;
- }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '@') {
+ if(yych <= '/') goto yy77;
+ if(yych >= ':') goto yy77;
+ } else {
+ if(yych <= 'F') goto yy158;
+ if(yych <= '`') goto yy77;
+ if(yych >= 'g') goto yy77;
+ }
 yy158:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy77;
- if(yych >= ':') goto yy77;
- } else {
- if(yych <= 'F') goto yy159;
- if(yych <= '`') goto yy77;
- if(yych >= 'g') goto yy77;
- }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '@') {
+ if(yych <= '/') goto yy77;
+ if(yych >= ':') goto yy77;
+ } else {
+ if(yych <= 'F') goto yy159;
+ if(yych <= '`') goto yy77;
+ if(yych >= 'g') goto yy77;
+ }
 yy159:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy77;
- if(yych >= ':') goto yy77;
- } else {
- if(yych <= 'F') goto yy160;
- if(yych <= '`') goto yy77;
- if(yych >= 'g') goto yy77;
- }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '@') {
+ if(yych <= '/') goto yy77;
+ if(yych >= ':') goto yy77;
+ } else {
+ if(yych <= 'F') goto yy160;
+ if(yych <= '`') goto yy77;
+ if(yych >= 'g') goto yy77;
+ }
 yy160:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy77;
- if(yych <= '9') goto yy120;
- goto yy77;
- } else {
- if(yych <= 'F') goto yy120;
- if(yych <= '`') goto yy77;
- if(yych <= 'f') goto yy120;
- goto yy77;
- }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '@') {
+ if(yych <= '/') goto yy77;
+ if(yych <= '9') goto yy120;
+ goto yy77;
+ } else {
+ if(yych <= 'F') goto yy120;
+ if(yych <= '`') goto yy77;
+ if(yych <= 'f') goto yy120;
+ goto yy77;
+ }
 yy161:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy77;
- if(yych >= ':') goto yy77;
- } else {
- if(yych <= 'F') goto yy162;
- if(yych <= '`') goto yy77;
- if(yych >= 'g') goto yy77;
- }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '@') {
+ if(yych <= '/') goto yy77;
+ if(yych >= ':') goto yy77;
+ } else {
+ if(yych <= 'F') goto yy162;
+ if(yych <= '`') goto yy77;
+ if(yych >= 'g') goto yy77;
+ }
 yy162:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy77;
- if(yych >= ':') goto yy77;
- } else {
- if(yych <= 'F') goto yy163;
- if(yych <= '`') goto yy77;
- if(yych >= 'g') goto yy77;
- }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '@') {
+ if(yych <= '/') goto yy77;
+ if(yych >= ':') goto yy77;
+ } else {
+ if(yych <= 'F') goto yy163;
+ if(yych <= '`') goto yy77;
+ if(yych >= 'g') goto yy77;
+ }
 yy163:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy77;
- if(yych <= '9') goto yy120;
- goto yy77;
- } else {
- if(yych <= 'F') goto yy120;
- if(yych <= '`') goto yy77;
- if(yych <= 'f') goto yy120;
- goto yy77;
- }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '@') {
+ if(yych <= '/') goto yy77;
+ if(yych <= '9') goto yy120;
+ goto yy77;
+ } else {
+ if(yych <= 'F') goto yy120;
+ if(yych <= '`') goto yy77;
+ if(yych <= 'f') goto yy120;
+ goto yy77;
+ }
 yy164:
- ++YYCURSOR;
-#line 434 "..\\..\\idllexer\\idl.re"
- { BOOST_WAVE_RET(T_FIXEDPOINTLIT); }
-#line 2523 "..\\..\\idllexer\\idl_re.cpp"
+ ++YYCURSOR;
+#line 434 "idl.re"
+ { BOOST_WAVE_RET(T_FIXEDPOINTLIT); }
+#line 2522 "idl_re.cpp"
 yy166:
- yyaccept = 5;
- YYMARKER = ++YYCURSOR;
- if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
- yych = *YYCURSOR;
- if(yybm[256+yych] & 128) {
- goto yy166;
+ yyaccept = 5;
+ YYMARKER = ++YYCURSOR;
+ if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
+ yych = *YYCURSOR;
+ if(yybm[256+yych] & 128) {
+ goto yy166;
+ }
+ if(yych <= 'T') {
+ if(yych <= 'D') {
+ if(yych == '.') goto yy168;
+ if(yych <= 'C') goto yy60;
+ goto yy164;
+ } else {
+ if(yych <= 'E') goto yy171;
+ if(yych == 'L') goto yy173;
+ goto yy60;
         }
- if(yych <= 'T') {
- if(yych <= 'D') {
- if(yych == '.') goto yy168;
- if(yych <= 'C') goto yy60;
- goto yy164;
+ } else {
+ if(yych <= 'e') {
+ if(yych <= 'U') goto yy172;
+ if(yych <= 'c') goto yy60;
+ if(yych <= 'd') goto yy164;
+ goto yy171;
+ } else {
+ if(yych <= 'l') {
+ if(yych <= 'k') goto yy60;
+ goto yy173;
             } else {
- if(yych <= 'E') goto yy171;
- if(yych == 'L') goto yy173;
+ if(yych == 'u') goto yy172;
                 goto yy60;
             }
- } else {
- if(yych <= 'e') {
- if(yych <= 'U') goto yy172;
- if(yych <= 'c') goto yy60;
- if(yych <= 'd') goto yy164;
- goto yy171;
- } else {
- if(yych <= 'l') {
- if(yych <= 'k') goto yy60;
- goto yy173;
- } else {
- if(yych == 'u') goto yy172;
- goto yy60;
- }
- }
         }
+ }
 yy168:
- yyaccept = 8;
- YYMARKER = ++YYCURSOR;
- if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
- yych = *YYCURSOR;
- if(yych <= 'K') {
- if(yych <= 'C') {
- if(yych <= '/') goto yy170;
- if(yych <= '9') goto yy168;
- } else {
- if(yych <= 'D') goto yy164;
- if(yych <= 'E') goto yy181;
- if(yych <= 'F') goto yy178;
- }
+ yyaccept = 8;
+ YYMARKER = ++YYCURSOR;
+ if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
+ yych = *YYCURSOR;
+ if(yych <= 'K') {
+ if(yych <= 'C') {
+ if(yych <= '/') goto yy170;
+ if(yych <= '9') goto yy168;
         } else {
- if(yych <= 'e') {
- if(yych <= 'L') goto yy179;
- if(yych <= 'c') goto yy170;
- if(yych <= 'd') goto yy164;
- goto yy181;
- } else {
- if(yych <= 'f') goto yy178;
- if(yych == 'l') goto yy179;
- }
+ if(yych <= 'D') goto yy164;
+ if(yych <= 'E') goto yy181;
+ if(yych <= 'F') goto yy178;
         }
-yy170:
-#line 431 "..\\..\\idllexer\\idl.re"
- { BOOST_WAVE_RET(T_FLOATLIT); }
-#line 2586 "..\\..\\idllexer\\idl_re.cpp"
-yy171:
- yych = *++YYCURSOR;
- if(yych <= ',') {
- if(yych == '+') goto yy175;
- goto yy77;
+ } else {
+ if(yych <= 'e') {
+ if(yych <= 'L') goto yy179;
+ if(yych <= 'c') goto yy170;
+ if(yych <= 'd') goto yy164;
+ goto yy181;
         } else {
- if(yych <= '-') goto yy175;
- if(yych <= '/') goto yy77;
- if(yych <= '9') goto yy176;
- goto yy77;
+ if(yych <= 'f') goto yy178;
+ if(yych == 'l') goto yy179;
         }
+ }
+yy170:
+#line 431 "idl.re"
+ { BOOST_WAVE_RET(T_FLOATLIT); }
+#line 2585 "idl_re.cpp"
+yy171:
+ yych = *++YYCURSOR;
+ if(yych <= ',') {
+ if(yych == '+') goto yy175;
+ goto yy77;
+ } else {
+ if(yych <= '-') goto yy175;
+ if(yych <= '/') goto yy77;
+ if(yych <= '9') goto yy176;
+ goto yy77;
+ }
 yy172:
- yych = *++YYCURSOR;
- if(yych == 'L') goto yy174;
- if(yych == 'l') goto yy174;
- goto yy60;
+ yych = *++YYCURSOR;
+ if(yych == 'L') goto yy174;
+ if(yych == 'l') goto yy174;
+ goto yy60;
 yy173:
- yych = *++YYCURSOR;
- if(yych == 'U') goto yy174;
- if(yych != 'u') goto yy60;
+ yych = *++YYCURSOR;
+ if(yych == 'U') goto yy174;
+ if(yych != 'u') goto yy60;
 yy174:
- yych = *++YYCURSOR;
- goto yy60;
+ yych = *++YYCURSOR;
+ goto yy60;
 yy175:
- yych = *++YYCURSOR;
- if(yych <= '/') goto yy77;
- if(yych >= ':') goto yy77;
+ yych = *++YYCURSOR;
+ if(yych <= '/') goto yy77;
+ if(yych >= ':') goto yy77;
 yy176:
- ++YYCURSOR;
- if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
- yych = *YYCURSOR;
- if(yych <= 'K') {
- if(yych <= '9') {
- if(yych <= '/') goto yy170;
- goto yy176;
- } else {
- if(yych != 'F') goto yy170;
- }
+ ++YYCURSOR;
+ if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+ yych = *YYCURSOR;
+ if(yych <= 'K') {
+ if(yych <= '9') {
+ if(yych <= '/') goto yy170;
+ goto yy176;
+ } else {
+ if(yych != 'F') goto yy170;
+ }
+ } else {
+ if(yych <= 'f') {
+ if(yych <= 'L') goto yy179;
+ if(yych <= 'e') goto yy170;
         } else {
- if(yych <= 'f') {
- if(yych <= 'L') goto yy179;
- if(yych <= 'e') goto yy170;
- } else {
- if(yych == 'l') goto yy179;
- goto yy170;
- }
+ if(yych == 'l') goto yy179;
+ goto yy170;
         }
+ }
 yy178:
- yych = *++YYCURSOR;
- if(yych == 'L') goto yy180;
- if(yych == 'l') goto yy180;
- goto yy170;
+ yych = *++YYCURSOR;
+ if(yych == 'L') goto yy180;
+ if(yych == 'l') goto yy180;
+ goto yy170;
 yy179:
- yych = *++YYCURSOR;
- if(yych == 'F') goto yy180;
- if(yych != 'f') goto yy170;
+ yych = *++YYCURSOR;
+ if(yych == 'F') goto yy180;
+ if(yych != 'f') goto yy170;
 yy180:
- yych = *++YYCURSOR;
- goto yy170;
+ yych = *++YYCURSOR;
+ goto yy170;
 yy181:
- yych = *++YYCURSOR;
- if(yych <= ',') {
- if(yych != '+') goto yy77;
- } else {
- if(yych <= '-') goto yy182;
- if(yych <= '/') goto yy77;
- if(yych <= '9') goto yy183;
- goto yy77;
- }
-yy182:
- yych = *++YYCURSOR;
+ yych = *++YYCURSOR;
+ if(yych <= ',') {
+ if(yych != '+') goto yy77;
+ } else {
+ if(yych <= '-') goto yy182;
         if(yych <= '/') goto yy77;
- if(yych >= ':') goto yy77;
+ if(yych <= '9') goto yy183;
+ goto yy77;
+ }
+yy182:
+ yych = *++YYCURSOR;
+ if(yych <= '/') goto yy77;
+ if(yych >= ':') goto yy77;
 yy183:
- ++YYCURSOR;
- if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
- yych = *YYCURSOR;
- if(yych <= 'K') {
- if(yych <= '9') {
- if(yych <= '/') goto yy170;
- goto yy183;
- } else {
- if(yych == 'F') goto yy178;
- goto yy170;
- }
+ ++YYCURSOR;
+ if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+ yych = *YYCURSOR;
+ if(yych <= 'K') {
+ if(yych <= '9') {
+ if(yych <= '/') goto yy170;
+ goto yy183;
+ } else {
+ if(yych == 'F') goto yy178;
+ goto yy170;
+ }
+ } else {
+ if(yych <= 'f') {
+ if(yych <= 'L') goto yy179;
+ if(yych <= 'e') goto yy170;
+ goto yy178;
         } else {
- if(yych <= 'f') {
- if(yych <= 'L') goto yy179;
- if(yych <= 'e') goto yy170;
- goto yy178;
- } else {
- if(yych == 'l') goto yy179;
- goto yy170;
- }
+ if(yych == 'l') goto yy179;
+ goto yy170;
         }
+ }
 yy185:
- yyaccept = 5;
- YYMARKER = ++YYCURSOR;
- if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
- yych = *YYCURSOR;
- if(yybm[0+yych] & 1) {
- goto yy185;
- }
- if(yych <= 'L') {
- if(yych <= '9') {
- if(yych == '.') goto yy168;
- if(yych <= '/') goto yy60;
- } else {
- if(yych <= 'D') {
- if(yych <= 'C') goto yy60;
- goto yy164;
- } else {
- if(yych <= 'E') goto yy171;
- if(yych <= 'K') goto yy60;
- goto yy173;
- }
- }
+ yyaccept = 5;
+ YYMARKER = ++YYCURSOR;
+ if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
+ yych = *YYCURSOR;
+ if(yybm[0+yych] & 1) {
+ goto yy185;
+ }
+ if(yych <= 'L') {
+ if(yych <= '9') {
+ if(yych == '.') goto yy168;
+ if(yych <= '/') goto yy60;
         } else {
- if(yych <= 'e') {
- if(yych <= 'U') {
- if(yych <= 'T') goto yy60;
- goto yy172;
- } else {
- if(yych <= 'c') goto yy60;
- if(yych <= 'd') goto yy164;
- goto yy171;
- }
- } else {
- if(yych <= 'l') {
- if(yych <= 'k') goto yy60;
- goto yy173;
- } else {
- if(yych == 'u') goto yy172;
- goto yy60;
- }
- }
- }
-yy187:
- ++YYCURSOR;
- if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
- yych = *YYCURSOR;
- if(yych <= 'C') {
- if(yych <= '.') {
- if(yych <= '-') goto yy77;
- goto yy168;
+ if(yych <= 'D') {
+ if(yych <= 'C') goto yy60;
+ goto yy164;
             } else {
- if(yych <= '/') goto yy77;
- if(yych <= '9') goto yy187;
- goto yy77;
- }
- } else {
- if(yych <= 'c') {
- if(yych <= 'D') goto yy164;
                 if(yych <= 'E') goto yy171;
- goto yy77;
- } else {
- if(yych <= 'd') goto yy164;
- if(yych <= 'e') goto yy171;
- goto yy77;
+ if(yych <= 'K') goto yy60;
+ goto yy173;
             }
         }
-yy189:
- yych = *++YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy77;
- if(yych >= ':') goto yy77;
- } else {
- if(yych <= 'F') goto yy190;
- if(yych <= '`') goto yy77;
- if(yych >= 'g') goto yy77;
- }
-yy190:
- ++YYCURSOR;
- if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
- yych = *YYCURSOR;
- if(yych <= 'T') {
- if(yych <= '@') {
- if(yych <= '/') goto yy60;
- if(yych <= '9') goto yy190;
- goto yy60;
+ } else {
+ if(yych <= 'e') {
+ if(yych <= 'U') {
+ if(yych <= 'T') goto yy60;
+ goto yy172;
             } else {
- if(yych <= 'F') goto yy190;
- if(yych == 'L') goto yy173;
- goto yy60;
+ if(yych <= 'c') goto yy60;
+ if(yych <= 'd') goto yy164;
+ goto yy171;
             }
         } else {
- if(yych <= 'k') {
- if(yych <= 'U') goto yy172;
- if(yych <= '`') goto yy60;
- if(yych <= 'f') goto yy190;
- goto yy60;
+ if(yych <= 'l') {
+ if(yych <= 'k') goto yy60;
+ goto yy173;
             } else {
- if(yych <= 'l') goto yy173;
                 if(yych == 'u') goto yy172;
                 goto yy60;
             }
         }
-yy192:
- yych = *++YYCURSOR;
- if(yych <= '@') {
+ }
+yy187:
+ ++YYCURSOR;
+ if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
+ yych = *YYCURSOR;
+ if(yych <= 'C') {
+ if(yych <= '.') {
+ if(yych <= '-') goto yy77;
+ goto yy168;
+ } else {
             if(yych <= '/') goto yy77;
- if(yych <= '9') goto yy218;
+ if(yych <= '9') goto yy187;
+ goto yy77;
+ }
+ } else {
+ if(yych <= 'c') {
+ if(yych <= 'D') goto yy164;
+ if(yych <= 'E') goto yy171;
             goto yy77;
         } else {
- if(yych <= 'F') goto yy218;
- if(yych <= '`') goto yy77;
- if(yych <= 'f') goto yy218;
+ if(yych <= 'd') goto yy164;
+ if(yych <= 'e') goto yy171;
             goto yy77;
         }
-yy193:
- yych = *++YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy77;
- if(yych >= ':') goto yy77;
+ }
+yy189:
+ yych = *++YYCURSOR;
+ if(yych <= '@') {
+ if(yych <= '/') goto yy77;
+ if(yych >= ':') goto yy77;
+ } else {
+ if(yych <= 'F') goto yy190;
+ if(yych <= '`') goto yy77;
+ if(yych >= 'g') goto yy77;
+ }
+yy190:
+ ++YYCURSOR;
+ if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+ yych = *YYCURSOR;
+ if(yych <= 'T') {
+ if(yych <= '@') {
+ if(yych <= '/') goto yy60;
+ if(yych <= '9') goto yy190;
+ goto yy60;
         } else {
- if(yych <= 'F') goto yy194;
- if(yych <= '`') goto yy77;
- if(yych >= 'g') goto yy77;
+ if(yych <= 'F') goto yy190;
+ if(yych == 'L') goto yy173;
+ goto yy60;
         }
-yy194:
- yych = *++YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy77;
- if(yych >= ':') goto yy77;
- } else {
- if(yych <= 'F') goto yy195;
- if(yych <= '`') goto yy77;
- if(yych >= 'g') goto yy77;
+ } else {
+ if(yych <= 'k') {
+ if(yych <= 'U') goto yy172;
+ if(yych <= '`') goto yy60;
+ if(yych <= 'f') goto yy190;
+ goto yy60;
+ } else {
+ if(yych <= 'l') goto yy173;
+ if(yych == 'u') goto yy172;
+ goto yy60;
         }
+ }
+yy192:
+ yych = *++YYCURSOR;
+ if(yych <= '@') {
+ if(yych <= '/') goto yy77;
+ if(yych <= '9') goto yy218;
+ goto yy77;
+ } else {
+ if(yych <= 'F') goto yy218;
+ if(yych <= '`') goto yy77;
+ if(yych <= 'f') goto yy218;
+ goto yy77;
+ }
+yy193:
+ yych = *++YYCURSOR;
+ if(yych <= '@') {
+ if(yych <= '/') goto yy77;
+ if(yych >= ':') goto yy77;
+ } else {
+ if(yych <= 'F') goto yy194;
+ if(yych <= '`') goto yy77;
+ if(yych >= 'g') goto yy77;
+ }
+yy194:
+ yych = *++YYCURSOR;
+ if(yych <= '@') {
+ if(yych <= '/') goto yy77;
+ if(yych >= ':') goto yy77;
+ } else {
+ if(yych <= 'F') goto yy195;
+ if(yych <= '`') goto yy77;
+ if(yych >= 'g') goto yy77;
+ }
 yy195:
- yych = *++YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy77;
- if(yych >= ':') goto yy77;
- } else {
- if(yych <= 'F') goto yy196;
- if(yych <= '`') goto yy77;
- if(yych >= 'g') goto yy77;
- }
+ yych = *++YYCURSOR;
+ if(yych <= '@') {
+ if(yych <= '/') goto yy77;
+ if(yych >= ':') goto yy77;
+ } else {
+ if(yych <= 'F') goto yy196;
+ if(yych <= '`') goto yy77;
+ if(yych >= 'g') goto yy77;
+ }
 yy196:
- yych = *++YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy77;
- if(yych >= ':') goto yy77;
- } else {
- if(yych <= 'F') goto yy197;
- if(yych <= '`') goto yy77;
- if(yych >= 'g') goto yy77;
- }
+ yych = *++YYCURSOR;
+ if(yych <= '@') {
+ if(yych <= '/') goto yy77;
+ if(yych >= ':') goto yy77;
+ } else {
+ if(yych <= 'F') goto yy197;
+ if(yych <= '`') goto yy77;
+ if(yych >= 'g') goto yy77;
+ }
 yy197:
- yych = *++YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy77;
- if(yych >= ':') goto yy77;
- } else {
- if(yych <= 'F') goto yy198;
- if(yych <= '`') goto yy77;
- if(yych >= 'g') goto yy77;
- }
+ yych = *++YYCURSOR;
+ if(yych <= '@') {
+ if(yych <= '/') goto yy77;
+ if(yych >= ':') goto yy77;
+ } else {
+ if(yych <= 'F') goto yy198;
+ if(yych <= '`') goto yy77;
+ if(yych >= 'g') goto yy77;
+ }
 yy198:
- yych = *++YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy77;
- if(yych >= ':') goto yy77;
- } else {
- if(yych <= 'F') goto yy199;
- if(yych <= '`') goto yy77;
- if(yych >= 'g') goto yy77;
- }
+ yych = *++YYCURSOR;
+ if(yych <= '@') {
+ if(yych <= '/') goto yy77;
+ if(yych >= ':') goto yy77;
+ } else {
+ if(yych <= 'F') goto yy199;
+ if(yych <= '`') goto yy77;
+ if(yych >= 'g') goto yy77;
+ }
 yy199:
- yych = *++YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy77;
- if(yych >= ':') goto yy77;
- } else {
- if(yych <= 'F') goto yy200;
- if(yych <= '`') goto yy77;
- if(yych >= 'g') goto yy77;
- }
+ yych = *++YYCURSOR;
+ if(yych <= '@') {
+ if(yych <= '/') goto yy77;
+ if(yych >= ':') goto yy77;
+ } else {
+ if(yych <= 'F') goto yy200;
+ if(yych <= '`') goto yy77;
+ if(yych >= 'g') goto yy77;
+ }
 yy200:
- yych = *++YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy77;
- if(yych >= ':') goto yy77;
- } else {
- if(yych <= 'F') goto yy201;
- if(yych <= '`') goto yy77;
- if(yych >= 'g') goto yy77;
- }
+ yych = *++YYCURSOR;
+ if(yych <= '@') {
+ if(yych <= '/') goto yy77;
+ if(yych >= ':') goto yy77;
+ } else {
+ if(yych <= 'F') goto yy201;
+ if(yych <= '`') goto yy77;
+ if(yych >= 'g') goto yy77;
+ }
 yy201:
- yyaccept = 0;
- YYMARKER = ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
+ yyaccept = 0;
+ YYMARKER = ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
 yy202:
- if(yybm[0+yych] & 2) {
- goto yy201;
- }
- if(yych == '?') goto yy204;
- if(yych != '\\') goto yy5;
+ if(yybm[0+yych] & 2) {
+ goto yy201;
+ }
+ if(yych == '?') goto yy204;
+ if(yych != '\\') goto yy5;
 yy203:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych == 'U') goto yy207;
- if(yych == 'u') goto yy206;
- goto yy77;
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych == 'U') goto yy207;
+ if(yych == 'u') goto yy206;
+ goto yy77;
 yy204:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych != '?') goto yy77;
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych == '/') goto yy203;
- goto yy77;
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych != '?') goto yy77;
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych == '/') goto yy203;
+ goto yy77;
 yy206:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy77;
- if(yych <= '9') goto yy215;
- goto yy77;
- } else {
- if(yych <= 'F') goto yy215;
- if(yych <= '`') goto yy77;
- if(yych <= 'f') goto yy215;
- goto yy77;
- }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '@') {
+ if(yych <= '/') goto yy77;
+ if(yych <= '9') goto yy215;
+ goto yy77;
+ } else {
+ if(yych <= 'F') goto yy215;
+ if(yych <= '`') goto yy77;
+ if(yych <= 'f') goto yy215;
+ goto yy77;
+ }
 yy207:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy77;
- if(yych >= ':') goto yy77;
- } else {
- if(yych <= 'F') goto yy208;
- if(yych <= '`') goto yy77;
- if(yych >= 'g') goto yy77;
- }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '@') {
+ if(yych <= '/') goto yy77;
+ if(yych >= ':') goto yy77;
+ } else {
+ if(yych <= 'F') goto yy208;
+ if(yych <= '`') goto yy77;
+ if(yych >= 'g') goto yy77;
+ }
 yy208:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy77;
- if(yych >= ':') goto yy77;
- } else {
- if(yych <= 'F') goto yy209;
- if(yych <= '`') goto yy77;
- if(yych >= 'g') goto yy77;
- }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '@') {
+ if(yych <= '/') goto yy77;
+ if(yych >= ':') goto yy77;
+ } else {
+ if(yych <= 'F') goto yy209;
+ if(yych <= '`') goto yy77;
+ if(yych >= 'g') goto yy77;
+ }
 yy209:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy77;
- if(yych >= ':') goto yy77;
- } else {
- if(yych <= 'F') goto yy210;
- if(yych <= '`') goto yy77;
- if(yych >= 'g') goto yy77;
- }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '@') {
+ if(yych <= '/') goto yy77;
+ if(yych >= ':') goto yy77;
+ } else {
+ if(yych <= 'F') goto yy210;
+ if(yych <= '`') goto yy77;
+ if(yych >= 'g') goto yy77;
+ }
 yy210:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy77;
- if(yych >= ':') goto yy77;
- } else {
- if(yych <= 'F') goto yy211;
- if(yych <= '`') goto yy77;
- if(yych >= 'g') goto yy77;
- }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '@') {
+ if(yych <= '/') goto yy77;
+ if(yych >= ':') goto yy77;
+ } else {
+ if(yych <= 'F') goto yy211;
+ if(yych <= '`') goto yy77;
+ if(yych >= 'g') goto yy77;
+ }
 yy211:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy77;
- if(yych >= ':') goto yy77;
- } else {
- if(yych <= 'F') goto yy212;
- if(yych <= '`') goto yy77;
- if(yych >= 'g') goto yy77;
- }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '@') {
+ if(yych <= '/') goto yy77;
+ if(yych >= ':') goto yy77;
+ } else {
+ if(yych <= 'F') goto yy212;
+ if(yych <= '`') goto yy77;
+ if(yych >= 'g') goto yy77;
+ }
 yy212:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy77;
- if(yych >= ':') goto yy77;
- } else {
- if(yych <= 'F') goto yy213;
- if(yych <= '`') goto yy77;
- if(yych >= 'g') goto yy77;
- }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '@') {
+ if(yych <= '/') goto yy77;
+ if(yych >= ':') goto yy77;
+ } else {
+ if(yych <= 'F') goto yy213;
+ if(yych <= '`') goto yy77;
+ if(yych >= 'g') goto yy77;
+ }
 yy213:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy77;
- if(yych >= ':') goto yy77;
- } else {
- if(yych <= 'F') goto yy214;
- if(yych <= '`') goto yy77;
- if(yych >= 'g') goto yy77;
- }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '@') {
+ if(yych <= '/') goto yy77;
+ if(yych >= ':') goto yy77;
+ } else {
+ if(yych <= 'F') goto yy214;
+ if(yych <= '`') goto yy77;
+ if(yych >= 'g') goto yy77;
+ }
 yy214:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy77;
- if(yych <= '9') goto yy201;
- goto yy77;
- } else {
- if(yych <= 'F') goto yy201;
- if(yych <= '`') goto yy77;
- if(yych <= 'f') goto yy201;
- goto yy77;
- }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '@') {
+ if(yych <= '/') goto yy77;
+ if(yych <= '9') goto yy201;
+ goto yy77;
+ } else {
+ if(yych <= 'F') goto yy201;
+ if(yych <= '`') goto yy77;
+ if(yych <= 'f') goto yy201;
+ goto yy77;
+ }
 yy215:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy77;
- if(yych >= ':') goto yy77;
- } else {
- if(yych <= 'F') goto yy216;
- if(yych <= '`') goto yy77;
- if(yych >= 'g') goto yy77;
- }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '@') {
+ if(yych <= '/') goto yy77;
+ if(yych >= ':') goto yy77;
+ } else {
+ if(yych <= 'F') goto yy216;
+ if(yych <= '`') goto yy77;
+ if(yych >= 'g') goto yy77;
+ }
 yy216:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy77;
- if(yych >= ':') goto yy77;
- } else {
- if(yych <= 'F') goto yy217;
- if(yych <= '`') goto yy77;
- if(yych >= 'g') goto yy77;
- }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '@') {
+ if(yych <= '/') goto yy77;
+ if(yych >= ':') goto yy77;
+ } else {
+ if(yych <= 'F') goto yy217;
+ if(yych <= '`') goto yy77;
+ if(yych >= 'g') goto yy77;
+ }
 yy217:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy77;
- if(yych <= '9') goto yy201;
- goto yy77;
- } else {
- if(yych <= 'F') goto yy201;
- if(yych <= '`') goto yy77;
- if(yych <= 'f') goto yy201;
- goto yy77;
- }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '@') {
+ if(yych <= '/') goto yy77;
+ if(yych <= '9') goto yy201;
+ goto yy77;
+ } else {
+ if(yych <= 'F') goto yy201;
+ if(yych <= '`') goto yy77;
+ if(yych <= 'f') goto yy201;
+ goto yy77;
+ }
 yy218:
- yych = *++YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy77;
- if(yych >= ':') goto yy77;
- } else {
- if(yych <= 'F') goto yy219;
- if(yych <= '`') goto yy77;
- if(yych >= 'g') goto yy77;
- }
+ yych = *++YYCURSOR;
+ if(yych <= '@') {
+ if(yych <= '/') goto yy77;
+ if(yych >= ':') goto yy77;
+ } else {
+ if(yych <= 'F') goto yy219;
+ if(yych <= '`') goto yy77;
+ if(yych >= 'g') goto yy77;
+ }
 yy219:
- yych = *++YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy77;
- if(yych >= ':') goto yy77;
- } else {
- if(yych <= 'F') goto yy220;
- if(yych <= '`') goto yy77;
- if(yych >= 'g') goto yy77;
- }
+ yych = *++YYCURSOR;
+ if(yych <= '@') {
+ if(yych <= '/') goto yy77;
+ if(yych >= ':') goto yy77;
+ } else {
+ if(yych <= 'F') goto yy220;
+ if(yych <= '`') goto yy77;
+ if(yych >= 'g') goto yy77;
+ }
 yy220:
- yych = *++YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy77;
- if(yych <= '9') goto yy201;
- goto yy77;
- } else {
- if(yych <= 'F') goto yy201;
- if(yych <= '`') goto yy77;
- if(yych <= 'f') goto yy201;
- goto yy77;
- }
+ yych = *++YYCURSOR;
+ if(yych <= '@') {
+ if(yych <= '/') goto yy77;
+ if(yych <= '9') goto yy201;
+ goto yy77;
+ } else {
+ if(yych <= 'F') goto yy201;
+ if(yych <= '`') goto yy77;
+ if(yych <= 'f') goto yy201;
+ goto yy77;
+ }
 yy221:
- yych = *++YYCURSOR;
- if(yych == '\'') goto yy77;
- goto yy121;
+ yych = *++YYCURSOR;
+ if(yych == '\'') goto yy77;
+ goto yy121;
 yy222:
- ++YYCURSOR;
-#line 417 "..\\..\\idllexer\\idl.re"
- { BOOST_WAVE_RET(T_GREATEREQUAL); }
-#line 3094 "..\\..\\idllexer\\idl_re.cpp"
+ ++YYCURSOR;
+#line 417 "idl.re"
+ { BOOST_WAVE_RET(T_GREATEREQUAL); }
+#line 3093 "idl_re.cpp"
 yy224:
- ++YYCURSOR;
-#line 413 "..\\..\\idllexer\\idl.re"
- { BOOST_WAVE_RET(T_SHIFTRIGHT); }
-#line 3099 "..\\..\\idllexer\\idl_re.cpp"
+ ++YYCURSOR;
+#line 413 "idl.re"
+ { BOOST_WAVE_RET(T_SHIFTRIGHT); }
+#line 3098 "idl_re.cpp"
 yy226:
- ++YYCURSOR;
-#line 416 "..\\..\\idllexer\\idl.re"
- { BOOST_WAVE_RET(T_LESSEQUAL); }
-#line 3104 "..\\..\\idllexer\\idl_re.cpp"
+ ++YYCURSOR;
+#line 416 "idl.re"
+ { BOOST_WAVE_RET(T_LESSEQUAL); }
+#line 3103 "idl_re.cpp"
 yy228:
- ++YYCURSOR;
-#line 412 "..\\..\\idllexer\\idl.re"
- { BOOST_WAVE_RET(T_SHIFTLEFT); }
-#line 3109 "..\\..\\idllexer\\idl_re.cpp"
+ ++YYCURSOR;
+#line 412 "idl.re"
+ { BOOST_WAVE_RET(T_SHIFTLEFT); }
+#line 3108 "idl_re.cpp"
 yy230:
- ++YYCURSOR;
-#line 414 "..\\..\\idllexer\\idl.re"
- { BOOST_WAVE_RET(T_EQUAL); }
-#line 3114 "..\\..\\idllexer\\idl_re.cpp"
+ ++YYCURSOR;
+#line 414 "idl.re"
+ { BOOST_WAVE_RET(T_EQUAL); }
+#line 3113 "idl_re.cpp"
 yy232:
- ++YYCURSOR;
-#line 415 "..\\..\\idllexer\\idl.re"
- { BOOST_WAVE_RET(T_NOTEQUAL); }
-#line 3119 "..\\..\\idllexer\\idl_re.cpp"
+ ++YYCURSOR;
+#line 415 "idl.re"
+ { BOOST_WAVE_RET(T_NOTEQUAL); }
+#line 3118 "idl_re.cpp"
 yy234:
- ++YYCURSOR;
-#line 419 "..\\..\\idllexer\\idl.re"
- { BOOST_WAVE_RET(T_OROR); }
-#line 3124 "..\\..\\idllexer\\idl_re.cpp"
+ ++YYCURSOR;
+#line 419 "idl.re"
+ { BOOST_WAVE_RET(T_OROR); }
+#line 3123 "idl_re.cpp"
 yy236:
- ++YYCURSOR;
-#line 418 "..\\..\\idllexer\\idl.re"
- { BOOST_WAVE_RET(T_ANDAND); }
-#line 3129 "..\\..\\idllexer\\idl_re.cpp"
+ ++YYCURSOR;
+#line 418 "idl.re"
+ { BOOST_WAVE_RET(T_ANDAND); }
+#line 3128 "idl_re.cpp"
 yy238:
- ++YYCURSOR;
- if((YYLIMIT - YYCURSOR) < 7) YYFILL(7);
- yych = *YYCURSOR;
+ ++YYCURSOR;
+ if((YYLIMIT - YYCURSOR) < 7) YYFILL(7);
+ yych = *YYCURSOR;
 yy239:
- if(yybm[0+yych] & 4) {
- goto yy238;
- }
- if(yych <= 'k') {
- if(yych <= 'd') {
- if(yych == '/') goto yy240;
- if(yych <= 'c') goto yy77;
- goto yy243;
- } else {
- if(yych <= 'e') goto yy242;
- if(yych == 'i') goto yy241;
- goto yy77;
- }
+ if(yybm[0+yych] & 4) {
+ goto yy238;
+ }
+ if(yych <= 'k') {
+ if(yych <= 'd') {
+ if(yych == '/') goto yy240;
+ if(yych <= 'c') goto yy77;
+ goto yy243;
         } else {
- if(yych <= 't') {
- if(yych <= 'l') goto yy245;
- if(yych == 'p') goto yy246;
- goto yy77;
- } else {
- if(yych <= 'u') goto yy244;
- if(yych == 'w') goto yy247;
- goto yy77;
- }
+ if(yych <= 'e') goto yy242;
+ if(yych == 'i') goto yy241;
+ goto yy77;
         }
-yy240:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych == '*') goto yy330;
- goto yy77;
-yy241:
- yych = *++YYCURSOR;
- if(yych == 'f') goto yy293;
- if(yych == 'n') goto yy295;
- goto yy77;
-yy242:
- yych = *++YYCURSOR;
- if(yych <= 'm') {
- if(yych == 'l') goto yy278;
+ } else {
+ if(yych <= 't') {
+ if(yych <= 'l') goto yy245;
+ if(yych == 'p') goto yy246;
             goto yy77;
         } else {
- if(yych <= 'n') goto yy277;
- if(yych == 'r') goto yy276;
+ if(yych <= 'u') goto yy244;
+ if(yych == 'w') goto yy247;
             goto yy77;
         }
-yy243:
- yych = *++YYCURSOR;
- if(yych == 'e') goto yy270;
+ }
+yy240:
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych == '*') goto yy330;
+ goto yy77;
+yy241:
+ yych = *++YYCURSOR;
+ if(yych == 'f') goto yy293;
+ if(yych == 'n') goto yy295;
+ goto yy77;
+yy242:
+ yych = *++YYCURSOR;
+ if(yych <= 'm') {
+ if(yych == 'l') goto yy278;
         goto yy77;
-yy244:
- yych = *++YYCURSOR;
- if(yych == 'n') goto yy265;
+ } else {
+ if(yych <= 'n') goto yy277;
+ if(yych == 'r') goto yy276;
         goto yy77;
+ }
+yy243:
+ yych = *++YYCURSOR;
+ if(yych == 'e') goto yy270;
+ goto yy77;
+yy244:
+ yych = *++YYCURSOR;
+ if(yych == 'n') goto yy265;
+ goto yy77;
 yy245:
- yych = *++YYCURSOR;
- if(yych == 'i') goto yy261;
- goto yy77;
+ yych = *++YYCURSOR;
+ if(yych == 'i') goto yy261;
+ goto yy77;
 yy246:
- yych = *++YYCURSOR;
- if(yych == 'r') goto yy255;
- goto yy77;
+ yych = *++YYCURSOR;
+ if(yych == 'r') goto yy255;
+ goto yy77;
 yy247:
- yych = *++YYCURSOR;
- if(yych != 'a') goto yy77;
- yych = *++YYCURSOR;
- if(yych != 'r') goto yy77;
- yych = *++YYCURSOR;
- if(yych != 'n') goto yy77;
- yych = *++YYCURSOR;
- if(yych != 'i') goto yy77;
- yych = *++YYCURSOR;
- if(yych != 'n') goto yy77;
- yych = *++YYCURSOR;
- if(yych != 'g') goto yy77;
- ++YYCURSOR;
-#line 464 "..\\..\\idllexer\\idl.re"
- { BOOST_WAVE_RET(T_PP_WARNING); }
-#line 3212 "..\\..\\idllexer\\idl_re.cpp"
+ yych = *++YYCURSOR;
+ if(yych != 'a') goto yy77;
+ yych = *++YYCURSOR;
+ if(yych != 'r') goto yy77;
+ yych = *++YYCURSOR;
+ if(yych != 'n') goto yy77;
+ yych = *++YYCURSOR;
+ if(yych != 'i') goto yy77;
+ yych = *++YYCURSOR;
+ if(yych != 'n') goto yy77;
+ yych = *++YYCURSOR;
+ if(yych != 'g') goto yy77;
+ ++YYCURSOR;
+#line 464 "idl.re"
+ { BOOST_WAVE_RET(T_PP_WARNING); }
+#line 3211 "idl_re.cpp"
 yy255:
- yych = *++YYCURSOR;
- if(yych != 'a') goto yy77;
- yych = *++YYCURSOR;
- if(yych != 'g') goto yy77;
- yych = *++YYCURSOR;
- if(yych != 'm') goto yy77;
- yych = *++YYCURSOR;
- if(yych != 'a') goto yy77;
- ++YYCURSOR;
-#line 462 "..\\..\\idllexer\\idl.re"
- { BOOST_WAVE_RET(T_PP_PRAGMA); }
-#line 3225 "..\\..\\idllexer\\idl_re.cpp"
+ yych = *++YYCURSOR;
+ if(yych != 'a') goto yy77;
+ yych = *++YYCURSOR;
+ if(yych != 'g') goto yy77;
+ yych = *++YYCURSOR;
+ if(yych != 'm') goto yy77;
+ yych = *++YYCURSOR;
+ if(yych != 'a') goto yy77;
+ ++YYCURSOR;
+#line 462 "idl.re"
+ { BOOST_WAVE_RET(T_PP_PRAGMA); }
+#line 3224 "idl_re.cpp"
 yy261:
- yych = *++YYCURSOR;
- if(yych != 'n') goto yy77;
- yych = *++YYCURSOR;
- if(yych != 'e') goto yy77;
- ++YYCURSOR;
-#line 460 "..\\..\\idllexer\\idl.re"
- { BOOST_WAVE_RET(T_PP_LINE); }
-#line 3234 "..\\..\\idllexer\\idl_re.cpp"
+ yych = *++YYCURSOR;
+ if(yych != 'n') goto yy77;
+ yych = *++YYCURSOR;
+ if(yych != 'e') goto yy77;
+ ++YYCURSOR;
+#line 460 "idl.re"
+ { BOOST_WAVE_RET(T_PP_LINE); }
+#line 3233 "idl_re.cpp"
 yy265:
- yych = *++YYCURSOR;
- if(yych != 'd') goto yy77;
- yych = *++YYCURSOR;
- if(yych != 'e') goto yy77;
- yych = *++YYCURSOR;
- if(yych != 'f') goto yy77;
- ++YYCURSOR;
-#line 459 "..\\..\\idllexer\\idl.re"
- { BOOST_WAVE_RET(T_PP_UNDEF); }
-#line 3245 "..\\..\\idllexer\\idl_re.cpp"
+ yych = *++YYCURSOR;
+ if(yych != 'd') goto yy77;
+ yych = *++YYCURSOR;
+ if(yych != 'e') goto yy77;
+ yych = *++YYCURSOR;
+ if(yych != 'f') goto yy77;
+ ++YYCURSOR;
+#line 459 "idl.re"
+ { BOOST_WAVE_RET(T_PP_UNDEF); }
+#line 3244 "idl_re.cpp"
 yy270:
- yych = *++YYCURSOR;
- if(yych != 'f') goto yy77;
- yych = *++YYCURSOR;
- if(yych != 'i') goto yy77;
- yych = *++YYCURSOR;
- if(yych != 'n') goto yy77;
- yych = *++YYCURSOR;
- if(yych != 'e') goto yy77;
- ++YYCURSOR;
-#line 458 "..\\..\\idllexer\\idl.re"
- { BOOST_WAVE_RET(T_PP_DEFINE); }
-#line 3258 "..\\..\\idllexer\\idl_re.cpp"
+ yych = *++YYCURSOR;
+ if(yych != 'f') goto yy77;
+ yych = *++YYCURSOR;
+ if(yych != 'i') goto yy77;
+ yych = *++YYCURSOR;
+ if(yych != 'n') goto yy77;
+ yych = *++YYCURSOR;
+ if(yych != 'e') goto yy77;
+ ++YYCURSOR;
+#line 458 "idl.re"
+ { BOOST_WAVE_RET(T_PP_DEFINE); }
+#line 3257 "idl_re.cpp"
 yy276:
- yych = *++YYCURSOR;
- if(yych == 'r') goto yy289;
- goto yy77;
+ yych = *++YYCURSOR;
+ if(yych == 'r') goto yy289;
+ goto yy77;
 yy277:
- yych = *++YYCURSOR;
- if(yych == 'd') goto yy285;
- goto yy77;
+ yych = *++YYCURSOR;
+ if(yych == 'd') goto yy285;
+ goto yy77;
 yy278:
- yych = *++YYCURSOR;
- if(yych == 'i') goto yy280;
- if(yych != 's') goto yy77;
- yych = *++YYCURSOR;
- if(yych == 'e') goto yy283;
- goto yy77;
+ yych = *++YYCURSOR;
+ if(yych == 'i') goto yy280;
+ if(yych != 's') goto yy77;
+ yych = *++YYCURSOR;
+ if(yych == 'e') goto yy283;
+ goto yy77;
 yy280:
- yych = *++YYCURSOR;
- if(yych != 'f') goto yy77;
- ++YYCURSOR;
-#line 456 "..\\..\\idllexer\\idl.re"
- { BOOST_WAVE_RET(T_PP_ELIF); }
-#line 3280 "..\\..\\idllexer\\idl_re.cpp"
+ yych = *++YYCURSOR;
+ if(yych != 'f') goto yy77;
+ ++YYCURSOR;
+#line 456 "idl.re"
+ { BOOST_WAVE_RET(T_PP_ELIF); }
+#line 3279 "idl_re.cpp"
 yy283:
- ++YYCURSOR;
-#line 455 "..\\..\\idllexer\\idl.re"
- { BOOST_WAVE_RET(T_PP_ELSE); }
-#line 3285 "..\\..\\idllexer\\idl_re.cpp"
+ ++YYCURSOR;
+#line 455 "idl.re"
+ { BOOST_WAVE_RET(T_PP_ELSE); }
+#line 3284 "idl_re.cpp"
 yy285:
- yych = *++YYCURSOR;
- if(yych != 'i') goto yy77;
- yych = *++YYCURSOR;
- if(yych != 'f') goto yy77;
- ++YYCURSOR;
-#line 457 "..\\..\\idllexer\\idl.re"
- { BOOST_WAVE_RET(T_PP_ENDIF); }
-#line 3294 "..\\..\\idllexer\\idl_re.cpp"
+ yych = *++YYCURSOR;
+ if(yych != 'i') goto yy77;
+ yych = *++YYCURSOR;
+ if(yych != 'f') goto yy77;
+ ++YYCURSOR;
+#line 457 "idl.re"
+ { BOOST_WAVE_RET(T_PP_ENDIF); }
+#line 3293 "idl_re.cpp"
 yy289:
- yych = *++YYCURSOR;
- if(yych != 'o') goto yy77;
- yych = *++YYCURSOR;
- if(yych != 'r') goto yy77;
- ++YYCURSOR;
-#line 461 "..\\..\\idllexer\\idl.re"
- { BOOST_WAVE_RET(T_PP_ERROR); }
-#line 3303 "..\\..\\idllexer\\idl_re.cpp"
+ yych = *++YYCURSOR;
+ if(yych != 'o') goto yy77;
+ yych = *++YYCURSOR;
+ if(yych != 'r') goto yy77;
+ ++YYCURSOR;
+#line 461 "idl.re"
+ { BOOST_WAVE_RET(T_PP_ERROR); }
+#line 3302 "idl_re.cpp"
 yy293:
- yyaccept = 9;
- yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'd') goto yy321;
- if(yych == 'n') goto yy322;
+ yyaccept = 9;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if(yych == 'd') goto yy321;
+ if(yych == 'n') goto yy322;
 yy294:
-#line 452 "..\\..\\idllexer\\idl.re"
- { BOOST_WAVE_RET(T_PP_IF); }
-#line 3312 "..\\..\\idllexer\\idl_re.cpp"
+#line 452 "idl.re"
+ { BOOST_WAVE_RET(T_PP_IF); }
+#line 3311 "idl_re.cpp"
 yy295:
- yych = *++YYCURSOR;
- if(yych != 'c') goto yy77;
- yych = *++YYCURSOR;
- if(yych != 'l') goto yy77;
- yych = *++YYCURSOR;
- if(yych != 'u') goto yy77;
- yych = *++YYCURSOR;
- if(yych != 'd') goto yy77;
- yych = *++YYCURSOR;
- if(yych != 'e') goto yy77;
+ yych = *++YYCURSOR;
+ if(yych != 'c') goto yy77;
+ yych = *++YYCURSOR;
+ if(yych != 'l') goto yy77;
+ yych = *++YYCURSOR;
+ if(yych != 'u') goto yy77;
+ yych = *++YYCURSOR;
+ if(yych != 'd') goto yy77;
+ yych = *++YYCURSOR;
+ if(yych != 'e') goto yy77;
 yy300:
- yyaccept = 10;
- YYMARKER = ++YYCURSOR;
- if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
- yych = *YYCURSOR;
- if(yych <= '!') {
- if(yych <= 0x09) {
- if(yych >= 0x09) goto yy300;
- } else {
- if(yych == ' ') goto yy300;
- }
+ yyaccept = 10;
+ YYMARKER = ++YYCURSOR;
+ if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+ yych = *YYCURSOR;
+ if(yych <= '!') {
+ if(yych <= 0x09) {
+ if(yych >= 0x09) goto yy300;
+ } else {
+ if(yych == ' ') goto yy300;
+ }
+ } else {
+ if(yych <= '/') {
+ if(yych <= '"') goto yy304;
+ if(yych >= '/') goto yy303;
         } else {
- if(yych <= '/') {
- if(yych <= '"') goto yy304;
- if(yych >= '/') goto yy303;
- } else {
- if(yych == '<') goto yy305;
- }
+ if(yych == '<') goto yy305;
         }
+ }
 yy302:
-#line 450 "..\\..\\idllexer\\idl.re"
- { BOOST_WAVE_RET(T_PP_INCLUDE); }
-#line 3346 "..\\..\\idllexer\\idl_re.cpp"
+#line 450 "idl.re"
+ { BOOST_WAVE_RET(T_PP_INCLUDE); }
+#line 3345 "idl_re.cpp"
 yy303:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych == '*') goto yy314;
- goto yy77;
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych == '*') goto yy314;
+ goto yy77;
 yy304:
- yych = *++YYCURSOR;
- if(yych == '"') goto yy77;
- goto yy311;
+ yych = *++YYCURSOR;
+ if(yych == '"') goto yy77;
+ goto yy311;
 yy305:
- yych = *++YYCURSOR;
- if(yych == '>') goto yy77;
- goto yy307;
+ yych = *++YYCURSOR;
+ if(yych == '>') goto yy77;
+ goto yy307;
 yy306:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
 yy307:
- if(yybm[0+yych] & 8) {
- goto yy306;
- }
- if(yych <= '=') goto yy77;
- ++YYCURSOR;
-#line 444 "..\\..\\idllexer\\idl.re"
- { BOOST_WAVE_RET(T_PP_HHEADER); }
-#line 3373 "..\\..\\idllexer\\idl_re.cpp"
+ if(yybm[0+yych] & 8) {
+ goto yy306;
+ }
+ if(yych <= '=') goto yy77;
+ ++YYCURSOR;
+#line 444 "idl.re"
+ { BOOST_WAVE_RET(T_PP_HHEADER); }
+#line 3372 "idl_re.cpp"
 yy310:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
 yy311:
- if(yybm[0+yych] & 16) {
- goto yy310;
- }
- if(yych <= '!') goto yy77;
- ++YYCURSOR;
-#line 447 "..\\..\\idllexer\\idl.re"
- { BOOST_WAVE_RET(T_PP_QHEADER); }
-#line 3386 "..\\..\\idllexer\\idl_re.cpp"
+ if(yybm[0+yych] & 16) {
+ goto yy310;
+ }
+ if(yych <= '!') goto yy77;
+ ++YYCURSOR;
+#line 447 "idl.re"
+ { BOOST_WAVE_RET(T_PP_QHEADER); }
+#line 3385 "idl_re.cpp"
 yy314:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yybm[0+yych] & 32) {
- goto yy314;
- }
- if(yych == 0x0D) goto yy316;
- if(yych <= ')') goto yy77;
- goto yy318;
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yybm[0+yych] & 32) {
+ goto yy314;
+ }
+ if(yych == 0x0D) goto yy316;
+ if(yych <= ')') goto yy77;
+ goto yy318;
 yy316:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yybm[0+yych] & 32) {
- goto yy314;
- }
- if(yych == 0x0D) goto yy316;
- if(yych <= ')') goto yy77;
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yybm[0+yych] & 32) {
+ goto yy314;
+ }
+ if(yych == 0x0D) goto yy316;
+ if(yych <= ')') goto yy77;
 yy318:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yybm[0+yych] & 128) {
- goto yy318;
- }
- if(yych <= 0x0D) {
- if(yych <= 0x08) goto yy77;
- if(yych <= 0x0C) goto yy314;
- } else {
- if(yych <= 0x1F) goto yy77;
- if(yych == '/') goto yy300;
- goto yy314;
- }
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yybm[0+yych] & 32) {
- goto yy314;
- }
- if(yych == 0x0D) goto yy316;
- if(yych <= ')') goto yy77;
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yybm[0+yych] & 128) {
         goto yy318;
+ }
+ if(yych <= 0x0D) {
+ if(yych <= 0x08) goto yy77;
+ if(yych <= 0x0C) goto yy314;
+ } else {
+ if(yych <= 0x1F) goto yy77;
+ if(yych == '/') goto yy300;
+ goto yy314;
+ }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yybm[0+yych] & 32) {
+ goto yy314;
+ }
+ if(yych == 0x0D) goto yy316;
+ if(yych <= ')') goto yy77;
+ goto yy318;
 yy321:
- yych = *++YYCURSOR;
- if(yych == 'e') goto yy327;
- goto yy77;
+ yych = *++YYCURSOR;
+ if(yych == 'e') goto yy327;
+ goto yy77;
 yy322:
- yych = *++YYCURSOR;
- if(yych != 'd') goto yy77;
- yych = *++YYCURSOR;
- if(yych != 'e') goto yy77;
- yych = *++YYCURSOR;
- if(yych != 'f') goto yy77;
- ++YYCURSOR;
-#line 454 "..\\..\\idllexer\\idl.re"
- { BOOST_WAVE_RET(T_PP_IFNDEF); }
-#line 3444 "..\\..\\idllexer\\idl_re.cpp"
+ yych = *++YYCURSOR;
+ if(yych != 'd') goto yy77;
+ yych = *++YYCURSOR;
+ if(yych != 'e') goto yy77;
+ yych = *++YYCURSOR;
+ if(yych != 'f') goto yy77;
+ ++YYCURSOR;
+#line 454 "idl.re"
+ { BOOST_WAVE_RET(T_PP_IFNDEF); }
+#line 3443 "idl_re.cpp"
 yy327:
- yych = *++YYCURSOR;
- if(yych != 'f') goto yy77;
- ++YYCURSOR;
-#line 453 "..\\..\\idllexer\\idl.re"
- { BOOST_WAVE_RET(T_PP_IFDEF); }
-#line 3451 "..\\..\\idllexer\\idl_re.cpp"
+ yych = *++YYCURSOR;
+ if(yych != 'f') goto yy77;
+ ++YYCURSOR;
+#line 453 "idl.re"
+ { BOOST_WAVE_RET(T_PP_IFDEF); }
+#line 3450 "idl_re.cpp"
 yy330:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= 0x0D) {
- if(yych <= 0x08) goto yy77;
- if(yych <= 0x0C) goto yy330;
- } else {
- if(yych <= 0x1F) goto yy77;
- if(yych == '*') goto yy334;
- goto yy330;
- }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= 0x0D) {
+ if(yych <= 0x08) goto yy77;
+ if(yych <= 0x0C) goto yy330;
+ } else {
+ if(yych <= 0x1F) goto yy77;
+ if(yych == '*') goto yy334;
+ goto yy330;
+ }
 yy332:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= 0x0D) {
- if(yych <= 0x08) goto yy77;
- if(yych <= 0x0C) goto yy330;
- goto yy332;
- } else {
- if(yych <= 0x1F) goto yy77;
- if(yych != '*') goto yy330;
- }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= 0x0D) {
+ if(yych <= 0x08) goto yy77;
+ if(yych <= 0x0C) goto yy330;
+ goto yy332;
+ } else {
+ if(yych <= 0x1F) goto yy77;
+ if(yych != '*') goto yy330;
+ }
 yy334:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= 0x1F) {
- if(yych <= 0x08) goto yy77;
- if(yych <= 0x0C) goto yy330;
- if(yych >= 0x0E) goto yy77;
- } else {
- if(yych <= '*') {
- if(yych <= ')') goto yy330;
- goto yy334;
- } else {
- if(yych == '/') goto yy238;
- goto yy330;
- }
- }
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= 0x0D) {
- if(yych <= 0x08) goto yy77;
- if(yych <= 0x0C) goto yy330;
- goto yy332;
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= 0x1F) {
+ if(yych <= 0x08) goto yy77;
+ if(yych <= 0x0C) goto yy330;
+ if(yych >= 0x0E) goto yy77;
+ } else {
+ if(yych <= '*') {
+ if(yych <= ')') goto yy330;
+ goto yy334;
         } else {
- if(yych <= 0x1F) goto yy77;
- if(yych == '*') goto yy334;
+ if(yych == '/') goto yy238;
             goto yy330;
         }
+ }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= 0x0D) {
+ if(yych <= 0x08) goto yy77;
+ if(yych <= 0x0C) goto yy330;
+ goto yy332;
+ } else {
+ if(yych <= 0x1F) goto yy77;
+ if(yych == '*') goto yy334;
+ goto yy330;
+ }
 yy337:
- ++YYCURSOR;
-#line 421 "..\\..\\idllexer\\idl.re"
- { BOOST_WAVE_RET(T_MINUSMINUS); }
-#line 3509 "..\\..\\idllexer\\idl_re.cpp"
+ ++YYCURSOR;
+#line 421 "idl.re"
+ { BOOST_WAVE_RET(T_MINUSMINUS); }
+#line 3508 "idl_re.cpp"
 yy339:
- ++YYCURSOR;
-#line 420 "..\\..\\idllexer\\idl.re"
- { BOOST_WAVE_RET(T_PLUSPLUS); }
-#line 3514 "..\\..\\idllexer\\idl_re.cpp"
+ ++YYCURSOR;
+#line 420 "idl.re"
+ { BOOST_WAVE_RET(T_PLUSPLUS); }
+#line 3513 "idl_re.cpp"
 yy341:
- yych = *++YYCURSOR;
- if(yych == '/') goto yy342;
- if(yych == '=') goto yy238;
- goto yy77;
+ yych = *++YYCURSOR;
+ if(yych == '/') goto yy342;
+ if(yych == '=') goto yy238;
+ goto yy77;
 yy342:
- yych = *++YYCURSOR;
- if(yych == 'U') goto yy193;
- if(yych == 'u') goto yy192;
- goto yy77;
+ yych = *++YYCURSOR;
+ if(yych == 'U') goto yy193;
+ if(yych == 'u') goto yy192;
+ goto yy77;
 yy343:
- ++YYCURSOR;
-#line 392 "..\\..\\idllexer\\idl.re"
- { BOOST_WAVE_RET(T_POUND_POUND); }
-#line 3529 "..\\..\\idllexer\\idl_re.cpp"
+ ++YYCURSOR;
+#line 392 "idl.re"
+ { BOOST_WAVE_RET(T_POUND_POUND); }
+#line 3528 "idl_re.cpp"
 yy345:
- yyaccept = 0;
- yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'L') goto yy202;
- yyaccept = 0;
- yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'S') goto yy202;
- yyaccept = 0;
- yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'E') goto yy202;
- yyaccept = 11;
- yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 2) {
- goto yy201;
- }
- if(yych == '?') goto yy204;
- if(yych == '\\') goto yy203;
+ yyaccept = 0;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if(yych != 'L') goto yy202;
+ yyaccept = 0;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if(yych != 'S') goto yy202;
+ yyaccept = 0;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if(yych != 'E') goto yy202;
+ yyaccept = 11;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if(yybm[0+yych] & 2) {
+ goto yy201;
+ }
+ if(yych == '?') goto yy204;
+ if(yych == '\\') goto yy203;
 yy349:
-#line 385 "..\\..\\idllexer\\idl.re"
- { BOOST_WAVE_RET(T_FALSE); }
-#line 3550 "..\\..\\idllexer\\idl_re.cpp"
+#line 385 "idl.re"
+ { BOOST_WAVE_RET(T_FALSE); }
+#line 3549 "idl_re.cpp"
 yy350:
- yyaccept = 0;
- yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'U') goto yy202;
- yyaccept = 0;
- yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'E') goto yy202;
- yyaccept = 12;
- yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 2) {
- goto yy201;
- }
- if(yych == '?') goto yy204;
- if(yych == '\\') goto yy203;
+ yyaccept = 0;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if(yych != 'U') goto yy202;
+ yyaccept = 0;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if(yych != 'E') goto yy202;
+ yyaccept = 12;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if(yybm[0+yych] & 2) {
+ goto yy201;
+ }
+ if(yych == '?') goto yy204;
+ if(yych == '\\') goto yy203;
 yy353:
-#line 384 "..\\..\\idllexer\\idl.re"
- { BOOST_WAVE_RET(T_TRUE); }
-#line 3568 "..\\..\\idllexer\\idl_re.cpp"
+#line 384 "idl.re"
+ { BOOST_WAVE_RET(T_TRUE); }
+#line 3567 "idl_re.cpp"
 yy354:
- ++YYCURSOR;
-#line 382 "..\\..\\idllexer\\idl.re"
- { goto cppcomment; }
-#line 3573 "..\\..\\idllexer\\idl_re.cpp"
+ ++YYCURSOR;
+#line 382 "idl.re"
+ { goto cppcomment; }
+#line 3572 "idl_re.cpp"
 yy356:
- ++YYCURSOR;
-#line 381 "..\\..\\idllexer\\idl.re"
- { goto ccomment; }
-#line 3578 "..\\..\\idllexer\\idl_re.cpp"
- }
+ ++YYCURSOR;
+#line 381 "idl.re"
+ { goto ccomment; }
+#line 3577 "idl_re.cpp"
 }
-#line 495 "..\\..\\idllexer\\idl.re"
+#line 495 "idl.re"
 
 
 ccomment:
-{
 
-#line 3587 "..\\..\\idllexer\\idl_re.cpp"
- {
- YYCTYPE yych;
- if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
- yych = *YYCURSOR;
- if(yych <= 0x0C) {
- if(yych <= 0x08) {
- if(yych <= 0x00) goto yy366;
- goto yy368;
- } else {
- if(yych == 0x0A) goto yy362;
- goto yy365;
- }
+#line 3584 "idl_re.cpp"
+{
+ YYCTYPE yych;
+ if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+ yych = *YYCURSOR;
+ if(yych <= 0x0C) {
+ if(yych <= 0x08) {
+ if(yych <= 0x00) goto yy366;
+ goto yy368;
         } else {
- if(yych <= 0x1F) {
- if(yych <= 0x0D) goto yy364;
- goto yy368;
- } else {
- if(yych != '*') goto yy365;
- }
+ if(yych == 0x0A) goto yy362;
+ goto yy365;
+ }
+ } else {
+ if(yych <= 0x1F) {
+ if(yych <= 0x0D) goto yy364;
+ goto yy368;
+ } else {
+ if(yych != '*') goto yy365;
         }
- ++YYCURSOR;
- if((yych = *YYCURSOR) == '/') goto yy371;
+ }
+ ++YYCURSOR;
+ if((yych = *YYCURSOR) == '/') goto yy371;
 yy361:
-#line 508 "..\\..\\idllexer\\idl.re"
- { goto ccomment; }
-#line 3613 "..\\..\\idllexer\\idl_re.cpp"
+#line 508 "idl.re"
+ { goto ccomment; }
+#line 3610 "idl_re.cpp"
 yy362:
- ++YYCURSOR;
+ ++YYCURSOR;
 yy363:
-#line 501 "..\\..\\idllexer\\idl.re"
- {
+#line 501 "idl.re"
+ {
         /*if(cursor == s->eof) BOOST_WAVE_RET(T_EOF);*/
         /*s->tok = cursor; */
         s->line += count_backslash_newlines(s, cursor) +1;
         goto ccomment;
     }
-#line 3624 "..\\..\\idllexer\\idl_re.cpp"
+#line 3621 "idl_re.cpp"
 yy364:
- yych = *++YYCURSOR;
- if(yych == 0x0A) goto yy370;
- goto yy363;
+ yych = *++YYCURSOR;
+ if(yych == 0x0A) goto yy370;
+ goto yy363;
 yy365:
- yych = *++YYCURSOR;
- goto yy361;
+ yych = *++YYCURSOR;
+ goto yy361;
 yy366:
- ++YYCURSOR;
-#line 511 "..\\..\\idllexer\\idl.re"
- {
+ ++YYCURSOR;
+#line 511 "idl.re"
+ {
         using namespace std; // some systems have printf in std
         if(cursor == s->eof)
         {
@@ -3656,11 +3653,11 @@
         /* the comment is unterminated, but nevertheless its a comment */
         BOOST_WAVE_RET(T_CCOMMENT);
     }
-#line 3660 "..\\..\\idllexer\\idl_re.cpp"
+#line 3657 "idl_re.cpp"
 yy368:
- ++YYCURSOR;
-#line 538 "..\\..\\idllexer\\idl.re"
- {
+ ++YYCURSOR;
+#line 538 "idl.re"
+ {
         if (s->error_proc)
             (*s->error_proc)(s,
                 cpplexer::lexing_exception::generic_lexing_error,
@@ -3668,63 +3665,61 @@
         else
             printf("Error: 0 in file");
     }
-#line 3672 "..\\..\\idllexer\\idl_re.cpp"
+#line 3669 "idl_re.cpp"
 yy370:
- yych = *++YYCURSOR;
- goto yy363;
+ yych = *++YYCURSOR;
+ goto yy363;
 yy371:
- ++YYCURSOR;
-#line 499 "..\\..\\idllexer\\idl.re"
- { BOOST_WAVE_RET(T_CCOMMENT); }
-#line 3680 "..\\..\\idllexer\\idl_re.cpp"
- }
+ ++YYCURSOR;
+#line 499 "idl.re"
+ { BOOST_WAVE_RET(T_CCOMMENT); }
+#line 3677 "idl_re.cpp"
 }
-#line 547 "..\\..\\idllexer\\idl.re"
+#line 547 "idl.re"
 
 
 cppcomment:
-{
 
-#line 3689 "..\\..\\idllexer\\idl_re.cpp"
- {
- YYCTYPE yych;
- if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
- yych = *YYCURSOR;
- if(yych <= 0x0A) {
- if(yych <= 0x00) goto yy381;
- if(yych <= 0x08) goto yy375;
- if(yych <= 0x09) goto yy379;
- goto yy376;
- } else {
- if(yych <= 0x0C) goto yy379;
- if(yych <= 0x0D) goto yy378;
- if(yych >= ' ') goto yy379;
- }
+#line 3684 "idl_re.cpp"
+{
+ YYCTYPE yych;
+ if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+ yych = *YYCURSOR;
+ if(yych <= 0x0A) {
+ if(yych <= 0x00) goto yy381;
+ if(yych <= 0x08) goto yy375;
+ if(yych <= 0x09) goto yy379;
+ goto yy376;
+ } else {
+ if(yych <= 0x0C) goto yy379;
+ if(yych <= 0x0D) goto yy378;
+ if(yych >= ' ') goto yy379;
+ }
 yy375:
 yy376:
- ++YYCURSOR;
+ ++YYCURSOR;
 yy377:
-#line 552 "..\\..\\idllexer\\idl.re"
- {
+#line 552 "idl.re"
+ {
         /*if(cursor == s->eof) BOOST_WAVE_RET(T_EOF); */
         /*s->tok = cursor; */
         s->line++;
         BOOST_WAVE_RET(T_CPPCOMMENT);
     }
-#line 3715 "..\\..\\idllexer\\idl_re.cpp"
+#line 3710 "idl_re.cpp"
 yy378:
- yych = *++YYCURSOR;
- if(yych == 0x0A) goto yy383;
- goto yy377;
+ yych = *++YYCURSOR;
+ if(yych == 0x0A) goto yy383;
+ goto yy377;
 yy379:
- ++YYCURSOR;
-#line 559 "..\\..\\idllexer\\idl.re"
- { goto cppcomment; }
-#line 3724 "..\\..\\idllexer\\idl_re.cpp"
+ ++YYCURSOR;
+#line 559 "idl.re"
+ { goto cppcomment; }
+#line 3719 "idl_re.cpp"
 yy381:
- ++YYCURSOR;
-#line 562 "..\\..\\idllexer\\idl.re"
- {
+ ++YYCURSOR;
+#line 562 "idl.re"
+ {
         using namespace std; // some systems have printf in std
         if(cursor != s->eof)
         {
@@ -3740,14 +3735,13 @@
         /* the comment is unterminated, but nevertheless its a comment */
         BOOST_WAVE_RET(T_CPPCOMMENT);
     }
-#line 3744 "..\\..\\idllexer\\idl_re.cpp"
+#line 3739 "idl_re.cpp"
 yy383:
- ++YYCURSOR;
- yych = *YYCURSOR;
- goto yy377;
- }
+ ++YYCURSOR;
+ yych = *YYCURSOR;
+ goto yy377;
 }
-#line 578 "..\\..\\idllexer\\idl.re"
+#line 578 "idl.re"
 
 
 } /* end of scan */

Modified: branches/proto/v3/libs/wave/src/cpplexer/re2clex/cpp_re.inc
==============================================================================
--- branches/proto/v3/libs/wave/src/cpplexer/re2clex/cpp_re.inc (original)
+++ branches/proto/v3/libs/wave/src/cpplexer/re2clex/cpp_re.inc 2007-11-26 11:25:40 EST (Mon, 26 Nov 2007)
@@ -1,5 +1,5 @@
-/* Generated by re2c 0.12.1 on Tue Oct 02 09:56:22 2007 */
-#line 1 "..\\..\\src\\cpplexer\\re2clex\\cpp.re"
+/* Generated by re2c 0.13.1 on Wed Nov 21 11:50:51 2007 */
+#line 1 "cpp.re"
 /*=============================================================================
     Boost.Wave: A Standard compliant C++ preprocessor library
 
@@ -17,10 +17,14 @@
         handle errors better.
 =============================================================================*/
 
-#line 40 "..\\..\\src\\cpplexer\\re2clex\\cpp.re"
+#line 40 "cpp.re"
 
 
+
+#line 25 "cpp_re.inc"
 {
+ YYCTYPE yych;
+ unsigned int yyaccept = 0;
     static const unsigned char yybm[] = {
         /* table 1 .. 8: 0 */
           0, 0, 0, 0, 0, 0, 0, 0,
@@ -90,641 +94,636 @@
          32, 32, 32, 32, 32, 32, 32, 32,
     };
 
-#line 94 "..\\..\\src\\cpplexer\\re2clex\\cpp_re.inc"
- {
- YYCTYPE yych;
- unsigned int yyaccept = 0;
-
- if((YYLIMIT - YYCURSOR) < 17) YYFILL(17);
- yych = *YYCURSOR;
- switch(yych) {
- case 0x00: goto yy88;
- case 0x01:
- case 0x02:
- case 0x03:
- case 0x04:
- case 0x05:
- case 0x06:
- case 0x07:
- case 0x08:
- case 0x0E:
- case 0x0F:
- case 0x10:
- case 0x11:
- case 0x12:
- case 0x13:
- case 0x14:
- case 0x15:
- case 0x16:
- case 0x17:
- case 0x18:
- case 0x19:
- case 0x1A:
- case 0x1B:
- case 0x1C:
- case 0x1D:
- case 0x1E:
- case 0x1F: goto yy91;
- case 0x09:
- case 0x0B:
- case 0x0C: goto yy82;
- case 0x0A: goto yy85;
- case 0x0D: goto yy87;
- case ' ': goto yy84;
- case '!': goto yy68;
- case '"': goto yy81;
- case '#': goto yy45;
- case '$':
- case 'A':
- case 'B':
- case 'C':
- case 'D':
- case 'E':
- case 'F':
- case 'G':
- case 'H':
- case 'I':
- case 'J':
- case 'K':
- case 'M':
- case 'N':
- case 'O':
- case 'P':
- case 'Q':
- case 'R':
- case 'S':
- case 'T':
- case 'U':
- case 'V':
- case 'W':
- case 'X':
- case 'Y':
- case 'Z':
- case 'h':
- case 'j':
- case 'k':
- case 'q':
- case 'y':
- case 'z': goto yy76;
- case '%': goto yy37;
- case '&': goto yy62;
- case '\'': goto yy80;
- case '(': goto yy47;
- case ')': goto yy49;
- case '*': goto yy57;
- case '+': goto yy53;
- case ',': goto yy74;
- case '-': goto yy55;
- case '.': goto yy4;
- case '/': goto yy2;
- case '0':
- case '1':
- case '2':
- case '3':
- case '4':
- case '5':
- case '6':
- case '7':
- case '8':
- case '9': goto yy6;
- case ':': goto yy43;
- case ';': goto yy51;
- case '<': goto yy33;
- case '=': goto yy70;
- case '>': goto yy72;
- case '?': goto yy31;
- case 'L': goto yy77;
- case '[': goto yy39;
- case '\\': goto yy78;
- case ']': goto yy41;
- case '^': goto yy59;
- case '_': goto yy28;
- case 'a': goto yy8;
- case 'b': goto yy10;
- case 'c': goto yy11;
- case 'd': goto yy12;
- case 'e': goto yy13;
- case 'f': goto yy14;
- case 'g': goto yy15;
- case 'i': goto yy16;
- case 'l': goto yy17;
- case 'm': goto yy18;
- case 'n': goto yy19;
- case 'o': goto yy20;
- case 'p': goto yy21;
- case 'r': goto yy22;
- case 's': goto yy23;
- case 't': goto yy24;
- case 'u': goto yy25;
- case 'v': goto yy26;
- case 'w': goto yy27;
- case 'x': goto yy61;
- case '{': goto yy29;
- case '|': goto yy64;
- case '}': goto yy35;
- case '~': goto yy66;
- default: goto yy90;
- }
+ if((YYLIMIT - YYCURSOR) < 17) YYFILL(17);
+ yych = *YYCURSOR;
+ switch(yych) {
+ case 0x00: goto yy88;
+ case 0x01:
+ case 0x02:
+ case 0x03:
+ case 0x04:
+ case 0x05:
+ case 0x06:
+ case 0x07:
+ case 0x08:
+ case 0x0E:
+ case 0x0F:
+ case 0x10:
+ case 0x11:
+ case 0x12:
+ case 0x13:
+ case 0x14:
+ case 0x15:
+ case 0x16:
+ case 0x17:
+ case 0x18:
+ case 0x19:
+ case 0x1A:
+ case 0x1B:
+ case 0x1C:
+ case 0x1D:
+ case 0x1E:
+ case 0x1F: goto yy91;
+ case 0x09:
+ case 0x0B:
+ case 0x0C: goto yy82;
+ case 0x0A: goto yy85;
+ case 0x0D: goto yy87;
+ case ' ': goto yy84;
+ case '!': goto yy68;
+ case '"': goto yy81;
+ case '#': goto yy45;
+ case '$':
+ case 'A':
+ case 'B':
+ case 'C':
+ case 'D':
+ case 'E':
+ case 'F':
+ case 'G':
+ case 'H':
+ case 'I':
+ case 'J':
+ case 'K':
+ case 'M':
+ case 'N':
+ case 'O':
+ case 'P':
+ case 'Q':
+ case 'R':
+ case 'S':
+ case 'T':
+ case 'U':
+ case 'V':
+ case 'W':
+ case 'X':
+ case 'Y':
+ case 'Z':
+ case 'h':
+ case 'j':
+ case 'k':
+ case 'q':
+ case 'y':
+ case 'z': goto yy76;
+ case '%': goto yy37;
+ case '&': goto yy62;
+ case '\'': goto yy80;
+ case '(': goto yy47;
+ case ')': goto yy49;
+ case '*': goto yy57;
+ case '+': goto yy53;
+ case ',': goto yy74;
+ case '-': goto yy55;
+ case '.': goto yy4;
+ case '/': goto yy2;
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy6;
+ case ':': goto yy43;
+ case ';': goto yy51;
+ case '<': goto yy33;
+ case '=': goto yy70;
+ case '>': goto yy72;
+ case '?': goto yy31;
+ case 'L': goto yy77;
+ case '[': goto yy39;
+ case '\\': goto yy78;
+ case ']': goto yy41;
+ case '^': goto yy59;
+ case '_': goto yy28;
+ case 'a': goto yy8;
+ case 'b': goto yy10;
+ case 'c': goto yy11;
+ case 'd': goto yy12;
+ case 'e': goto yy13;
+ case 'f': goto yy14;
+ case 'g': goto yy15;
+ case 'i': goto yy16;
+ case 'l': goto yy17;
+ case 'm': goto yy18;
+ case 'n': goto yy19;
+ case 'o': goto yy20;
+ case 'p': goto yy21;
+ case 'r': goto yy22;
+ case 's': goto yy23;
+ case 't': goto yy24;
+ case 'u': goto yy25;
+ case 'v': goto yy26;
+ case 'w': goto yy27;
+ case 'x': goto yy61;
+ case '{': goto yy29;
+ case '|': goto yy64;
+ case '}': goto yy35;
+ case '~': goto yy66;
+ default: goto yy90;
+ }
 yy2:
- ++YYCURSOR;
- if((yych = *YYCURSOR) <= '.') {
- if(yych == '*') goto yy922;
- } else {
- if(yych <= '/') goto yy920;
- if(yych == '=') goto yy918;
- }
-#line 178 "..\\..\\src\\cpplexer\\re2clex\\cpp.re"
- { BOOST_WAVE_RET(T_DIVIDE); }
-#line 239 "..\\..\\src\\cpplexer\\re2clex\\cpp_re.inc"
+ ++YYCURSOR;
+ if((yych = *YYCURSOR) <= '.') {
+ if(yych == '*') goto yy922;
+ } else {
+ if(yych <= '/') goto yy920;
+ if(yych == '=') goto yy918;
+ }
+#line 178 "cpp.re"
+ { BOOST_WAVE_RET(T_DIVIDE); }
+#line 238 "cpp_re.inc"
 yy4:
- yyaccept = 0;
- yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= '-') {
- if(yych == '*') goto yy912;
- } else {
- if(yych <= '.') goto yy914;
- if(yych <= '/') goto yy5;
- if(yych <= '9') goto yy915;
- }
+ yyaccept = 0;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if(yych <= '-') {
+ if(yych == '*') goto yy912;
+ } else {
+ if(yych <= '.') goto yy914;
+ if(yych <= '/') goto yy5;
+ if(yych <= '9') goto yy915;
+ }
 yy5:
-#line 164 "..\\..\\src\\cpplexer\\re2clex\\cpp.re"
- { BOOST_WAVE_RET(T_DOT); }
-#line 253 "..\\..\\src\\cpplexer\\re2clex\\cpp_re.inc"
+#line 164 "cpp.re"
+ { BOOST_WAVE_RET(T_DOT); }
+#line 252 "cpp_re.inc"
 yy6:
- ++YYCURSOR;
+ ++YYCURSOR;
 yy7:
-#line 45 "..\\..\\src\\cpplexer\\re2clex\\cpp.re"
- { goto pp_number; }
-#line 259 "..\\..\\src\\cpplexer\\re2clex\\cpp_re.inc"
+#line 45 "cpp.re"
+ { goto pp_number; }
+#line 258 "cpp_re.inc"
 yy8:
- yyaccept = 1;
- yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= 'r') {
- if(yych == 'n') goto yy898;
- goto yy195;
- } else {
- if(yych <= 's') goto yy899;
- if(yych == 'u') goto yy900;
- goto yy195;
- }
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if(yych <= 'r') {
+ if(yych == 'n') goto yy898;
+ goto yy195;
+ } else {
+ if(yych <= 's') goto yy899;
+ if(yych == 'u') goto yy900;
+ goto yy195;
+ }
 yy9:
-#line 243 "..\\..\\src\\cpplexer\\re2clex\\cpp.re"
- { BOOST_WAVE_RET(T_IDENTIFIER); }
-#line 274 "..\\..\\src\\cpplexer\\re2clex\\cpp_re.inc"
+#line 243 "cpp.re"
+ { BOOST_WAVE_RET(T_IDENTIFIER); }
+#line 273 "cpp_re.inc"
 yy10:
- yyaccept = 1;
- yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= 'n') {
- if(yych == 'i') goto yy880;
- goto yy195;
- } else {
- if(yych <= 'o') goto yy881;
- if(yych == 'r') goto yy882;
- goto yy195;
- }
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if(yych <= 'n') {
+ if(yych == 'i') goto yy880;
+ goto yy195;
+ } else {
+ if(yych <= 'o') goto yy881;
+ if(yych == 'r') goto yy882;
+ goto yy195;
+ }
 yy11:
- yyaccept = 1;
- yych = *(YYMARKER = ++YYCURSOR);
- switch(yych) {
- case 'a': goto yy842;
- case 'h': goto yy843;
- case 'l': goto yy844;
- case 'o': goto yy845;
- default: goto yy195;
- }
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ switch(yych) {
+ case 'a': goto yy842;
+ case 'h': goto yy843;
+ case 'l': goto yy844;
+ case 'o': goto yy845;
+ default: goto yy195;
+ }
 yy12:
- yyaccept = 1;
- yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= 'n') {
- if(yych == 'e') goto yy811;
- goto yy195;
- } else {
- if(yych <= 'o') goto yy812;
- if(yych == 'y') goto yy814;
- goto yy195;
- }
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if(yych <= 'n') {
+ if(yych == 'e') goto yy811;
+ goto yy195;
+ } else {
+ if(yych <= 'o') goto yy812;
+ if(yych == 'y') goto yy814;
+ goto yy195;
+ }
 yy13:
- yyaccept = 1;
- yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= 'm') {
- if(yych == 'l') goto yy786;
- goto yy195;
- } else {
- if(yych <= 'n') goto yy787;
- if(yych == 'x') goto yy788;
- goto yy195;
- }
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if(yych <= 'm') {
+ if(yych == 'l') goto yy786;
+ goto yy195;
+ } else {
+ if(yych <= 'n') goto yy787;
+ if(yych == 'x') goto yy788;
+ goto yy195;
+ }
 yy14:
- yyaccept = 1;
- yych = *(YYMARKER = ++YYCURSOR);
- switch(yych) {
- case 'a': goto yy767;
- case 'l': goto yy768;
- case 'o': goto yy769;
- case 'r': goto yy770;
- default: goto yy195;
- }
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ switch(yych) {
+ case 'a': goto yy767;
+ case 'l': goto yy768;
+ case 'o': goto yy769;
+ case 'r': goto yy770;
+ default: goto yy195;
+ }
 yy15:
- yyaccept = 1;
- yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'o') goto yy763;
- goto yy195;
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if(yych == 'o') goto yy763;
+ goto yy195;
 yy16:
- yyaccept = 1;
- yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= 'l') {
- if(yych == 'f') goto yy747;
- goto yy195;
- } else {
- if(yych <= 'm') goto yy749;
- if(yych <= 'n') goto yy750;
- goto yy195;
- }
-yy17:
- yyaccept = 1;
- yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'o') goto yy743;
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if(yych <= 'l') {
+ if(yych == 'f') goto yy747;
+ goto yy195;
+ } else {
+ if(yych <= 'm') goto yy749;
+ if(yych <= 'n') goto yy750;
         goto yy195;
+ }
+yy17:
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if(yych == 'o') goto yy743;
+ goto yy195;
 yy18:
- yyaccept = 1;
- yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'u') goto yy736;
- goto yy195;
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if(yych == 'u') goto yy736;
+ goto yy195;
 yy19:
- yyaccept = 1;
- yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= 'd') {
- if(yych == 'a') goto yy717;
- goto yy195;
- } else {
- if(yych <= 'e') goto yy718;
- if(yych == 'o') goto yy719;
- goto yy195;
- }
-yy20:
- yyaccept = 1;
- yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'p') goto yy703;
- if(yych == 'r') goto yy704;
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if(yych <= 'd') {
+ if(yych == 'a') goto yy717;
+ goto yy195;
+ } else {
+ if(yych <= 'e') goto yy718;
+ if(yych == 'o') goto yy719;
         goto yy195;
+ }
+yy20:
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if(yych == 'p') goto yy703;
+ if(yych == 'r') goto yy704;
+ goto yy195;
 yy21:
- yyaccept = 1;
- yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'r') goto yy682;
- if(yych == 'u') goto yy683;
- goto yy195;
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if(yych == 'r') goto yy682;
+ if(yych == 'u') goto yy683;
+ goto yy195;
 yy22:
- yyaccept = 1;
- yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'e') goto yy654;
- goto yy195;
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if(yych == 'e') goto yy654;
+ goto yy195;
 yy23:
- yyaccept = 1;
- yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= 's') {
- if(yych <= 'g') goto yy195;
- if(yych <= 'h') goto yy615;
- if(yych <= 'i') goto yy616;
- goto yy195;
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if(yych <= 's') {
+ if(yych <= 'g') goto yy195;
+ if(yych <= 'h') goto yy615;
+ if(yych <= 'i') goto yy616;
+ goto yy195;
+ } else {
+ if(yych <= 't') goto yy617;
+ if(yych == 'w') goto yy618;
+ goto yy195;
+ }
+yy24:
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if(yych <= 'h') {
+ if(yych == 'e') goto yy578;
+ if(yych <= 'g') goto yy195;
+ goto yy579;
+ } else {
+ if(yych <= 'r') {
+ if(yych <= 'q') goto yy195;
+ goto yy580;
         } else {
- if(yych <= 't') goto yy617;
- if(yych == 'w') goto yy618;
+ if(yych == 'y') goto yy581;
             goto yy195;
         }
-yy24:
- yyaccept = 1;
- yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= 'h') {
- if(yych == 'e') goto yy578;
- if(yych <= 'g') goto yy195;
- goto yy579;
- } else {
- if(yych <= 'r') {
- if(yych <= 'q') goto yy195;
- goto yy580;
- } else {
- if(yych == 'y') goto yy581;
- goto yy195;
- }
- }
+ }
 yy25:
- yyaccept = 1;
- yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'n') goto yy561;
- if(yych == 's') goto yy562;
- goto yy195;
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if(yych == 'n') goto yy561;
+ if(yych == 's') goto yy562;
+ goto yy195;
 yy26:
- yyaccept = 1;
- yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'i') goto yy543;
- if(yych == 'o') goto yy544;
- goto yy195;
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if(yych == 'i') goto yy543;
+ if(yych == 'o') goto yy544;
+ goto yy195;
 yy27:
- yyaccept = 1;
- yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'c') goto yy531;
- if(yych == 'h') goto yy532;
- goto yy195;
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if(yych == 'c') goto yy531;
+ if(yych == 'h') goto yy532;
+ goto yy195;
 yy28:
- yyaccept = 1;
- yych = *(YYMARKER = ++YYCURSOR);
- switch(yych) {
- case '_': goto yy442;
- case 'a': goto yy443;
- case 'b': goto yy444;
- case 'c': goto yy445;
- case 'd': goto yy446;
- case 'f': goto yy447;
- case 'i': goto yy448;
- case 's': goto yy449;
- default: goto yy195;
- }
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ switch(yych) {
+ case '_': goto yy442;
+ case 'a': goto yy443;
+ case 'b': goto yy444;
+ case 'c': goto yy445;
+ case 'd': goto yy446;
+ case 'f': goto yy447;
+ case 'i': goto yy448;
+ case 's': goto yy449;
+ default: goto yy195;
+ }
 yy29:
- ++YYCURSOR;
-#line 128 "..\\..\\src\\cpplexer\\re2clex\\cpp.re"
- { BOOST_WAVE_RET(T_LEFTBRACE); }
-#line 447 "..\\..\\src\\cpplexer\\re2clex\\cpp_re.inc"
+ ++YYCURSOR;
+#line 128 "cpp.re"
+ { BOOST_WAVE_RET(T_LEFTBRACE); }
+#line 446 "cpp_re.inc"
 yy31:
- yyaccept = 2;
- yych = *(YYMARKER = ++YYCURSOR);
- if(yych == '?') goto yy407;
+ yyaccept = 2;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if(yych == '?') goto yy407;
 yy32:
-#line 153 "..\\..\\src\\cpplexer\\re2clex\\cpp.re"
- { BOOST_WAVE_RET(T_QUESTION_MARK); }
-#line 455 "..\\..\\src\\cpplexer\\re2clex\\cpp_re.inc"
+#line 153 "cpp.re"
+ { BOOST_WAVE_RET(T_QUESTION_MARK); }
+#line 454 "cpp_re.inc"
 yy33:
- ++YYCURSOR;
- if((yych = *YYCURSOR) <= ':') {
- if(yych == '%') goto yy403;
- if(yych >= ':') goto yy401;
- } else {
- if(yych <= ';') goto yy34;
- if(yych <= '<') goto yy399;
- if(yych <= '=') goto yy397;
- }
+ ++YYCURSOR;
+ if((yych = *YYCURSOR) <= ':') {
+ if(yych == '%') goto yy403;
+ if(yych >= ':') goto yy401;
+ } else {
+ if(yych <= ';') goto yy34;
+ if(yych <= '<') goto yy399;
+ if(yych <= '=') goto yy397;
+ }
 yy34:
-#line 194 "..\\..\\src\\cpplexer\\re2clex\\cpp.re"
- { BOOST_WAVE_RET(T_LESS); }
-#line 469 "..\\..\\src\\cpplexer\\re2clex\\cpp_re.inc"
+#line 194 "cpp.re"
+ { BOOST_WAVE_RET(T_LESS); }
+#line 468 "cpp_re.inc"
 yy35:
- ++YYCURSOR;
-#line 131 "..\\..\\src\\cpplexer\\re2clex\\cpp.re"
- { BOOST_WAVE_RET(T_RIGHTBRACE); }
-#line 474 "..\\..\\src\\cpplexer\\re2clex\\cpp_re.inc"
+ ++YYCURSOR;
+#line 131 "cpp.re"
+ { BOOST_WAVE_RET(T_RIGHTBRACE); }
+#line 473 "cpp_re.inc"
 yy37:
- ++YYCURSOR;
- if((yych = *YYCURSOR) <= '<') {
- if(yych == ':') goto yy388;
- } else {
- if(yych <= '=') goto yy390;
- if(yych <= '>') goto yy392;
- }
-#line 179 "..\\..\\src\\cpplexer\\re2clex\\cpp.re"
- { BOOST_WAVE_RET(T_PERCENT); }
-#line 485 "..\\..\\src\\cpplexer\\re2clex\\cpp_re.inc"
+ ++YYCURSOR;
+ if((yych = *YYCURSOR) <= '<') {
+ if(yych == ':') goto yy388;
+ } else {
+ if(yych <= '=') goto yy390;
+ if(yych <= '>') goto yy392;
+ }
+#line 179 "cpp.re"
+ { BOOST_WAVE_RET(T_PERCENT); }
+#line 484 "cpp_re.inc"
 yy39:
- ++YYCURSOR;
-#line 134 "..\\..\\src\\cpplexer\\re2clex\\cpp.re"
- { BOOST_WAVE_RET(T_LEFTBRACKET); }
-#line 490 "..\\..\\src\\cpplexer\\re2clex\\cpp_re.inc"
+ ++YYCURSOR;
+#line 134 "cpp.re"
+ { BOOST_WAVE_RET(T_LEFTBRACKET); }
+#line 489 "cpp_re.inc"
 yy41:
- ++YYCURSOR;
-#line 137 "..\\..\\src\\cpplexer\\re2clex\\cpp.re"
- { BOOST_WAVE_RET(T_RIGHTBRACKET); }
-#line 495 "..\\..\\src\\cpplexer\\re2clex\\cpp_re.inc"
+ ++YYCURSOR;
+#line 137 "cpp.re"
+ { BOOST_WAVE_RET(T_RIGHTBRACKET); }
+#line 494 "cpp_re.inc"
 yy43:
- ++YYCURSOR;
- if((yych = *YYCURSOR) == ':') goto yy384;
- if(yych == '>') goto yy386;
-#line 151 "..\\..\\src\\cpplexer\\re2clex\\cpp.re"
- { BOOST_WAVE_RET(T_COLON); }
-#line 502 "..\\..\\src\\cpplexer\\re2clex\\cpp_re.inc"
+ ++YYCURSOR;
+ if((yych = *YYCURSOR) == ':') goto yy384;
+ if(yych == '>') goto yy386;
+#line 151 "cpp.re"
+ { BOOST_WAVE_RET(T_COLON); }
+#line 501 "cpp_re.inc"
 yy45:
- yyaccept = 3;
- yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= 'c') {
- if(yych <= ' ') {
- if(yych <= 0x0A) {
- if(yych == 0x09) goto yy261;
- } else {
- if(yych <= 0x0C) goto yy261;
- if(yych >= ' ') goto yy261;
- }
+ yyaccept = 3;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if(yych <= 'c') {
+ if(yych <= ' ') {
+ if(yych <= 0x0A) {
+ if(yych == 0x09) goto yy261;
             } else {
- if(yych <= '.') {
- if(yych == '#') goto yy272;
- } else {
- if(yych <= '/') goto yy261;
- if(yych == '?') goto yy271;
- }
+ if(yych <= 0x0C) goto yy261;
+ if(yych >= ' ') goto yy261;
             }
         } else {
- if(yych <= 'p') {
- if(yych <= 'i') {
- if(yych <= 'e') goto yy261;
- if(yych >= 'i') goto yy261;
- } else {
- if(yych == 'l') goto yy261;
- if(yych >= 'p') goto yy261;
- }
+ if(yych <= '.') {
+ if(yych == '#') goto yy272;
             } else {
- if(yych <= 't') {
- if(yych == 'r') goto yy261;
- } else {
- if(yych == 'v') goto yy46;
- if(yych <= 'w') goto yy261;
- }
+ if(yych <= '/') goto yy261;
+ if(yych == '?') goto yy271;
+ }
+ }
+ } else {
+ if(yych <= 'p') {
+ if(yych <= 'i') {
+ if(yych <= 'e') goto yy261;
+ if(yych >= 'i') goto yy261;
+ } else {
+ if(yych == 'l') goto yy261;
+ if(yych >= 'p') goto yy261;
+ }
+ } else {
+ if(yych <= 't') {
+ if(yych == 'r') goto yy261;
+ } else {
+ if(yych == 'v') goto yy46;
+ if(yych <= 'w') goto yy261;
             }
         }
+ }
 yy46:
-#line 140 "..\\..\\src\\cpplexer\\re2clex\\cpp.re"
- { BOOST_WAVE_RET(T_POUND); }
-#line 543 "..\\..\\src\\cpplexer\\re2clex\\cpp_re.inc"
+#line 140 "cpp.re"
+ { BOOST_WAVE_RET(T_POUND); }
+#line 542 "cpp_re.inc"
 yy47:
- ++YYCURSOR;
-#line 148 "..\\..\\src\\cpplexer\\re2clex\\cpp.re"
- { BOOST_WAVE_RET(T_LEFTPAREN); }
-#line 548 "..\\..\\src\\cpplexer\\re2clex\\cpp_re.inc"
+ ++YYCURSOR;
+#line 148 "cpp.re"
+ { BOOST_WAVE_RET(T_LEFTPAREN); }
+#line 547 "cpp_re.inc"
 yy49:
- ++YYCURSOR;
-#line 149 "..\\..\\src\\cpplexer\\re2clex\\cpp.re"
- { BOOST_WAVE_RET(T_RIGHTPAREN); }
-#line 553 "..\\..\\src\\cpplexer\\re2clex\\cpp_re.inc"
+ ++YYCURSOR;
+#line 149 "cpp.re"
+ { BOOST_WAVE_RET(T_RIGHTPAREN); }
+#line 552 "cpp_re.inc"
 yy51:
- ++YYCURSOR;
-#line 150 "..\\..\\src\\cpplexer\\re2clex\\cpp.re"
- { BOOST_WAVE_RET(T_SEMICOLON); }
-#line 558 "..\\..\\src\\cpplexer\\re2clex\\cpp_re.inc"
+ ++YYCURSOR;
+#line 150 "cpp.re"
+ { BOOST_WAVE_RET(T_SEMICOLON); }
+#line 557 "cpp_re.inc"
 yy53:
- ++YYCURSOR;
- if((yych = *YYCURSOR) == '+') goto yy256;
- if(yych == '=') goto yy258;
-#line 175 "..\\..\\src\\cpplexer\\re2clex\\cpp.re"
- { BOOST_WAVE_RET(T_PLUS); }
-#line 565 "..\\..\\src\\cpplexer\\re2clex\\cpp_re.inc"
+ ++YYCURSOR;
+ if((yych = *YYCURSOR) == '+') goto yy256;
+ if(yych == '=') goto yy258;
+#line 175 "cpp.re"
+ { BOOST_WAVE_RET(T_PLUS); }
+#line 564 "cpp_re.inc"
 yy55:
- ++YYCURSOR;
- if((yych = *YYCURSOR) <= '<') {
- if(yych == '-') goto yy250;
- } else {
- if(yych <= '=') goto yy252;
- if(yych <= '>') goto yy248;
- }
-#line 176 "..\\..\\src\\cpplexer\\re2clex\\cpp.re"
- { BOOST_WAVE_RET(T_MINUS); }
-#line 576 "..\\..\\src\\cpplexer\\re2clex\\cpp_re.inc"
+ ++YYCURSOR;
+ if((yych = *YYCURSOR) <= '<') {
+ if(yych == '-') goto yy250;
+ } else {
+ if(yych <= '=') goto yy252;
+ if(yych <= '>') goto yy248;
+ }
+#line 176 "cpp.re"
+ { BOOST_WAVE_RET(T_MINUS); }
+#line 575 "cpp_re.inc"
 yy57:
- ++YYCURSOR;
- if((yych = *YYCURSOR) == '=') goto yy246;
-#line 177 "..\\..\\src\\cpplexer\\re2clex\\cpp.re"
- { BOOST_WAVE_RET(T_STAR); }
-#line 582 "..\\..\\src\\cpplexer\\re2clex\\cpp_re.inc"
+ ++YYCURSOR;
+ if((yych = *YYCURSOR) == '=') goto yy246;
+#line 177 "cpp.re"
+ { BOOST_WAVE_RET(T_STAR); }
+#line 581 "cpp_re.inc"
 yy59:
- ++YYCURSOR;
- if((yych = *YYCURSOR) == '=') goto yy244;
-#line 180 "..\\..\\src\\cpplexer\\re2clex\\cpp.re"
- { BOOST_WAVE_RET(T_XOR); }
-#line 588 "..\\..\\src\\cpplexer\\re2clex\\cpp_re.inc"
+ ++YYCURSOR;
+ if((yych = *YYCURSOR) == '=') goto yy244;
+#line 180 "cpp.re"
+ { BOOST_WAVE_RET(T_XOR); }
+#line 587 "cpp_re.inc"
 yy61:
- yyaccept = 1;
- yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'o') goto yy237;
- goto yy195;
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if(yych == 'o') goto yy237;
+ goto yy195;
 yy62:
- ++YYCURSOR;
- if((yych = *YYCURSOR) == '&') goto yy233;
- if(yych == '=') goto yy235;
-#line 183 "..\\..\\src\\cpplexer\\re2clex\\cpp.re"
- { BOOST_WAVE_RET(T_AND); }
-#line 600 "..\\..\\src\\cpplexer\\re2clex\\cpp_re.inc"
+ ++YYCURSOR;
+ if((yych = *YYCURSOR) == '&') goto yy233;
+ if(yych == '=') goto yy235;
+#line 183 "cpp.re"
+ { BOOST_WAVE_RET(T_AND); }
+#line 599 "cpp_re.inc"
 yy64:
- yyaccept = 4;
- yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= '>') {
- if(yych == '=') goto yy228;
- } else {
- if(yych <= '?') goto yy225;
- if(yych == '|') goto yy226;
- }
+ yyaccept = 4;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if(yych <= '>') {
+ if(yych == '=') goto yy228;
+ } else {
+ if(yych <= '?') goto yy225;
+ if(yych == '|') goto yy226;
+ }
 yy65:
-#line 185 "..\\..\\src\\cpplexer\\re2clex\\cpp.re"
- { BOOST_WAVE_RET(T_OR); }
-#line 613 "..\\..\\src\\cpplexer\\re2clex\\cpp_re.inc"
+#line 185 "cpp.re"
+ { BOOST_WAVE_RET(T_OR); }
+#line 612 "cpp_re.inc"
 yy66:
- ++YYCURSOR;
-#line 188 "..\\..\\src\\cpplexer\\re2clex\\cpp.re"
- { BOOST_WAVE_RET(T_COMPL); }
-#line 618 "..\\..\\src\\cpplexer\\re2clex\\cpp_re.inc"
+ ++YYCURSOR;
+#line 188 "cpp.re"
+ { BOOST_WAVE_RET(T_COMPL); }
+#line 617 "cpp_re.inc"
 yy68:
- ++YYCURSOR;
- if((yych = *YYCURSOR) == '=') goto yy223;
-#line 191 "..\\..\\src\\cpplexer\\re2clex\\cpp.re"
- { BOOST_WAVE_RET(T_NOT); }
-#line 624 "..\\..\\src\\cpplexer\\re2clex\\cpp_re.inc"
+ ++YYCURSOR;
+ if((yych = *YYCURSOR) == '=') goto yy223;
+#line 191 "cpp.re"
+ { BOOST_WAVE_RET(T_NOT); }
+#line 623 "cpp_re.inc"
 yy70:
- ++YYCURSOR;
- if((yych = *YYCURSOR) == '=') goto yy221;
-#line 193 "..\\..\\src\\cpplexer\\re2clex\\cpp.re"
- { BOOST_WAVE_RET(T_ASSIGN); }
-#line 630 "..\\..\\src\\cpplexer\\re2clex\\cpp_re.inc"
+ ++YYCURSOR;
+ if((yych = *YYCURSOR) == '=') goto yy221;
+#line 193 "cpp.re"
+ { BOOST_WAVE_RET(T_ASSIGN); }
+#line 629 "cpp_re.inc"
 yy72:
- ++YYCURSOR;
- if((yych = *YYCURSOR) <= '<') goto yy73;
- if(yych <= '=') goto yy215;
- if(yych <= '>') goto yy217;
+ ++YYCURSOR;
+ if((yych = *YYCURSOR) <= '<') goto yy73;
+ if(yych <= '=') goto yy215;
+ if(yych <= '>') goto yy217;
 yy73:
-#line 195 "..\\..\\src\\cpplexer\\re2clex\\cpp.re"
- { BOOST_WAVE_RET(T_GREATER); }
-#line 639 "..\\..\\src\\cpplexer\\re2clex\\cpp_re.inc"
+#line 195 "cpp.re"
+ { BOOST_WAVE_RET(T_GREATER); }
+#line 638 "cpp_re.inc"
 yy74:
- ++YYCURSOR;
-#line 227 "..\\..\\src\\cpplexer\\re2clex\\cpp.re"
- { BOOST_WAVE_RET(T_COMMA); }
-#line 644 "..\\..\\src\\cpplexer\\re2clex\\cpp_re.inc"
+ ++YYCURSOR;
+#line 227 "cpp.re"
+ { BOOST_WAVE_RET(T_COMMA); }
+#line 643 "cpp_re.inc"
 yy76:
- yyaccept = 1;
- yych = *(YYMARKER = ++YYCURSOR);
- goto yy195;
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ goto yy195;
 yy77:
- yyaccept = 1;
- yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
- goto yy194;
- }
- if(yych <= '\'') {
- if(yych == '"') goto yy96;
- if(yych <= '&') goto yy9;
- goto yy214;
- } else {
- if(yych <= '?') {
- if(yych <= '>') goto yy9;
- goto yy197;
- } else {
- if(yych == '\\') goto yy196;
- goto yy9;
- }
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if(yybm[0+yych] & 4) {
+ goto yy194;
+ }
+ if(yych <= '\'') {
+ if(yych == '"') goto yy96;
+ if(yych <= '&') goto yy9;
+ goto yy214;
+ } else {
+ if(yych <= '?') {
+ if(yych <= '>') goto yy9;
+ goto yy197;
+ } else {
+ if(yych == '\\') goto yy196;
+ goto yy9;
         }
+ }
 yy78:
- yyaccept = 5;
- yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'U') goto yy186;
- if(yych == 'u') goto yy185;
+ yyaccept = 5;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if(yych == 'U') goto yy186;
+ if(yych == 'u') goto yy185;
 yy79:
-#line 299 "..\\..\\src\\cpplexer\\re2clex\\cpp.re"
- { BOOST_WAVE_RET(TOKEN_FROM_ID(*s->tok, UnknownTokenType)); }
-#line 676 "..\\..\\src\\cpplexer\\re2clex\\cpp_re.inc"
+#line 299 "cpp.re"
+ { BOOST_WAVE_RET(TOKEN_FROM_ID(*s->tok, UnknownTokenType)); }
+#line 675 "cpp_re.inc"
 yy80:
- yyaccept = 5;
- yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy142;
- if(yych <= 0x0A) goto yy79;
- goto yy142;
- } else {
- if(yych <= 0x1F) goto yy79;
- if(yych == '\'') goto yy79;
- goto yy142;
- }
+ yyaccept = 5;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if(yych <= 0x0C) {
+ if(yych == 0x09) goto yy142;
+ if(yych <= 0x0A) goto yy79;
+ goto yy142;
+ } else {
+ if(yych <= 0x1F) goto yy79;
+ if(yych == '\'') goto yy79;
+ goto yy142;
+ }
 yy81:
- yyaccept = 5;
- yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= 0x0A) {
- if(yych == 0x09) goto yy97;
- goto yy79;
- } else {
- if(yych <= 0x0C) goto yy97;
- if(yych <= 0x1F) goto yy79;
- goto yy97;
- }
+ yyaccept = 5;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if(yych <= 0x0A) {
+ if(yych == 0x09) goto yy97;
+ goto yy79;
+ } else {
+ if(yych <= 0x0C) goto yy97;
+ if(yych <= 0x1F) goto yy79;
+ goto yy97;
+ }
 yy82:
- ++YYCURSOR;
- yych = *YYCURSOR;
- goto yy95;
+ ++YYCURSOR;
+ yych = *YYCURSOR;
+ goto yy95;
 yy83:
-#line 279 "..\\..\\src\\cpplexer\\re2clex\\cpp.re"
- { BOOST_WAVE_RET(T_SPACE); }
-#line 707 "..\\..\\src\\cpplexer\\re2clex\\cpp_re.inc"
+#line 279 "cpp.re"
+ { BOOST_WAVE_RET(T_SPACE); }
+#line 706 "cpp_re.inc"
 yy84:
- yych = *++YYCURSOR;
- goto yy95;
+ yych = *++YYCURSOR;
+ goto yy95;
 yy85:
- ++YYCURSOR;
+ ++YYCURSOR;
 yy86:
-#line 282 "..\\..\\src\\cpplexer\\re2clex\\cpp.re"
- {
+#line 282 "cpp.re"
+ {
         s->line++;
         cursor.column = 1;
         BOOST_WAVE_RET(T_NEWLINE);
     }
-#line 720 "..\\..\\src\\cpplexer\\re2clex\\cpp_re.inc"
+#line 719 "cpp_re.inc"
 yy87:
- yych = *++YYCURSOR;
- if(yych == 0x0A) goto yy93;
- goto yy86;
+ yych = *++YYCURSOR;
+ if(yych == 0x0A) goto yy93;
+ goto yy86;
 yy88:
- ++YYCURSOR;
-#line 289 "..\\..\\src\\cpplexer\\re2clex\\cpp.re"
- {
+ ++YYCURSOR;
+#line 289 "cpp.re"
+ {
         if (s->eof && cursor != s->eof)
         {
             BOOST_WAVE_UPDATE_CURSOR(); // adjust the input cursor
@@ -733,2426 +732,2426 @@
         }
         BOOST_WAVE_RET(T_EOF);
     }
-#line 737 "..\\..\\src\\cpplexer\\re2clex\\cpp_re.inc"
+#line 736 "cpp_re.inc"
 yy90:
- yych = *++YYCURSOR;
- goto yy79;
+ yych = *++YYCURSOR;
+ goto yy79;
 yy91:
- ++YYCURSOR;
-#line 302 "..\\..\\src\\cpplexer\\re2clex\\cpp.re"
- {
+ ++YYCURSOR;
+#line 302 "cpp.re"
+ {
         // flag the error
         BOOST_WAVE_UPDATE_CURSOR(); // adjust the input cursor
         (*s->error_proc)(s, lexing_exception::generic_lexing_error,
             "invalid character '\\%03o' in input stream", *--YYCURSOR);
     }
-#line 750 "..\\..\\src\\cpplexer\\re2clex\\cpp_re.inc"
+#line 749 "cpp_re.inc"
 yy93:
- yych = *++YYCURSOR;
- goto yy86;
+ yych = *++YYCURSOR;
+ goto yy86;
 yy94:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
 yy95:
- if(yybm[256+yych] & 16) {
- goto yy94;
- }
- goto yy83;
+ if(yybm[256+yych] & 16) {
+ goto yy94;
+ }
+ goto yy83;
 yy96:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
 yy97:
- if(yybm[256+yych] & 32) {
- goto yy96;
- }
- if(yych <= '!') goto yy98;
- if(yych <= '"') goto yy101;
- if(yych <= '[') goto yy99;
- goto yy100;
+ if(yybm[256+yych] & 32) {
+ goto yy96;
+ }
+ if(yych <= '!') goto yy98;
+ if(yych <= '"') goto yy101;
+ if(yych <= '[') goto yy99;
+ goto yy100;
 yy98:
- YYCURSOR = YYMARKER;
- if(yyaccept <= 51) {
- if(yyaccept <= 25) {
- if(yyaccept <= 12) {
- if(yyaccept <= 6) {
- if(yyaccept <= 3) {
- if(yyaccept <= 1) {
- if(yyaccept <= 0) {
- goto yy5;
- } else {
- goto yy9;
- }
+ YYCURSOR = YYMARKER;
+ if(yyaccept <= 51) {
+ if(yyaccept <= 25) {
+ if(yyaccept <= 12) {
+ if(yyaccept <= 6) {
+ if(yyaccept <= 3) {
+ if(yyaccept <= 1) {
+ if(yyaccept <= 0) {
+ goto yy5;
                             } else {
- if(yyaccept <= 2) {
- goto yy32;
- } else {
- goto yy46;
- }
+ goto yy9;
                             }
                         } else {
- if(yyaccept <= 5) {
- if(yyaccept <= 4) {
- goto yy65;
- } else {
- goto yy79;
- }
+ if(yyaccept <= 2) {
+ goto yy32;
                             } else {
- goto yy102;
+ goto yy46;
                             }
                         }
                     } else {
- if(yyaccept <= 9) {
- if(yyaccept <= 8) {
- if(yyaccept <= 7) {
- goto yy152;
- } else {
- goto yy239;
- }
+ if(yyaccept <= 5) {
+ if(yyaccept <= 4) {
+ goto yy65;
+ } else {
+ goto yy79;
+ }
+ } else {
+ goto yy102;
+ }
+ }
+ } else {
+ if(yyaccept <= 9) {
+ if(yyaccept <= 8) {
+ if(yyaccept <= 7) {
+ goto yy152;
                             } else {
- goto yy243;
+ goto yy239;
                             }
                         } else {
- if(yyaccept <= 11) {
- if(yyaccept <= 10) {
- goto yy279;
- } else {
- goto yy294;
- }
+ goto yy243;
+ }
+ } else {
+ if(yyaccept <= 11) {
+ if(yyaccept <= 10) {
+ goto yy279;
                             } else {
- goto yy389;
+ goto yy294;
                             }
+ } else {
+ goto yy389;
                         }
                     }
- } else {
- if(yyaccept <= 19) {
- if(yyaccept <= 16) {
- if(yyaccept <= 14) {
- if(yyaccept <= 13) {
- goto yy417;
- } else {
- goto yy421;
- }
+ }
+ } else {
+ if(yyaccept <= 19) {
+ if(yyaccept <= 16) {
+ if(yyaccept <= 14) {
+ if(yyaccept <= 13) {
+ goto yy417;
                             } else {
- if(yyaccept <= 15) {
- goto yy425;
- } else {
- goto yy456;
- }
+ goto yy421;
                             }
                         } else {
- if(yyaccept <= 18) {
- if(yyaccept <= 17) {
- goto yy462;
- } else {
- goto yy470;
- }
+ if(yyaccept <= 15) {
+ goto yy425;
                             } else {
- goto yy478;
+ goto yy456;
                             }
                         }
                     } else {
- if(yyaccept <= 22) {
- if(yyaccept <= 21) {
- if(yyaccept <= 20) {
- goto yy483;
- } else {
- goto yy488;
- }
+ if(yyaccept <= 18) {
+ if(yyaccept <= 17) {
+ goto yy462;
+ } else {
+ goto yy470;
+ }
+ } else {
+ goto yy478;
+ }
+ }
+ } else {
+ if(yyaccept <= 22) {
+ if(yyaccept <= 21) {
+ if(yyaccept <= 20) {
+ goto yy483;
                             } else {
- goto yy491;
+ goto yy488;
                             }
                         } else {
- if(yyaccept <= 24) {
- if(yyaccept <= 23) {
- goto yy501;
- } else {
- goto yy507;
- }
+ goto yy491;
+ }
+ } else {
+ if(yyaccept <= 24) {
+ if(yyaccept <= 23) {
+ goto yy501;
                             } else {
- goto yy510;
+ goto yy507;
                             }
+ } else {
+ goto yy510;
                         }
                     }
                 }
- } else {
- if(yyaccept <= 38) {
- if(yyaccept <= 32) {
- if(yyaccept <= 29) {
- if(yyaccept <= 27) {
- if(yyaccept <= 26) {
- goto yy517;
- } else {
- goto yy524;
- }
+ }
+ } else {
+ if(yyaccept <= 38) {
+ if(yyaccept <= 32) {
+ if(yyaccept <= 29) {
+ if(yyaccept <= 27) {
+ if(yyaccept <= 26) {
+ goto yy517;
                             } else {
- if(yyaccept <= 28) {
- goto yy526;
- } else {
- goto yy528;
- }
+ goto yy524;
                             }
                         } else {
- if(yyaccept <= 31) {
- if(yyaccept <= 30) {
- goto yy530;
- } else {
- goto yy536;
- }
+ if(yyaccept <= 28) {
+ goto yy526;
                             } else {
- goto yy542;
+ goto yy528;
                             }
                         }
                     } else {
- if(yyaccept <= 35) {
- if(yyaccept <= 34) {
- if(yyaccept <= 33) {
- goto yy552;
- } else {
- goto yy554;
- }
+ if(yyaccept <= 31) {
+ if(yyaccept <= 30) {
+ goto yy530;
+ } else {
+ goto yy536;
+ }
+ } else {
+ goto yy542;
+ }
+ }
+ } else {
+ if(yyaccept <= 35) {
+ if(yyaccept <= 34) {
+ if(yyaccept <= 33) {
+ goto yy552;
                             } else {
- goto yy560;
+ goto yy554;
                             }
                         } else {
- if(yyaccept <= 37) {
- if(yyaccept <= 36) {
- goto yy566;
- } else {
- goto yy574;
- }
+ goto yy560;
+ }
+ } else {
+ if(yyaccept <= 37) {
+ if(yyaccept <= 36) {
+ goto yy566;
                             } else {
- goto yy577;
+ goto yy574;
                             }
+ } else {
+ goto yy577;
                         }
                     }
- } else {
- if(yyaccept <= 45) {
- if(yyaccept <= 42) {
- if(yyaccept <= 40) {
- if(yyaccept <= 39) {
- goto yy590;
- } else {
- goto yy592;
- }
+ }
+ } else {
+ if(yyaccept <= 45) {
+ if(yyaccept <= 42) {
+ if(yyaccept <= 40) {
+ if(yyaccept <= 39) {
+ goto yy590;
                             } else {
- if(yyaccept <= 41) {
- goto yy595;
- } else {
- goto yy598;
- }
+ goto yy592;
                             }
                         } else {
- if(yyaccept <= 44) {
- if(yyaccept <= 43) {
- goto yy600;
- } else {
- goto yy605;
- }
+ if(yyaccept <= 41) {
+ goto yy595;
                             } else {
- goto yy607;
+ goto yy598;
                             }
                         }
                     } else {
- if(yyaccept <= 48) {
- if(yyaccept <= 47) {
- if(yyaccept <= 46) {
- goto yy614;
- } else {
- goto yy623;
- }
+ if(yyaccept <= 44) {
+ if(yyaccept <= 43) {
+ goto yy600;
+ } else {
+ goto yy605;
+ }
+ } else {
+ goto yy607;
+ }
+ }
+ } else {
+ if(yyaccept <= 48) {
+ if(yyaccept <= 47) {
+ if(yyaccept <= 46) {
+ goto yy614;
                             } else {
- goto yy629;
+ goto yy623;
                             }
                         } else {
- if(yyaccept <= 50) {
- if(yyaccept <= 49) {
- goto yy633;
- } else {
- goto yy639;
- }
+ goto yy629;
+ }
+ } else {
+ if(yyaccept <= 50) {
+ if(yyaccept <= 49) {
+ goto yy633;
                             } else {
- goto yy645;
+ goto yy639;
                             }
+ } else {
+ goto yy645;
                         }
                     }
                 }
             }
- } else {
- if(yyaccept <= 77) {
- if(yyaccept <= 64) {
- if(yyaccept <= 58) {
- if(yyaccept <= 55) {
- if(yyaccept <= 53) {
- if(yyaccept <= 52) {
- goto yy649;
- } else {
- goto yy653;
- }
+ }
+ } else {
+ if(yyaccept <= 77) {
+ if(yyaccept <= 64) {
+ if(yyaccept <= 58) {
+ if(yyaccept <= 55) {
+ if(yyaccept <= 53) {
+ if(yyaccept <= 52) {
+ goto yy649;
                             } else {
- if(yyaccept <= 54) {
- goto yy661;
- } else {
- goto yy675;
- }
+ goto yy653;
                             }
                         } else {
- if(yyaccept <= 57) {
- if(yyaccept <= 56) {
- goto yy681;
- } else {
- goto yy688;
- }
+ if(yyaccept <= 54) {
+ goto yy661;
                             } else {
- goto yy697;
+ goto yy675;
                             }
                         }
                     } else {
- if(yyaccept <= 61) {
- if(yyaccept <= 60) {
- if(yyaccept <= 59) {
- goto yy702;
- } else {
- goto yy705;
- }
+ if(yyaccept <= 57) {
+ if(yyaccept <= 56) {
+ goto yy681;
+ } else {
+ goto yy688;
+ }
+ } else {
+ goto yy697;
+ }
+ }
+ } else {
+ if(yyaccept <= 61) {
+ if(yyaccept <= 60) {
+ if(yyaccept <= 59) {
+ goto yy702;
                             } else {
- goto yy709;
+ goto yy705;
                             }
                         } else {
- if(yyaccept <= 63) {
- if(yyaccept <= 62) {
- goto yy716;
- } else {
- goto yy721;
- }
+ goto yy709;
+ }
+ } else {
+ if(yyaccept <= 63) {
+ if(yyaccept <= 62) {
+ goto yy716;
                             } else {
- goto yy725;
+ goto yy721;
                             }
+ } else {
+ goto yy725;
                         }
                     }
- } else {
- if(yyaccept <= 71) {
- if(yyaccept <= 68) {
- if(yyaccept <= 66) {
- if(yyaccept <= 65) {
- goto yy727;
- } else {
- goto yy735;
- }
+ }
+ } else {
+ if(yyaccept <= 71) {
+ if(yyaccept <= 68) {
+ if(yyaccept <= 66) {
+ if(yyaccept <= 65) {
+ goto yy727;
                             } else {
- if(yyaccept <= 67) {
- goto yy742;
- } else {
- goto yy746;
- }
+ goto yy735;
                             }
                         } else {
- if(yyaccept <= 70) {
- if(yyaccept <= 69) {
- goto yy748;
- } else {
- goto yy753;
- }
+ if(yyaccept <= 67) {
+ goto yy742;
                             } else {
- goto yy757;
+ goto yy746;
                             }
                         }
                     } else {
- if(yyaccept <= 74) {
- if(yyaccept <= 73) {
- if(yyaccept <= 72) {
- goto yy762;
- } else {
- goto yy766;
- }
+ if(yyaccept <= 70) {
+ if(yyaccept <= 69) {
+ goto yy748;
+ } else {
+ goto yy753;
+ }
+ } else {
+ goto yy757;
+ }
+ }
+ } else {
+ if(yyaccept <= 74) {
+ if(yyaccept <= 73) {
+ if(yyaccept <= 72) {
+ goto yy762;
                             } else {
- goto yy775;
+ goto yy766;
                             }
                         } else {
- if(yyaccept <= 76) {
- if(yyaccept <= 75) {
- goto yy777;
- } else {
- goto yy781;
- }
+ goto yy775;
+ }
+ } else {
+ if(yyaccept <= 76) {
+ if(yyaccept <= 75) {
+ goto yy777;
                             } else {
- goto yy785;
+ goto yy781;
                             }
+ } else {
+ goto yy785;
                         }
                     }
                 }
- } else {
- if(yyaccept <= 90) {
- if(yyaccept <= 84) {
- if(yyaccept <= 81) {
- if(yyaccept <= 79) {
- if(yyaccept <= 78) {
- goto yy794;
- } else {
- goto yy799;
- }
+ }
+ } else {
+ if(yyaccept <= 90) {
+ if(yyaccept <= 84) {
+ if(yyaccept <= 81) {
+ if(yyaccept <= 79) {
+ if(yyaccept <= 78) {
+ goto yy794;
                             } else {
- if(yyaccept <= 80) {
- goto yy804;
- } else {
- goto yy807;
- }
+ goto yy799;
                             }
                         } else {
- if(yyaccept <= 83) {
- if(yyaccept <= 82) {
- goto yy810;
- } else {
- goto yy813;
- }
+ if(yyaccept <= 80) {
+ goto yy804;
                             } else {
- goto yy825;
+ goto yy807;
                             }
                         }
                     } else {
- if(yyaccept <= 87) {
- if(yyaccept <= 86) {
- if(yyaccept <= 85) {
- goto yy830;
- } else {
- goto yy836;
- }
+ if(yyaccept <= 83) {
+ if(yyaccept <= 82) {
+ goto yy810;
+ } else {
+ goto yy813;
+ }
+ } else {
+ goto yy825;
+ }
+ }
+ } else {
+ if(yyaccept <= 87) {
+ if(yyaccept <= 86) {
+ if(yyaccept <= 85) {
+ goto yy830;
                             } else {
- goto yy841;
+ goto yy836;
                             }
                         } else {
- if(yyaccept <= 89) {
- if(yyaccept <= 88) {
- goto yy850;
- } else {
- goto yy857;
- }
+ goto yy841;
+ }
+ } else {
+ if(yyaccept <= 89) {
+ if(yyaccept <= 88) {
+ goto yy850;
                             } else {
- goto yy859;
+ goto yy857;
                             }
+ } else {
+ goto yy859;
                         }
                     }
- } else {
- if(yyaccept <= 97) {
- if(yyaccept <= 94) {
- if(yyaccept <= 92) {
- if(yyaccept <= 91) {
- goto yy865;
- } else {
- goto yy869;
- }
+ }
+ } else {
+ if(yyaccept <= 97) {
+ if(yyaccept <= 94) {
+ if(yyaccept <= 92) {
+ if(yyaccept <= 91) {
+ goto yy865;
                             } else {
- if(yyaccept <= 93) {
- goto yy872;
- } else {
- goto yy877;
- }
+ goto yy869;
                             }
                         } else {
- if(yyaccept <= 96) {
- if(yyaccept <= 95) {
- goto yy879;
- } else {
- goto yy886;
- }
+ if(yyaccept <= 93) {
+ goto yy872;
                             } else {
- goto yy889;
+ goto yy877;
                             }
                         }
                     } else {
- if(yyaccept <= 100) {
- if(yyaccept <= 99) {
- if(yyaccept <= 98) {
- goto yy894;
- } else {
- goto yy897;
- }
+ if(yyaccept <= 96) {
+ if(yyaccept <= 95) {
+ goto yy879;
+ } else {
+ goto yy886;
+ }
+ } else {
+ goto yy889;
+ }
+ }
+ } else {
+ if(yyaccept <= 100) {
+ if(yyaccept <= 99) {
+ if(yyaccept <= 98) {
+ goto yy894;
                             } else {
- goto yy903;
+ goto yy897;
                             }
                         } else {
- if(yyaccept <= 102) {
- if(yyaccept <= 101) {
- goto yy905;
- } else {
- goto yy907;
- }
+ goto yy903;
+ }
+ } else {
+ if(yyaccept <= 102) {
+ if(yyaccept <= 101) {
+ goto yy905;
                             } else {
- goto yy911;
+ goto yy907;
                             }
+ } else {
+ goto yy911;
                         }
                     }
                 }
             }
         }
+ }
 yy99:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yybm[256+yych] & 32) {
- goto yy96;
- }
- if(yych <= '!') goto yy98;
- if(yych <= '"') goto yy101;
- if(yych <= '[') goto yy112;
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yybm[256+yych] & 32) {
+ goto yy96;
+ }
+ if(yych <= '!') goto yy98;
+ if(yych <= '"') goto yy101;
+ if(yych <= '[') goto yy112;
 yy100:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '`') {
- if(yych <= '7') {
- if(yych <= '&') {
- if(yych == '"') goto yy96;
- goto yy98;
- } else {
- if(yych <= '\'') goto yy96;
- if(yych <= '/') goto yy98;
- goto yy107;
- }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '`') {
+ if(yych <= '7') {
+ if(yych <= '&') {
+ if(yych == '"') goto yy96;
+ goto yy98;
             } else {
- if(yych <= 'T') {
- if(yych == '?') goto yy105;
- goto yy98;
- } else {
- if(yych <= 'U') goto yy104;
- if(yych == '\\') goto yy96;
- goto yy98;
- }
+ if(yych <= '\'') goto yy96;
+ if(yych <= '/') goto yy98;
+ goto yy107;
             }
         } else {
- if(yych <= 'r') {
- if(yych <= 'f') {
- if(yych <= 'b') goto yy96;
- if(yych <= 'e') goto yy98;
- goto yy96;
- } else {
- if(yych == 'n') goto yy96;
- if(yych <= 'q') goto yy98;
- goto yy96;
- }
+ if(yych <= 'T') {
+ if(yych == '?') goto yy105;
+ goto yy98;
             } else {
- if(yych <= 'u') {
- if(yych <= 's') goto yy98;
- if(yych <= 't') goto yy96;
- goto yy103;
- } else {
- if(yych <= 'v') goto yy96;
- if(yych == 'x') goto yy106;
- goto yy98;
- }
+ if(yych <= 'U') goto yy104;
+ if(yych == '\\') goto yy96;
+ goto yy98;
+ }
+ }
+ } else {
+ if(yych <= 'r') {
+ if(yych <= 'f') {
+ if(yych <= 'b') goto yy96;
+ if(yych <= 'e') goto yy98;
+ goto yy96;
+ } else {
+ if(yych == 'n') goto yy96;
+ if(yych <= 'q') goto yy98;
+ goto yy96;
+ }
+ } else {
+ if(yych <= 'u') {
+ if(yych <= 's') goto yy98;
+ if(yych <= 't') goto yy96;
+ goto yy103;
+ } else {
+ if(yych <= 'v') goto yy96;
+ if(yych == 'x') goto yy106;
+ goto yy98;
             }
         }
+ }
 yy101:
- ++YYCURSOR;
+ ++YYCURSOR;
 yy102:
-#line 249 "..\\..\\src\\cpplexer\\re2clex\\cpp.re"
- { BOOST_WAVE_RET(T_STRINGLIT); }
-#line 1252 "..\\..\\src\\cpplexer\\re2clex\\cpp_re.inc"
+#line 249 "cpp.re"
+ { BOOST_WAVE_RET(T_STRINGLIT); }
+#line 1251 "cpp_re.inc"
 yy103:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych <= '9') goto yy138;
- goto yy98;
- } else {
- if(yych <= 'F') goto yy138;
- if(yych <= '`') goto yy98;
- if(yych <= 'f') goto yy138;
- goto yy98;
- }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '@') {
+ if(yych <= '/') goto yy98;
+ if(yych <= '9') goto yy138;
+ goto yy98;
+ } else {
+ if(yych <= 'F') goto yy138;
+ if(yych <= '`') goto yy98;
+ if(yych <= 'f') goto yy138;
+ goto yy98;
+ }
 yy104:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych <= '9') goto yy131;
- goto yy98;
- } else {
- if(yych <= 'F') goto yy131;
- if(yych <= '`') goto yy98;
- if(yych <= 'f') goto yy131;
- goto yy98;
- }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '@') {
+ if(yych <= '/') goto yy98;
+ if(yych <= '9') goto yy131;
+ goto yy98;
+ } else {
+ if(yych <= 'F') goto yy131;
+ if(yych <= '`') goto yy98;
+ if(yych <= 'f') goto yy131;
+ goto yy98;
+ }
 yy105:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yybm[256+yych] & 32) {
- goto yy96;
- }
- if(yych <= '!') goto yy98;
- if(yych <= '"') goto yy101;
- if(yych <= '[') goto yy111;
- goto yy100;
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yybm[256+yych] & 32) {
+ goto yy96;
+ }
+ if(yych <= '!') goto yy98;
+ if(yych <= '"') goto yy101;
+ if(yych <= '[') goto yy111;
+ goto yy100;
 yy106:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yybm[256+yych] & 64) {
- goto yy109;
- }
- goto yy98;
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yybm[256+yych] & 64) {
+ goto yy109;
+ }
+ goto yy98;
 yy107:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '"') {
- if(yych <= 0x0A) {
- if(yych == 0x09) goto yy96;
- goto yy98;
- } else {
- if(yych <= 0x0C) goto yy96;
- if(yych <= 0x1F) goto yy98;
- if(yych <= '!') goto yy96;
- goto yy101;
- }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '"') {
+ if(yych <= 0x0A) {
+ if(yych == 0x09) goto yy96;
+ goto yy98;
         } else {
- if(yych <= '>') {
- if(yych <= '/') goto yy96;
- if(yych >= '8') goto yy96;
- } else {
- if(yych <= '?') goto yy99;
- if(yych == '\\') goto yy100;
- goto yy96;
- }
+ if(yych <= 0x0C) goto yy96;
+ if(yych <= 0x1F) goto yy98;
+ if(yych <= '!') goto yy96;
+ goto yy101;
         }
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yybm[256+yych] & 32) {
+ } else {
+ if(yych <= '>') {
+ if(yych <= '/') goto yy96;
+ if(yych >= '8') goto yy96;
+ } else {
+ if(yych <= '?') goto yy99;
+ if(yych == '\\') goto yy100;
             goto yy96;
         }
- if(yych <= '!') goto yy98;
- if(yych <= '"') goto yy101;
- if(yych <= '[') goto yy99;
- goto yy100;
+ }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yybm[256+yych] & 32) {
+ goto yy96;
+ }
+ if(yych <= '!') goto yy98;
+ if(yych <= '"') goto yy101;
+ if(yych <= '[') goto yy99;
+ goto yy100;
 yy109:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yybm[256+yych] & 64) {
- goto yy109;
- }
- if(yych <= '!') {
- if(yych <= 0x0A) {
- if(yych == 0x09) goto yy96;
- goto yy98;
- } else {
- if(yych <= 0x0C) goto yy96;
- if(yych <= 0x1F) goto yy98;
- goto yy96;
- }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yybm[256+yych] & 64) {
+ goto yy109;
+ }
+ if(yych <= '!') {
+ if(yych <= 0x0A) {
+ if(yych == 0x09) goto yy96;
+ goto yy98;
         } else {
- if(yych <= '?') {
- if(yych <= '"') goto yy101;
- if(yych <= '>') goto yy96;
- goto yy99;
- } else {
- if(yych == '\\') goto yy100;
- goto yy96;
- }
+ if(yych <= 0x0C) goto yy96;
+ if(yych <= 0x1F) goto yy98;
+ goto yy96;
         }
-yy111:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yybm[256+yych] & 32) {
+ } else {
+ if(yych <= '?') {
+ if(yych <= '"') goto yy101;
+ if(yych <= '>') goto yy96;
+ goto yy99;
+ } else {
+ if(yych == '\\') goto yy100;
             goto yy96;
         }
- if(yych <= '!') goto yy98;
- if(yych <= '"') goto yy101;
- if(yych >= '\\') goto yy100;
+ }
+yy111:
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yybm[256+yych] & 32) {
+ goto yy96;
+ }
+ if(yych <= '!') goto yy98;
+ if(yych <= '"') goto yy101;
+ if(yych >= '\\') goto yy100;
 yy112:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yybm[256+yych] & 128) {
- goto yy112;
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yybm[256+yych] & 128) {
+ goto yy112;
+ }
+ if(yych <= '!') {
+ if(yych <= 0x0A) {
+ if(yych == 0x09) goto yy96;
+ goto yy98;
+ } else {
+ if(yych <= 0x0C) goto yy96;
+ if(yych <= 0x1F) goto yy98;
+ goto yy96;
         }
- if(yych <= '!') {
- if(yych <= 0x0A) {
- if(yych == 0x09) goto yy96;
- goto yy98;
- } else {
- if(yych <= 0x0C) goto yy96;
- if(yych <= 0x1F) goto yy98;
- goto yy96;
- }
+ } else {
+ if(yych <= '/') {
+ if(yych <= '"') goto yy101;
+ if(yych <= '.') goto yy96;
         } else {
- if(yych <= '/') {
- if(yych <= '"') goto yy101;
- if(yych <= '.') goto yy96;
- } else {
- if(yych == '\\') goto yy100;
- goto yy96;
- }
+ if(yych == '\\') goto yy100;
+ goto yy96;
         }
+ }
 yy114:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yybm[0+yych] & 1) {
- goto yy114;
- }
- if(yych <= '7') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy96;
- if(yych <= 0x0A) goto yy98;
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yybm[0+yych] & 1) {
+ goto yy114;
+ }
+ if(yych <= '7') {
+ if(yych <= 0x0C) {
+ if(yych == 0x09) goto yy96;
+ if(yych <= 0x0A) goto yy98;
+ goto yy96;
+ } else {
+ if(yych <= '!') {
+ if(yych <= 0x1F) goto yy98;
                 goto yy96;
             } else {
- if(yych <= '!') {
- if(yych <= 0x1F) goto yy98;
- goto yy96;
- } else {
- if(yych <= '"') goto yy118;
- if(yych <= '/') goto yy96;
- goto yy107;
- }
+ if(yych <= '"') goto yy118;
+ if(yych <= '/') goto yy96;
+ goto yy107;
             }
+ }
+ } else {
+ if(yych <= 'U') {
+ if(yych == '?') goto yy119;
+ if(yych <= 'T') goto yy96;
+ goto yy117;
         } else {
- if(yych <= 'U') {
- if(yych == '?') goto yy119;
- if(yych <= 'T') goto yy96;
- goto yy117;
+ if(yych <= 'u') {
+ if(yych <= 't') goto yy96;
             } else {
- if(yych <= 'u') {
- if(yych <= 't') goto yy96;
- } else {
- if(yych == 'x') goto yy109;
- goto yy96;
- }
+ if(yych == 'x') goto yy109;
+ goto yy96;
             }
         }
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy96;
- if(yych <= 0x0A) goto yy98;
+ }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '9') {
+ if(yych <= 0x0C) {
+ if(yych == 0x09) goto yy96;
+ if(yych <= 0x0A) goto yy98;
+ goto yy96;
+ } else {
+ if(yych <= '!') {
+ if(yych <= 0x1F) goto yy98;
                 goto yy96;
             } else {
- if(yych <= '!') {
- if(yych <= 0x1F) goto yy98;
- goto yy96;
- } else {
- if(yych <= '"') goto yy101;
- if(yych <= '/') goto yy96;
- goto yy128;
- }
+ if(yych <= '"') goto yy101;
+ if(yych <= '/') goto yy96;
+ goto yy128;
             }
+ }
+ } else {
+ if(yych <= 'F') {
+ if(yych == '?') goto yy99;
+ if(yych <= '@') goto yy96;
+ goto yy128;
         } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy99;
- if(yych <= '@') goto yy96;
- goto yy128;
+ if(yych <= '\\') {
+ if(yych <= '[') goto yy96;
+ goto yy100;
             } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy96;
- goto yy100;
- } else {
- if(yych <= '`') goto yy96;
- if(yych <= 'f') goto yy128;
- goto yy96;
- }
+ if(yych <= '`') goto yy96;
+ if(yych <= 'f') goto yy128;
+ goto yy96;
             }
         }
+ }
 yy117:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy96;
- if(yych <= 0x0A) goto yy98;
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '9') {
+ if(yych <= 0x0C) {
+ if(yych == 0x09) goto yy96;
+ if(yych <= 0x0A) goto yy98;
+ goto yy96;
+ } else {
+ if(yych <= '!') {
+ if(yych <= 0x1F) goto yy98;
                 goto yy96;
             } else {
- if(yych <= '!') {
- if(yych <= 0x1F) goto yy98;
- goto yy96;
- } else {
- if(yych <= '"') goto yy101;
- if(yych <= '/') goto yy96;
- goto yy121;
- }
+ if(yych <= '"') goto yy101;
+ if(yych <= '/') goto yy96;
+ goto yy121;
             }
+ }
+ } else {
+ if(yych <= 'F') {
+ if(yych == '?') goto yy99;
+ if(yych <= '@') goto yy96;
+ goto yy121;
         } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy99;
- if(yych <= '@') goto yy96;
- goto yy121;
+ if(yych <= '\\') {
+ if(yych <= '[') goto yy96;
+ goto yy100;
             } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy96;
- goto yy100;
- } else {
- if(yych <= '`') goto yy96;
- if(yych <= 'f') goto yy121;
- goto yy96;
- }
+ if(yych <= '`') goto yy96;
+ if(yych <= 'f') goto yy121;
+ goto yy96;
             }
         }
+ }
 yy118:
- yyaccept = 6;
- YYMARKER = ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yybm[256+yych] & 32) {
- goto yy96;
- }
- if(yych <= '!') goto yy102;
- if(yych <= '"') goto yy101;
- if(yych <= '[') goto yy99;
- goto yy100;
+ yyaccept = 6;
+ YYMARKER = ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yybm[256+yych] & 32) {
+ goto yy96;
+ }
+ if(yych <= '!') goto yy102;
+ if(yych <= '"') goto yy101;
+ if(yych <= '[') goto yy99;
+ goto yy100;
 yy119:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yybm[256+yych] & 32) {
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yybm[256+yych] & 32) {
+ goto yy96;
+ }
+ if(yych <= '!') goto yy98;
+ if(yych <= '"') goto yy101;
+ if(yych >= '\\') goto yy100;
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yybm[256+yych] & 128) {
+ goto yy112;
+ }
+ if(yych <= '!') {
+ if(yych <= 0x0A) {
+ if(yych == 0x09) goto yy96;
+ goto yy98;
+ } else {
+ if(yych <= 0x0C) goto yy96;
+ if(yych <= 0x1F) goto yy98;
             goto yy96;
         }
- if(yych <= '!') goto yy98;
- if(yych <= '"') goto yy101;
- if(yych >= '\\') goto yy100;
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yybm[256+yych] & 128) {
- goto yy112;
- }
- if(yych <= '!') {
- if(yych <= 0x0A) {
- if(yych == 0x09) goto yy96;
- goto yy98;
- } else {
- if(yych <= 0x0C) goto yy96;
- if(yych <= 0x1F) goto yy98;
- goto yy96;
- }
+ } else {
+ if(yych <= '/') {
+ if(yych <= '"') goto yy101;
+ if(yych <= '.') goto yy96;
+ goto yy114;
         } else {
- if(yych <= '/') {
- if(yych <= '"') goto yy101;
- if(yych <= '.') goto yy96;
- goto yy114;
- } else {
- if(yych == '\\') goto yy100;
- goto yy96;
- }
+ if(yych == '\\') goto yy100;
+ goto yy96;
         }
+ }
 yy121:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy96;
- if(yych <= 0x0A) goto yy98;
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '9') {
+ if(yych <= 0x0C) {
+ if(yych == 0x09) goto yy96;
+ if(yych <= 0x0A) goto yy98;
+ goto yy96;
+ } else {
+ if(yych <= '!') {
+ if(yych <= 0x1F) goto yy98;
                 goto yy96;
             } else {
- if(yych <= '!') {
- if(yych <= 0x1F) goto yy98;
- goto yy96;
- } else {
- if(yych <= '"') goto yy101;
- if(yych <= '/') goto yy96;
- }
+ if(yych <= '"') goto yy101;
+ if(yych <= '/') goto yy96;
             }
+ }
+ } else {
+ if(yych <= 'F') {
+ if(yych == '?') goto yy99;
+ if(yych <= '@') goto yy96;
         } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy99;
- if(yych <= '@') goto yy96;
- } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy96;
- goto yy100;
- } else {
- if(yych <= '`') goto yy96;
- if(yych >= 'g') goto yy96;
- }
+ if(yych <= '\\') {
+ if(yych <= '[') goto yy96;
+ goto yy100;
+ } else {
+ if(yych <= '`') goto yy96;
+ if(yych >= 'g') goto yy96;
             }
         }
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy96;
- if(yych <= 0x0A) goto yy98;
+ }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '9') {
+ if(yych <= 0x0C) {
+ if(yych == 0x09) goto yy96;
+ if(yych <= 0x0A) goto yy98;
+ goto yy96;
+ } else {
+ if(yych <= '!') {
+ if(yych <= 0x1F) goto yy98;
                 goto yy96;
             } else {
- if(yych <= '!') {
- if(yych <= 0x1F) goto yy98;
- goto yy96;
- } else {
- if(yych <= '"') goto yy101;
- if(yych <= '/') goto yy96;
- }
+ if(yych <= '"') goto yy101;
+ if(yych <= '/') goto yy96;
             }
+ }
+ } else {
+ if(yych <= 'F') {
+ if(yych == '?') goto yy99;
+ if(yych <= '@') goto yy96;
         } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy99;
- if(yych <= '@') goto yy96;
- } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy96;
- goto yy100;
- } else {
- if(yych <= '`') goto yy96;
- if(yych >= 'g') goto yy96;
- }
+ if(yych <= '\\') {
+ if(yych <= '[') goto yy96;
+ goto yy100;
+ } else {
+ if(yych <= '`') goto yy96;
+ if(yych >= 'g') goto yy96;
             }
         }
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy96;
- if(yych <= 0x0A) goto yy98;
+ }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '9') {
+ if(yych <= 0x0C) {
+ if(yych == 0x09) goto yy96;
+ if(yych <= 0x0A) goto yy98;
+ goto yy96;
+ } else {
+ if(yych <= '!') {
+ if(yych <= 0x1F) goto yy98;
                 goto yy96;
             } else {
- if(yych <= '!') {
- if(yych <= 0x1F) goto yy98;
- goto yy96;
- } else {
- if(yych <= '"') goto yy101;
- if(yych <= '/') goto yy96;
- }
+ if(yych <= '"') goto yy101;
+ if(yych <= '/') goto yy96;
             }
+ }
+ } else {
+ if(yych <= 'F') {
+ if(yych == '?') goto yy99;
+ if(yych <= '@') goto yy96;
         } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy99;
- if(yych <= '@') goto yy96;
- } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy96;
- goto yy100;
- } else {
- if(yych <= '`') goto yy96;
- if(yych >= 'g') goto yy96;
- }
+ if(yych <= '\\') {
+ if(yych <= '[') goto yy96;
+ goto yy100;
+ } else {
+ if(yych <= '`') goto yy96;
+ if(yych >= 'g') goto yy96;
             }
         }
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy96;
- if(yych <= 0x0A) goto yy98;
+ }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '9') {
+ if(yych <= 0x0C) {
+ if(yych == 0x09) goto yy96;
+ if(yych <= 0x0A) goto yy98;
+ goto yy96;
+ } else {
+ if(yych <= '!') {
+ if(yych <= 0x1F) goto yy98;
                 goto yy96;
             } else {
- if(yych <= '!') {
- if(yych <= 0x1F) goto yy98;
- goto yy96;
- } else {
- if(yych <= '"') goto yy101;
- if(yych <= '/') goto yy96;
- }
+ if(yych <= '"') goto yy101;
+ if(yych <= '/') goto yy96;
             }
+ }
+ } else {
+ if(yych <= 'F') {
+ if(yych == '?') goto yy99;
+ if(yych <= '@') goto yy96;
         } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy99;
- if(yych <= '@') goto yy96;
- } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy96;
- goto yy100;
- } else {
- if(yych <= '`') goto yy96;
- if(yych >= 'g') goto yy96;
- }
+ if(yych <= '\\') {
+ if(yych <= '[') goto yy96;
+ goto yy100;
+ } else {
+ if(yych <= '`') goto yy96;
+ if(yych >= 'g') goto yy96;
             }
         }
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy96;
- if(yych <= 0x0A) goto yy98;
+ }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '9') {
+ if(yych <= 0x0C) {
+ if(yych == 0x09) goto yy96;
+ if(yych <= 0x0A) goto yy98;
+ goto yy96;
+ } else {
+ if(yych <= '!') {
+ if(yych <= 0x1F) goto yy98;
                 goto yy96;
             } else {
- if(yych <= '!') {
- if(yych <= 0x1F) goto yy98;
- goto yy96;
- } else {
- if(yych <= '"') goto yy101;
- if(yych <= '/') goto yy96;
- }
+ if(yych <= '"') goto yy101;
+ if(yych <= '/') goto yy96;
             }
+ }
+ } else {
+ if(yych <= 'F') {
+ if(yych == '?') goto yy99;
+ if(yych <= '@') goto yy96;
         } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy99;
- if(yych <= '@') goto yy96;
- } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy96;
- goto yy100;
- } else {
- if(yych <= '`') goto yy96;
- if(yych >= 'g') goto yy96;
- }
+ if(yych <= '\\') {
+ if(yych <= '[') goto yy96;
+ goto yy100;
+ } else {
+ if(yych <= '`') goto yy96;
+ if(yych >= 'g') goto yy96;
             }
         }
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy96;
- if(yych <= 0x0A) goto yy98;
+ }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '9') {
+ if(yych <= 0x0C) {
+ if(yych == 0x09) goto yy96;
+ if(yych <= 0x0A) goto yy98;
+ goto yy96;
+ } else {
+ if(yych <= '!') {
+ if(yych <= 0x1F) goto yy98;
                 goto yy96;
             } else {
- if(yych <= '!') {
- if(yych <= 0x1F) goto yy98;
- goto yy96;
- } else {
- if(yych <= '"') goto yy101;
- if(yych <= '/') goto yy96;
- }
+ if(yych <= '"') goto yy101;
+ if(yych <= '/') goto yy96;
             }
+ }
+ } else {
+ if(yych <= 'F') {
+ if(yych == '?') goto yy99;
+ if(yych <= '@') goto yy96;
         } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy99;
- if(yych <= '@') goto yy96;
- } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy96;
- goto yy100;
- } else {
- if(yych <= '`') goto yy96;
- if(yych >= 'g') goto yy96;
- }
+ if(yych <= '\\') {
+ if(yych <= '[') goto yy96;
+ goto yy100;
+ } else {
+ if(yych <= '`') goto yy96;
+ if(yych >= 'g') goto yy96;
             }
         }
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yybm[256+yych] & 32) {
- goto yy96;
- }
- if(yych <= '!') goto yy98;
- if(yych <= '"') goto yy101;
- if(yych <= '[') goto yy99;
- goto yy100;
+ }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yybm[256+yych] & 32) {
+ goto yy96;
+ }
+ if(yych <= '!') goto yy98;
+ if(yych <= '"') goto yy101;
+ if(yych <= '[') goto yy99;
+ goto yy100;
 yy128:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy96;
- if(yych <= 0x0A) goto yy98;
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '9') {
+ if(yych <= 0x0C) {
+ if(yych == 0x09) goto yy96;
+ if(yych <= 0x0A) goto yy98;
+ goto yy96;
+ } else {
+ if(yych <= '!') {
+ if(yych <= 0x1F) goto yy98;
                 goto yy96;
             } else {
- if(yych <= '!') {
- if(yych <= 0x1F) goto yy98;
- goto yy96;
- } else {
- if(yych <= '"') goto yy101;
- if(yych <= '/') goto yy96;
- }
+ if(yych <= '"') goto yy101;
+ if(yych <= '/') goto yy96;
             }
+ }
+ } else {
+ if(yych <= 'F') {
+ if(yych == '?') goto yy99;
+ if(yych <= '@') goto yy96;
         } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy99;
- if(yych <= '@') goto yy96;
- } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy96;
- goto yy100;
- } else {
- if(yych <= '`') goto yy96;
- if(yych >= 'g') goto yy96;
- }
+ if(yych <= '\\') {
+ if(yych <= '[') goto yy96;
+ goto yy100;
+ } else {
+ if(yych <= '`') goto yy96;
+ if(yych >= 'g') goto yy96;
             }
         }
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy96;
- if(yych <= 0x0A) goto yy98;
+ }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '9') {
+ if(yych <= 0x0C) {
+ if(yych == 0x09) goto yy96;
+ if(yych <= 0x0A) goto yy98;
+ goto yy96;
+ } else {
+ if(yych <= '!') {
+ if(yych <= 0x1F) goto yy98;
                 goto yy96;
             } else {
- if(yych <= '!') {
- if(yych <= 0x1F) goto yy98;
- goto yy96;
- } else {
- if(yych <= '"') goto yy101;
- if(yych <= '/') goto yy96;
- }
+ if(yych <= '"') goto yy101;
+ if(yych <= '/') goto yy96;
             }
+ }
+ } else {
+ if(yych <= 'F') {
+ if(yych == '?') goto yy99;
+ if(yych <= '@') goto yy96;
         } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy99;
- if(yych <= '@') goto yy96;
- } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy96;
- goto yy100;
- } else {
- if(yych <= '`') goto yy96;
- if(yych >= 'g') goto yy96;
- }
+ if(yych <= '\\') {
+ if(yych <= '[') goto yy96;
+ goto yy100;
+ } else {
+ if(yych <= '`') goto yy96;
+ if(yych >= 'g') goto yy96;
             }
         }
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yybm[256+yych] & 32) {
- goto yy96;
- }
- if(yych <= '!') goto yy98;
- if(yych <= '"') goto yy101;
- if(yych <= '[') goto yy99;
- goto yy100;
+ }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yybm[256+yych] & 32) {
+ goto yy96;
+ }
+ if(yych <= '!') goto yy98;
+ if(yych <= '"') goto yy101;
+ if(yych <= '[') goto yy99;
+ goto yy100;
 yy131:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych >= ':') goto yy98;
- } else {
- if(yych <= 'F') goto yy132;
- if(yych <= '`') goto yy98;
- if(yych >= 'g') goto yy98;
- }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '@') {
+ if(yych <= '/') goto yy98;
+ if(yych >= ':') goto yy98;
+ } else {
+ if(yych <= 'F') goto yy132;
+ if(yych <= '`') goto yy98;
+ if(yych >= 'g') goto yy98;
+ }
 yy132:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych >= ':') goto yy98;
- } else {
- if(yych <= 'F') goto yy133;
- if(yych <= '`') goto yy98;
- if(yych >= 'g') goto yy98;
- }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '@') {
+ if(yych <= '/') goto yy98;
+ if(yych >= ':') goto yy98;
+ } else {
+ if(yych <= 'F') goto yy133;
+ if(yych <= '`') goto yy98;
+ if(yych >= 'g') goto yy98;
+ }
 yy133:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych >= ':') goto yy98;
- } else {
- if(yych <= 'F') goto yy134;
- if(yych <= '`') goto yy98;
- if(yych >= 'g') goto yy98;
- }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '@') {
+ if(yych <= '/') goto yy98;
+ if(yych >= ':') goto yy98;
+ } else {
+ if(yych <= 'F') goto yy134;
+ if(yych <= '`') goto yy98;
+ if(yych >= 'g') goto yy98;
+ }
 yy134:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych >= ':') goto yy98;
- } else {
- if(yych <= 'F') goto yy135;
- if(yych <= '`') goto yy98;
- if(yych >= 'g') goto yy98;
- }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '@') {
+ if(yych <= '/') goto yy98;
+ if(yych >= ':') goto yy98;
+ } else {
+ if(yych <= 'F') goto yy135;
+ if(yych <= '`') goto yy98;
+ if(yych >= 'g') goto yy98;
+ }
 yy135:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych >= ':') goto yy98;
- } else {
- if(yych <= 'F') goto yy136;
- if(yych <= '`') goto yy98;
- if(yych >= 'g') goto yy98;
- }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '@') {
+ if(yych <= '/') goto yy98;
+ if(yych >= ':') goto yy98;
+ } else {
+ if(yych <= 'F') goto yy136;
+ if(yych <= '`') goto yy98;
+ if(yych >= 'g') goto yy98;
+ }
 yy136:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych >= ':') goto yy98;
- } else {
- if(yych <= 'F') goto yy137;
- if(yych <= '`') goto yy98;
- if(yych >= 'g') goto yy98;
- }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '@') {
+ if(yych <= '/') goto yy98;
+ if(yych >= ':') goto yy98;
+ } else {
+ if(yych <= 'F') goto yy137;
+ if(yych <= '`') goto yy98;
+ if(yych >= 'g') goto yy98;
+ }
 yy137:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych <= '9') goto yy96;
- goto yy98;
- } else {
- if(yych <= 'F') goto yy96;
- if(yych <= '`') goto yy98;
- if(yych <= 'f') goto yy96;
- goto yy98;
- }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '@') {
+ if(yych <= '/') goto yy98;
+ if(yych <= '9') goto yy96;
+ goto yy98;
+ } else {
+ if(yych <= 'F') goto yy96;
+ if(yych <= '`') goto yy98;
+ if(yych <= 'f') goto yy96;
+ goto yy98;
+ }
 yy138:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych >= ':') goto yy98;
- } else {
- if(yych <= 'F') goto yy139;
- if(yych <= '`') goto yy98;
- if(yych >= 'g') goto yy98;
- }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '@') {
+ if(yych <= '/') goto yy98;
+ if(yych >= ':') goto yy98;
+ } else {
+ if(yych <= 'F') goto yy139;
+ if(yych <= '`') goto yy98;
+ if(yych >= 'g') goto yy98;
+ }
 yy139:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych >= ':') goto yy98;
- } else {
- if(yych <= 'F') goto yy140;
- if(yych <= '`') goto yy98;
- if(yych >= 'g') goto yy98;
- }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '@') {
+ if(yych <= '/') goto yy98;
+ if(yych >= ':') goto yy98;
+ } else {
+ if(yych <= 'F') goto yy140;
+ if(yych <= '`') goto yy98;
+ if(yych >= 'g') goto yy98;
+ }
 yy140:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych <= '9') goto yy96;
- goto yy98;
- } else {
- if(yych <= 'F') goto yy96;
- if(yych <= '`') goto yy98;
- if(yych <= 'f') goto yy96;
- goto yy98;
- }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '@') {
+ if(yych <= '/') goto yy98;
+ if(yych <= '9') goto yy96;
+ goto yy98;
+ } else {
+ if(yych <= 'F') goto yy96;
+ if(yych <= '`') goto yy98;
+ if(yych <= 'f') goto yy96;
+ goto yy98;
+ }
 yy141:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
 yy142:
- if(yybm[0+yych] & 2) {
- goto yy141;
- }
- if(yych <= '&') goto yy98;
- if(yych <= '\'') goto yy151;
- if(yych >= '\\') goto yy144;
+ if(yybm[0+yych] & 2) {
+ goto yy141;
+ }
+ if(yych <= '&') goto yy98;
+ if(yych <= '\'') goto yy151;
+ if(yych >= '\\') goto yy144;
 yy143:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yybm[0+yych] & 2) {
- goto yy141;
- }
- if(yych <= '&') goto yy98;
- if(yych <= '\'') goto yy151;
- if(yych <= '[') goto yy156;
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yybm[0+yych] & 2) {
+ goto yy141;
+ }
+ if(yych <= '&') goto yy98;
+ if(yych <= '\'') goto yy151;
+ if(yych <= '[') goto yy156;
 yy144:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '`') {
- if(yych <= '7') {
- if(yych <= '&') {
- if(yych == '"') goto yy141;
- goto yy98;
- } else {
- if(yych <= '\'') goto yy141;
- if(yych <= '/') goto yy98;
- goto yy149;
- }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '`') {
+ if(yych <= '7') {
+ if(yych <= '&') {
+ if(yych == '"') goto yy141;
+ goto yy98;
             } else {
- if(yych <= 'T') {
- if(yych == '?') goto yy147;
- goto yy98;
- } else {
- if(yych <= 'U') goto yy146;
- if(yych == '\\') goto yy141;
- goto yy98;
- }
+ if(yych <= '\'') goto yy141;
+ if(yych <= '/') goto yy98;
+ goto yy149;
             }
         } else {
- if(yych <= 'r') {
- if(yych <= 'f') {
- if(yych <= 'b') goto yy141;
- if(yych <= 'e') goto yy98;
- goto yy141;
- } else {
- if(yych == 'n') goto yy141;
- if(yych <= 'q') goto yy98;
- goto yy141;
- }
+ if(yych <= 'T') {
+ if(yych == '?') goto yy147;
+ goto yy98;
             } else {
- if(yych <= 'u') {
- if(yych <= 's') goto yy98;
- if(yych <= 't') goto yy141;
- } else {
- if(yych <= 'v') goto yy141;
- if(yych == 'x') goto yy148;
- goto yy98;
- }
+ if(yych <= 'U') goto yy146;
+ if(yych == '\\') goto yy141;
+ goto yy98;
             }
         }
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych <= '9') goto yy182;
- goto yy98;
+ } else {
+ if(yych <= 'r') {
+ if(yych <= 'f') {
+ if(yych <= 'b') goto yy141;
+ if(yych <= 'e') goto yy98;
+ goto yy141;
+ } else {
+ if(yych == 'n') goto yy141;
+ if(yych <= 'q') goto yy98;
+ goto yy141;
+ }
         } else {
- if(yych <= 'F') goto yy182;
- if(yych <= '`') goto yy98;
- if(yych <= 'f') goto yy182;
- goto yy98;
+ if(yych <= 'u') {
+ if(yych <= 's') goto yy98;
+ if(yych <= 't') goto yy141;
+ } else {
+ if(yych <= 'v') goto yy141;
+ if(yych == 'x') goto yy148;
+ goto yy98;
+ }
         }
+ }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '@') {
+ if(yych <= '/') goto yy98;
+ if(yych <= '9') goto yy182;
+ goto yy98;
+ } else {
+ if(yych <= 'F') goto yy182;
+ if(yych <= '`') goto yy98;
+ if(yych <= 'f') goto yy182;
+ goto yy98;
+ }
 yy146:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych <= '9') goto yy175;
- goto yy98;
- } else {
- if(yych <= 'F') goto yy175;
- if(yych <= '`') goto yy98;
- if(yych <= 'f') goto yy175;
- goto yy98;
- }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '@') {
+ if(yych <= '/') goto yy98;
+ if(yych <= '9') goto yy175;
+ goto yy98;
+ } else {
+ if(yych <= 'F') goto yy175;
+ if(yych <= '`') goto yy98;
+ if(yych <= 'f') goto yy175;
+ goto yy98;
+ }
 yy147:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yybm[0+yych] & 2) {
- goto yy141;
- }
- if(yych <= '&') goto yy98;
- if(yych <= '\'') goto yy151;
- if(yych <= '[') goto yy155;
- goto yy144;
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yybm[0+yych] & 2) {
+ goto yy141;
+ }
+ if(yych <= '&') goto yy98;
+ if(yych <= '\'') goto yy151;
+ if(yych <= '[') goto yy155;
+ goto yy144;
 yy148:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych <= '9') goto yy153;
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '@') {
+ if(yych <= '/') goto yy98;
+ if(yych <= '9') goto yy153;
+ goto yy98;
+ } else {
+ if(yych <= 'F') goto yy153;
+ if(yych <= '`') goto yy98;
+ if(yych <= 'f') goto yy153;
+ goto yy98;
+ }
+yy149:
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '\'') {
+ if(yych <= 0x0A) {
+ if(yych == 0x09) goto yy141;
             goto yy98;
         } else {
- if(yych <= 'F') goto yy153;
- if(yych <= '`') goto yy98;
- if(yych <= 'f') goto yy153;
- goto yy98;
+ if(yych <= 0x0C) goto yy141;
+ if(yych <= 0x1F) goto yy98;
+ if(yych <= '&') goto yy141;
+ goto yy151;
         }
-yy149:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '\'') {
- if(yych <= 0x0A) {
- if(yych == 0x09) goto yy141;
- goto yy98;
- } else {
- if(yych <= 0x0C) goto yy141;
- if(yych <= 0x1F) goto yy98;
- if(yych <= '&') goto yy141;
- goto yy151;
- }
+ } else {
+ if(yych <= '>') {
+ if(yych <= '/') goto yy141;
+ if(yych >= '8') goto yy141;
         } else {
- if(yych <= '>') {
- if(yych <= '/') goto yy141;
- if(yych >= '8') goto yy141;
- } else {
- if(yych <= '?') goto yy143;
- if(yych == '\\') goto yy144;
- goto yy141;
- }
- }
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yybm[0+yych] & 2) {
+ if(yych <= '?') goto yy143;
+ if(yych == '\\') goto yy144;
             goto yy141;
         }
- if(yych <= '&') goto yy98;
- if(yych <= '\'') goto yy151;
- if(yych <= '[') goto yy143;
- goto yy144;
+ }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yybm[0+yych] & 2) {
+ goto yy141;
+ }
+ if(yych <= '&') goto yy98;
+ if(yych <= '\'') goto yy151;
+ if(yych <= '[') goto yy143;
+ goto yy144;
 yy151:
- ++YYCURSOR;
+ ++YYCURSOR;
 yy152:
-#line 246 "..\\..\\src\\cpplexer\\re2clex\\cpp.re"
- { BOOST_WAVE_RET(T_CHARLIT); }
-#line 2099 "..\\..\\src\\cpplexer\\re2clex\\cpp_re.inc"
+#line 246 "cpp.re"
+ { BOOST_WAVE_RET(T_CHARLIT); }
+#line 2098 "cpp_re.inc"
 yy153:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy141;
- if(yych <= 0x0A) goto yy98;
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '9') {
+ if(yych <= 0x0C) {
+ if(yych == 0x09) goto yy141;
+ if(yych <= 0x0A) goto yy98;
+ goto yy141;
+ } else {
+ if(yych <= '&') {
+ if(yych <= 0x1F) goto yy98;
                 goto yy141;
             } else {
- if(yych <= '&') {
- if(yych <= 0x1F) goto yy98;
- goto yy141;
- } else {
- if(yych <= '\'') goto yy151;
- if(yych <= '/') goto yy141;
- goto yy153;
- }
+ if(yych <= '\'') goto yy151;
+ if(yych <= '/') goto yy141;
+ goto yy153;
             }
+ }
+ } else {
+ if(yych <= 'F') {
+ if(yych == '?') goto yy143;
+ if(yych <= '@') goto yy141;
+ goto yy153;
         } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy143;
- if(yych <= '@') goto yy141;
- goto yy153;
+ if(yych <= '\\') {
+ if(yych <= '[') goto yy141;
+ goto yy144;
             } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy141;
- goto yy144;
- } else {
- if(yych <= '`') goto yy141;
- if(yych <= 'f') goto yy153;
- goto yy141;
- }
+ if(yych <= '`') goto yy141;
+ if(yych <= 'f') goto yy153;
+ goto yy141;
             }
         }
+ }
 yy155:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yybm[0+yych] & 2) {
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yybm[0+yych] & 2) {
+ goto yy141;
+ }
+ if(yych <= '&') goto yy98;
+ if(yych <= '\'') goto yy151;
+ if(yych >= '\\') goto yy144;
+yy156:
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '\'') {
+ if(yych <= 0x0A) {
+ if(yych == 0x09) goto yy141;
+ goto yy98;
+ } else {
+ if(yych <= 0x0C) goto yy141;
+ if(yych <= 0x1F) goto yy98;
+ if(yych <= '&') goto yy141;
+ goto yy151;
+ }
+ } else {
+ if(yych <= '>') {
+ if(yych != '/') goto yy141;
+ } else {
+ if(yych <= '?') goto yy156;
+ if(yych == '\\') goto yy144;
             goto yy141;
         }
- if(yych <= '&') goto yy98;
- if(yych <= '\'') goto yy151;
- if(yych >= '\\') goto yy144;
-yy156:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '\'') {
- if(yych <= 0x0A) {
- if(yych == 0x09) goto yy141;
- goto yy98;
+ }
+yy158:
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '>') {
+ if(yych <= 0x1F) {
+ if(yych <= 0x09) {
+ if(yych <= 0x08) goto yy98;
+ goto yy141;
             } else {
+ if(yych <= 0x0A) goto yy98;
                 if(yych <= 0x0C) goto yy141;
- if(yych <= 0x1F) goto yy98;
- if(yych <= '&') goto yy141;
- goto yy151;
+ goto yy98;
             }
         } else {
- if(yych <= '>') {
- if(yych != '/') goto yy141;
+ if(yych <= '\'') {
+ if(yych <= '&') goto yy141;
+ goto yy162;
             } else {
- if(yych <= '?') goto yy156;
- if(yych == '\\') goto yy144;
+ if(yych <= '/') goto yy141;
+ if(yych <= '7') goto yy149;
                 goto yy141;
             }
         }
-yy158:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '>') {
- if(yych <= 0x1F) {
- if(yych <= 0x09) {
- if(yych <= 0x08) goto yy98;
- goto yy141;
- } else {
- if(yych <= 0x0A) goto yy98;
- if(yych <= 0x0C) goto yy141;
- goto yy98;
- }
+ } else {
+ if(yych <= '\\') {
+ if(yych <= 'T') {
+ if(yych <= '?') goto yy163;
+ goto yy141;
             } else {
- if(yych <= '\'') {
- if(yych <= '&') goto yy141;
- goto yy162;
- } else {
- if(yych <= '/') goto yy141;
- if(yych <= '7') goto yy149;
- goto yy141;
- }
+ if(yych <= 'U') goto yy161;
+ if(yych <= '[') goto yy141;
+ goto yy158;
             }
         } else {
- if(yych <= '\\') {
- if(yych <= 'T') {
- if(yych <= '?') goto yy163;
- goto yy141;
- } else {
- if(yych <= 'U') goto yy161;
- if(yych <= '[') goto yy141;
- goto yy158;
- }
+ if(yych <= 'u') {
+ if(yych <= 't') goto yy141;
             } else {
- if(yych <= 'u') {
- if(yych <= 't') goto yy141;
- } else {
- if(yych == 'x') goto yy153;
- goto yy141;
- }
+ if(yych == 'x') goto yy153;
+ goto yy141;
             }
         }
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy141;
- if(yych <= 0x0A) goto yy98;
+ }
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '9') {
+ if(yych <= 0x0C) {
+ if(yych == 0x09) goto yy141;
+ if(yych <= 0x0A) goto yy98;
+ goto yy141;
+ } else {
+ if(yych <= '&') {
+ if(yych <= 0x1F) goto yy98;
                 goto yy141;
             } else {
- if(yych <= '&') {
- if(yych <= 0x1F) goto yy98;
- goto yy141;
- } else {
- if(yych <= '\'') goto yy151;
- if(yych <= '/') goto yy141;
- goto yy172;
- }
+ if(yych <= '\'') goto yy151;
+ if(yych <= '/') goto yy141;
+ goto yy172;
             }
+ }
+ } else {
+ if(yych <= 'F') {
+ if(yych == '?') goto yy143;
+ if(yych <= '@') goto yy141;
+ goto yy172;
         } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy143;
- if(yych <= '@') goto yy141;
- goto yy172;
+ if(yych <= '\\') {
+ if(yych <= '[') goto yy141;
+ goto yy144;
             } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy141;
- goto yy144;
- } else {
- if(yych <= '`') goto yy141;
- if(yych <= 'f') goto yy172;
- goto yy141;
- }
+ if(yych <= '`') goto yy141;
+ if(yych <= 'f') goto yy172;
+ goto yy141;
             }
         }
+ }
 yy161:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy141;
- if(yych <= 0x0A) goto yy98;
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '9') {
+ if(yych <= 0x0C) {
+ if(yych == 0x09) goto yy141;
+ if(yych <= 0x0A) goto yy98;
+ goto yy141;
+ } else {
+ if(yych <= '&') {
+ if(yych <= 0x1F) goto yy98;
                 goto yy141;
             } else {
- if(yych <= '&') {
- if(yych <= 0x1F) goto yy98;
- goto yy141;
- } else {
- if(yych <= '\'') goto yy151;
- if(yych <= '/') goto yy141;
- goto yy165;
- }
+ if(yych <= '\'') goto yy151;
+ if(yych <= '/') goto yy141;
+ goto yy165;
             }
+ }
+ } else {
+ if(yych <= 'F') {
+ if(yych == '?') goto yy143;
+ if(yych <= '@') goto yy141;
+ goto yy165;
         } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy143;
- if(yych <= '@') goto yy141;
- goto yy165;
+ if(yych <= '\\') {
+ if(yych <= '[') goto yy141;
+ goto yy144;
             } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy141;
- goto yy144;
- } else {
- if(yych <= '`') goto yy141;
- if(yych <= 'f') goto yy165;
- goto yy141;
- }
+ if(yych <= '`') goto yy141;
+ if(yych <= 'f') goto yy165;
+ goto yy141;
             }
         }
+ }
 yy162:
- yyaccept = 7;
- YYMARKER = ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yybm[0+yych] & 2) {
- goto yy141;
- }
- if(yych <= '&') goto yy152;
- if(yych <= '\'') goto yy151;
- if(yych <= '[') goto yy143;
- goto yy144;
+ yyaccept = 7;
+ YYMARKER = ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yybm[0+yych] & 2) {
+ goto yy141;
+ }
+ if(yych <= '&') goto yy152;
+ if(yych <= '\'') goto yy151;
+ if(yych <= '[') goto yy143;
+ goto yy144;
 yy163:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yybm[0+yych] & 2) {
- goto yy141;
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yybm[0+yych] & 2) {
+ goto yy141;
+ }
+ if(yych <= '&') goto yy98;
+ if(yych <= '\'') goto yy151;
+ if(yych >= '\\') goto yy144;
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '\'') {
+ if(yych <= 0x0A) {
+ if(yych == 0x09) goto yy141;
+ goto yy98;
+ } else {
+ if(yych <= 0x0C) goto yy141;
+ if(yych <= 0x1F) goto yy98;
+ if(yych <= '&') goto yy141;
+ goto yy151;
         }
- if(yych <= '&') goto yy98;
- if(yych <= '\'') goto yy151;
- if(yych >= '\\') goto yy144;
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '\'') {
- if(yych <= 0x0A) {
- if(yych == 0x09) goto yy141;
- goto yy98;
- } else {
- if(yych <= 0x0C) goto yy141;
- if(yych <= 0x1F) goto yy98;
- if(yych <= '&') goto yy141;
- goto yy151;
- }
+ } else {
+ if(yych <= '>') {
+ if(yych == '/') goto yy158;
+ goto yy141;
         } else {
- if(yych <= '>') {
- if(yych == '/') goto yy158;
- goto yy141;
- } else {
- if(yych <= '?') goto yy156;
- if(yych == '\\') goto yy144;
- goto yy141;
- }
+ if(yych <= '?') goto yy156;
+ if(yych == '\\') goto yy144;
+ goto yy141;
         }
+ }
 yy165:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy141;
- if(yych <= 0x0A) goto yy98;
+ ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if(yych <= '9') {
+ if(yych <= 0x0C) {
+ if(yych == 0x09) goto yy141;
+ if(yych <= 0x0A) goto yy98;
+ goto yy141;
+ } else {
+ if(yych <= '&') {
+ if(yych <= 0x1F) goto yy98;
                 goto yy141;
             } else {
- if(yych <= '&') {
- if(yych