Merge V2 toolset names from trunk.

[SVN r33790]

1 files changed, 105 insertions, 1 deletions

diff --git a/status/explicit-failures-markup.xml b/status/explicit-failures-markup.xml
index 585743eba4..5470d283af 100644
--- a/status/explicit-failures-markup.xml
+++ b/status/explicit-failures-markup.xml
@@ -28,6 +28,7 @@
     <mark-toolset name="msvc-stlport" status="required"/>
     <mark-toolset name="vc7" status="required"/>
     <mark-toolset name="vc-6_5" status="required"/>
+    <mark-toolset name="msvc-6.5" status="required"/>
     <mark-toolset name="vc-6_5-stlport" status="required"/>
     <mark-toolset name="vc-7_0" status="required"/>
     <mark-toolset name="vc-7_1" status="required"/>
@@ -68,6 +69,7 @@
             <toolset name="borland"/>
             <toolset name="msvc"/>
             <toolset name="vc-6_5*"/>
+            <toolset name="msvc-6.5*"/>
             <toolset name="iw-7_1-vc6"/>
             <toolset name="gcc-2.95.3-linux"/>
             <toolset name="gcc-2.95.3-stlport-4.5.3-linux"/>
@@ -86,6 +88,7 @@
           <mark-failure>
               <toolset name="msvc"/>
               <toolset name="vc-6_5*"/>
+              <toolset name="msvc-6.5*"/>
               <note author="Vladimir Prus">
                 The test fail with ICE, but the exact reason for ICE is not
                 known. A minimal example of casting any to reference type
@@ -105,6 +108,7 @@
                 <toolset name="borland-5_6_4"/>
                 <toolset name="msvc"/>
                 <toolset name="vc-6_5"/>
+                <toolset name="msvc-6.5"/>
                 <toolset name="vc-7_0"/>
                 <note refid="3"/>
             </mark-failure>
@@ -119,6 +123,7 @@
                 <toolset name="borland-5_6_4"/>
                 <toolset name="msvc"/>
                 <toolset name="vc-6_5"/>
+                <toolset name="msvc-6.5"/>
                 <toolset name="vc-7_0"/>
                 <note refid="3"/>
             </mark-failure>
@@ -168,6 +173,7 @@
             <toolset name="borland-5*"/>
             <toolset name="msvc"/>
             <toolset name="vc-6_5*"/>
+            <toolset name="msvc-6.5*"/>
             <toolset name="vc-7_0"/>
             <note author="Thorsten Ottosen" >
                 The test would (most likely) compile and run properly if the workaround
@@ -194,6 +200,7 @@
             <test name="multi_index_container"/>
             <toolset name="msvc"/>
             <toolset name="vc-6_5*"/>
+            <toolset name="msvc-6.5*"/>
             <toolset name="vc-7_0"/>
             <toolset name="mipspro"/>
             <toolset name="tru64cxx65"/>
@@ -215,6 +222,7 @@
             <toolset name="gcc-2.95.3*"/>
             <toolset name="msvc"/>
             <toolset name="vc-6_5*"/>
+            <toolset name="msvc-6.5*"/>
             <toolset name="vc-7_0"/>
             <toolset name="mipspro"/>
             <note author="Thorsten Ottosen" >
@@ -229,6 +237,7 @@
             <toolset name="gcc-2.95.3*"/>
             <toolset name="msvc"/>
             <toolset name="vc-6_5*"/>
+            <toolset name="msvc-6.5*"/>
             <toolset name="mipspro"/>
             <note author="Thorsten Ottosen" >
                 The test depends on Boost.Pointer Container which probably does not work for
@@ -242,6 +251,7 @@
             <toolset name="gcc-2.95.3*"/>
             <toolset name="msvc"/>
             <toolset name="vc-6_5*"/>
+            <toolset name="msvc-6.5*"/>
             <toolset name="mipspro"/>
             <note author="Thorsten Ottosen" >
                 The test depends on Boost.Pointer Container which probably does not work for
@@ -262,6 +272,7 @@
             <toolset name="borland-5*"/>
             <toolset name="msvc"/>
             <toolset name="vc-6_5*"/>
+            <toolset name="msvc-6.5*"/>
             <toolset name="vc-7_0"/>
             <note author="Thorsten Ottosen" >
                 The test depends on Boost.Tuple which probably does not work for
@@ -284,6 +295,7 @@
             <test name="mem_fn_dm_test"/>
             <toolset name="msvc"/>
             <toolset name="vc-6_5*"/>
+            <toolset name="msvc-6.5*"/>
             <toolset name="vc-7_0"/>
             <toolset name="cw-8_3"/>
             <note refid="31" author="Peter Dimov"/>
@@ -319,6 +331,7 @@
             <test name="bind_dm3_test"/>
             <toolset name="borland-5*"/>
             <toolset name="vc-6_5*"/>
+            <toolset name="msvc-6.5*"/>
             <toolset name="vc-7_0"/>
             <note refid="31" author="Peter Dimov"/>
         </mark-expected-failures>
@@ -404,6 +417,7 @@
             <toolset name="msvc-stlport"/>
             <toolset name="vc-6_5-stlport"/>
             <toolset name="vc-6_5"/>
+            <toolset name="msvc-6.5"/>
             <toolset name="iw-7_1-vc6-stlp-4_5_3"/>
             <toolset name="iw-7_1-vc6"/>
             <toolset name="dmc-8_47-stlport-4_5_3"/>
@@ -414,6 +428,7 @@
             <toolset name="gcc-2.*"/>
             <toolset name="msvc"/>
             <toolset name="vc-6_5*"/>
+            <toolset name="msvc-6.5*"/>
             <note author="B. Garst">The serialization library does not support this compiler.
             </note>
             </mark-failure>
@@ -432,6 +447,7 @@
             <toolset name="gcc-2.*"/>
             <toolset name="msvc"/>
             <toolset name="vc-6_5*"/>
+            <toolset name="msvc-6.5*"/>
             <note author="B. Garst">The serialization library does not support this compiler.
             </note>
             </mark-failure>
@@ -476,6 +492,7 @@
             <mark-failure>
                 <toolset name="msvc"/>
                 <toolset name="vc-6_5"/>
+                <toolset name="msvc-6.5"/>
                 <toolset name="vc-7_0"/>
                 <toolset name="cw-8_3*"/>
                 <toolset name="borland-5_6_4"/>
@@ -512,6 +529,7 @@
             <toolset name="gcc-2.95.3-stlport-4.6.2-linux"/>
             <toolset name="msvc"/>
             <toolset name="vc-6_5"/>
+            <toolset name="msvc-6.5"/>
             <toolset name="vc-7_0"/>
                 <note author="J. Garland">
                    Some older compilers are confused by the template code here.
@@ -525,6 +543,7 @@
             <mark-failure>
             <toolset name="msvc"/>
             <toolset name="vc-6_5"/>
+            <toolset name="msvc-6.5"/>
             <toolset name="*como-4_3_3*"/>
             <toolset name="borland-5_6_4"/>
             <toolset name="borland-5_8_1"/>
@@ -543,6 +562,7 @@
             <mark-failure>
             <toolset name="msvc"/>
             <toolset name="vc-6_5"/>
+            <toolset name="msvc-6.5"/>
             <toolset name="*como-4_3_3*"/>
             <toolset name="borland-5_6_4"/>
             <toolset name="borland-5_8_1"/>
@@ -561,6 +581,7 @@
             <mark-failure>
             <toolset name="msvc"/>
             <toolset name="vc-6_5"/>
+            <toolset name="msvc-6.5"/>
             <toolset name="*como-4_3_3*"/>
             <toolset name="borland-5_6_4"/>
             <toolset name="borland-5_8_1"/>
@@ -584,6 +605,7 @@
             <toolset name="msvc"/>
             <toolset name="vc-7_0"/>
             <toolset name="vc-6_5"/>
+            <toolset name="msvc-6.5"/>
                 <note author="J. Garland">
                    Some compilers are confused by the template code here.
                    These are new features to date-time in 1.33 and there is no
@@ -603,6 +625,7 @@
             <toolset name="gcc-2.95.3-stlport-4.6.2-linux"/>
             <toolset name="msvc"/>
             <toolset name="vc-6_5"/>
+            <toolset name="msvc-6.5"/>
             <toolset name="vc-7_0"/>
                 <note author="J. Garland">
                    Some older compilers are confused by the template code here.
@@ -624,6 +647,7 @@
             <toolset name="gcc-2.95.3-stlport-4.6.2-linux"/>
             <toolset name="msvc"/>
             <toolset name="vc-6_5"/>
+            <toolset name="msvc-6.5"/>
             <toolset name="vc-7_0"/>
                 <note author="J. Garland">
                    Some older compilers are confused by the template code here.
@@ -641,6 +665,7 @@
             <toolset name="*como-4_3_3*"/>
             <toolset name="msvc"/>
             <toolset name="vc-6_5"/>
+            <toolset name="msvc-6.5"/>
                 <note author="J. Garland">
                    Some older compilers are confused by the template code here.
                    These are new features to date-time in 1.33 and there is no
@@ -656,6 +681,7 @@
             <toolset name="gcc-2.95.3-linux"/>
             <toolset name="msvc"/>
             <toolset name="vc-6_5"/>
+            <toolset name="msvc-6.5"/>
                 <note author="J. Garland">
                    Some older compilers are confused by the template code here.
                    These are new features to date-time in 1.33 and there is no
@@ -672,6 +698,7 @@
                 <toolset name="gcc-2.95.3-linux"/>
                 <toolset name="msvc"/>
                 <toolset name="vc-6_5"/>
+                <toolset name="msvc-6.5"/>
                 <note author="J. Garland">
                    Some compilers are confused by the template code here.
                    These are new features to date-time in 1.33 and there is no
@@ -686,6 +713,7 @@
                 <toolset name="gcc-3.1-darwin"/>
                 <toolset name="msvc"/>
                 <toolset name="vc-6_5"/>
+                <toolset name="msvc-6.5"/>
                 <toolset name="vc-7_0"/>
                 <toolset name="borland-5_6_4"/>
                 <toolset name="borland-5_8_1"/>
@@ -702,6 +730,7 @@
                 <toolset name="gcc-3.1-darwin"/>
                 <toolset name="msvc"/>
                 <toolset name="vc-6_5"/>
+                <toolset name="msvc-6.5"/>
                 <toolset name="vc-7_0"/>
                 <toolset name="borland-5_6_4"/>
                 <toolset name="borland-5_8_1"/>
@@ -720,6 +749,7 @@
                 <toolset name="cw-8_3*"/>
                 <toolset name="msvc"/>
                 <toolset name="vc-6_5"/>
+                <toolset name="msvc-6.5"/>
                 <toolset name="vc-7_0"/>
                 <note author="J. Garland">
                 These compilers are unfortunately able to correctly compile the
@@ -737,6 +767,7 @@
                 <toolset name="cw-8_3*"/>
                 <toolset name="msvc"/>
                 <toolset name="vc-6_5"/>
+                <toolset name="msvc-6.5"/>
                 <toolset name="vc-7_0"/>
                 <note author="J. Garland">
                 These compilers are unfortunately able to correctly compile the
@@ -754,6 +785,7 @@
                 <toolset name="cw-8_3*"/>
                 <toolset name="msvc"/>
                 <toolset name="vc-6_5"/>
+                <toolset name="msvc-6.5"/>
                 <toolset name="vc-7_0"/>
                 <note author="J. Garland">
                 These compilers are unfortunately able to correctly compile the
@@ -795,6 +827,7 @@
                 <toolset name="gcc-3.1-darwin"/>
                 <toolset name="msvc"/>
                 <toolset name="vc-6_5"/>
+                <toolset name="msvc-6.5"/>
                 <toolset name="mingw*"/>
                 <toolset name="borland-5_6_4"/>
                 <note author="B. Garst" refid="18,19"/>
@@ -806,6 +839,7 @@
                 <toolset name="gcc-3.1-darwin"/>
                 <toolset name="msvc"/>
                 <toolset name="vc-6_5"/>
+                <toolset name="msvc-6.5"/>
                 <toolset name="mingw*"/>
                 <toolset name="borland-5_6_4"/>
                 <toolset name="*como-4_3_3*"/>
@@ -822,6 +856,7 @@
                 <toolset name="gcc-2.95.3-linux"/>
                 <toolset name="msvc"/>
                 <toolset name="vc-6_5"/>
+                <toolset name="msvc-6.5"/>
                 <toolset name="vc-7_0"/>
                 <toolset name="borland-5_6_4"/>
                 <note author="B. Garst" refid="18,20"/>
@@ -841,6 +876,7 @@
                 <toolset name="gcc-3.1-darwin"/>
                 <toolset name="msvc"/>
                 <toolset name="vc-6_5"/>
+                <toolset name="msvc-6.5"/>
                 <toolset name="vc-7_0"/>
                 <toolset name="borland-5_6_4"/>
                 <toolset name="borland-5_8_1"/>
@@ -1021,6 +1057,7 @@
           <test name="wide_test"/>
             <toolset name="msvc*"/>
             <toolset name="vc-6_5*"/>
+            <toolset name="msvc-6.5*"/>
             <toolset name="vc-7_0"/>
             <toolset name="borland-5_6_4"/>
             <toolset name="borland-5_8_1"/>
@@ -1054,6 +1091,7 @@
             <test name="rvalue_const"/>
             <toolset name="msvc"/>
             <toolset name="vc-6_5*"/>
+            <toolset name="msvc-6.5*"/>
             <toolset name="vc-7_0"/>
             <toolset name="borland-5_6_4"/>
             <toolset name="borland-5_8_1"/>
@@ -1080,6 +1118,7 @@
             <test name="rvalue_nonconst"/>
             <toolset name="msvc"/>
             <toolset name="vc-6_5*"/>
+            <toolset name="msvc-6.5*"/>
             <toolset name="vc-7_0"/>
             <toolset name="borland-5_6_4"/>
             <toolset name="borland-5_8_1"/>
@@ -1105,6 +1144,7 @@
             <test name="user_defined"/>
             <toolset name="msvc"/>
             <toolset name="vc-6_5*"/>
+            <toolset name="msvc-6.5*"/>
             <toolset name="vc-7_0*"/>
             <note author="Eric Niebler">
                 This failure is because the Boost.Range extension
@@ -1141,6 +1181,7 @@
             <test name="hash_value_array_test"/>
             <toolset name="msvc"/>
             <toolset name="vc-6_5*"/>
+            <toolset name="msvc-6.5*"/>
             <toolset name="vc-7_0"/>
             <note author="Daniel James">
               hash_value is not overloaded for arrays for older versions
@@ -1154,6 +1195,7 @@
             <test name="hash_function_pointer_test"/>
             <toolset name="msvc"/>
             <toolset name="vc-6_5*"/>
+            <toolset name="msvc-6.5*"/>
             <toolset name="vc-7_0"/>
             <note refid="2" author="Daniel James"/>
         </mark-expected-failures>
@@ -1179,6 +1221,7 @@
             <test name="books" />
             <toolset name="msvc"/>
             <toolset name="vc-6_5*"/>
+            <toolset name="msvc-6.5*"/>
             <toolset name="vc-7_0"/>
             <note author="Daniel James">
                 These examples only work on compilers with support for ADL.
@@ -1216,6 +1259,7 @@
             <toolset name="borland-5_6_4"/>
             <toolset name="msvc"/>
             <toolset name="vc-6_5*"/>
+            <toolset name="msvc-6.5*"/>
             <toolset name="sunpro-5_3-sunos"/>
         </mark-unusable>
         <mark-expected-failures>
@@ -1283,6 +1327,7 @@
             <toolset name="iw-7_1-vc6*"/>
             <toolset name="msvc"/>
             <toolset name="vc-6_5*"/>
+            <toolset name="msvc-6.5*"/>
             <note refid="4" author="Aleksey Gurtovoy"/>
         </mark-expected-failures>
         <mark-expected-failures>
@@ -1377,6 +1422,7 @@
             <toolset name="borland-5_6_4"/>
             <toolset name="msvc"/>
             <toolset name="vc-6_5*"/>
+            <toolset name="msvc-6.5*"/>
             <toolset name="vc-7_0"/>
             <toolset name="gcc-2.95.3*"/>
             <note author="Jonathan Turkanis" refid="2"/>
@@ -1412,6 +1458,7 @@
         <mark-unusable>
             <toolset name="msvc"/>
             <toolset name="vc-6_5*"/>
+            <toolset name="msvc-6.5*"/>
             <toolset name="borland"/>
             <toolset name="borland-5_6_4"/>
             <toolset name="borland-5_5_1"/>
@@ -1511,6 +1558,7 @@
             <toolset name="borland-5_6_4"/>
             <toolset name="msvc"/>
             <toolset name="vc-6_5*"/>
+            <toolset name="msvc-6.5*"/>
             <toolset name="mipspro"/>
             <note author="Aleksey Gurtovoy" date="17 Sep 2004">
                 This failure is caused by a lack of compiler support for template template
@@ -1535,6 +1583,7 @@
             <test name="map"/>
             <toolset name="msvc"/>
             <toolset name="vc-6_5*"/>
+            <toolset name="msvc-6.5*"/>
             <toolset name="vc-7_0"/>
             <note author="Aleksey Gurtovoy" date="17 Sep 2004">
                 This is an advanced functionality that hasn't been ported to the deficient
@@ -1577,6 +1626,7 @@
             <mark-failure>
                <toolset name="msvc"/>
                <toolset name="vc-6_5"/>
+               <toolset name="msvc-6.5"/>
                <note author="Ronald Garcia" date="13 Jul 2004">
                   Known error in MSVC. see
 <a href="http://boost-consulting.com/boost/libs/multi_index/doc/compiler_specifics.html#msvc_60">
@@ -1674,6 +1724,7 @@ for more information.
             <test name="optional_test_ref"/>
             <toolset name="msvc"/>
             <toolset name="vc-6_5*"/>
+            <toolset name="msvc-6.5*"/>
             <toolset name="vc-7_0"/>
             <note author="Aleksey Gurtovoy" refid="3"/>
         </mark-expected-failures>
@@ -1737,6 +1788,7 @@ for more information.
             <test name="test_void_cast*"/>
             <toolset name="msvc"/>
             <toolset name="vc-6_5*"/>
+            <toolset name="msvc-6.5*"/>
             <note author="Robert Ramey" date="20 Sep 2004" refid="16,29"/>
         </mark-expected-failures>
 
@@ -1754,6 +1806,7 @@ for more information.
              <toolset name="borland-5_6_4"/>
              <toolset name="msvc"/>
              <toolset name="vc-6_5*"/>
+             <toolset name="msvc-6.5*"/>
              <toolset name="iw*"/>
              <toolset name="intel-win32-*"/>
              <note author="Robert Ramey" date="12 Feb 05" refid="2,29"/>
@@ -1763,6 +1816,7 @@ for more information.
              <test name="test_reset_object_address*"/>
              <toolset name="msvc"/>
              <toolset name="vc-6_5*"/>
+             <toolset name="msvc-6.5*"/>
              <note author="Robert Ramey" date="12 Feb 05" refid="6,29"/>
         </mark-expected-failures>
 
@@ -1789,6 +1843,7 @@ for more information.
             <test name="test_demo_xml_load_dll"/>
             <toolset name="msvc"/>
             <toolset name="vc-6_5*"/>
+            <toolset name="msvc-6.5*"/>
             <toolset name="vc-7_0"/>
             <note author="Robert Ramey" refid="6"/>
         </mark-expected-failures>
@@ -1798,6 +1853,7 @@ for more information.
             <test name="test_demo_fast_archive_dll"/>
             <toolset name="msvc"/>
             <toolset name="vc-6_5*"/>
+            <toolset name="msvc-6.5*"/>
             <note author="Robert Ramey" refid="6"/>
         </mark-expected-failures>
 
@@ -1805,6 +1861,7 @@ for more information.
             <test name="test_const"/>
             <toolset name="msvc"/>
             <toolset name="vc-6_5*"/>
+            <toolset name="msvc-6.5*"/>
             <toolset name="vc-7_0"/>
             <note author="Aleksey Gurtovoy" refid="29"/>
         </mark-expected-failures>
@@ -1817,6 +1874,7 @@ for more information.
             <test name="test_mult_archive_types_dll"/>
             <toolset name="msvc"/>
             <toolset name="vc-6_5*"/>
+            <toolset name="msvc-6.5*"/>
             <toolset name="vc-7_0"/>
             <note author="Robert Ramey" refid="6">
                 msvc 6 compiler failure.  The facility being tested conflicts the the
@@ -1828,6 +1886,7 @@ for more information.
             <test name="test_mi*"/>
             <toolset name="msvc"/>
             <toolset name="vc-6_5*"/>
+            <toolset name="msvc-6.5*"/>
             <note author="Robert Ramey" refid="6">
                 msvc 6 compiler failure.  The facility being tested conflicts the the
                 compiler in a fundamental way and cannnot be worked around.
@@ -2058,6 +2117,7 @@ for more information.
         <mark-expected-failures>
             <test name="test_class_info_load_text_warchive_dll"/>
             <toolset name="vc-6_5"/>
+            <toolset name="msvc-6.5"/>
             <note author="Doug Gregor" refid="29"/>
         </mark-expected-failures>
 
@@ -2075,6 +2135,7 @@ for more information.
             <test name="test_const_save_fail2"/>
             <test name="test_const_save_fail3"/>
             <toolset name="vc-6_5"/>
+            <toolset name="msvc-6.5"/>
             <toolset name="vc-6_5-stlport"/>
             <toolset name="vc-7_0"/>
             <note author="Doug Gregor" refid="29"/>
@@ -2085,6 +2146,7 @@ for more information.
             <test name="test_map_text_archive_dll"/>
             <test name="test_map_text_warchive_dll"/>
             <toolset name="vc-6_5"/>
+            <toolset name="msvc-6.5"/>
             <toolset name="vc-7_0"/>
             <note author="Doug Gregor" refid="29"/>
         </mark-expected-failures>
@@ -2163,6 +2225,7 @@ for more information.
         <mark-unusable>
             <toolset name="msvc"/>
             <toolset name="vc-6_5*"/>
+            <toolset name="msvc-6.5*"/>
             <toolset name="borland-5_5_1"/>
             <toolset name="borland-5_6_4"/>
             <toolset name="vc-7_0"/>
@@ -2252,7 +2315,7 @@ for more information.
             <test name="*_native"/>
             <toolset name="vc-8_0*"/>
 	    <toolset name="msvc-8.0*"/>
-            <toolset name="intel-win32*"/>
+            <toolset name="intel-win*"/>
             <toolset name="como-4_3_3-vc7_1"/>
             <toolset name="tru64*"/>
             <toolset name="hp_cxx*"/>
@@ -2264,6 +2327,7 @@ for more information.
             <test name="*_emulation"/>
             <toolset name="msvc"/>
             <toolset name="vc-6_5*"/>
+            <toolset name="msvc-6.5*"/>
             <toolset name="vc-7_0"/>
             <toolset name="cw-8_*"/>
             <note author="Arkadiy Vertleyb">
@@ -2275,6 +2339,7 @@ for more information.
             <test name="template_tpl_native"/>
             <toolset name="msvc"/>
             <toolset name="vc-6_5*"/>
+            <toolset name="msvc-6.5*"/>
             <toolset name="vc-7_0"/>
             <note author="Arkadiy Vertleyb">
                 The feature is not supported by this compiler.
@@ -2299,6 +2364,7 @@ for more information.
             <mark-failure>
                 <toolset name="msvc"/>
                 <toolset name="vc-6_5"/>
+                <toolset name="msvc-6.5"/>
                 <toolset name="vc-7_0"/>
                 <note author="B. Dawes" refid="5"/>
             </mark-failure>
@@ -2307,6 +2373,7 @@ for more information.
             <mark-failure>
                 <toolset name="msvc"/>
                 <toolset name="vc-6_5*"/>
+                <toolset name="msvc-6.5*"/>
                 <note refid="3" author="D. Gregor"/>
             </mark-failure>
         </test>
@@ -2322,6 +2389,7 @@ for more information.
                 <toolset name="borland-5_6_4"/>
                 <toolset name="msvc"/>
                 <toolset name="vc-6_5"/>
+                <toolset name="msvc-6.5"/>
                 <toolset name="vc-7_0"/>
                 <note author="B. Dawes" refid="3"/>
             </mark-failure>
@@ -2332,6 +2400,7 @@ for more information.
                 <toolset name="borland-5_6_4"/>
                 <toolset name="msvc"/>
                 <toolset name="vc-6_5"/>
+                <toolset name="msvc-6.5"/>
                 <toolset name="vc-7_0"/>
                 <note author="B. Dawes" refid="3"/>
             </mark-failure>
@@ -2342,6 +2411,7 @@ for more information.
                 <toolset name="borland-5_6_4"/>
                 <toolset name="msvc"/>
                 <toolset name="vc-6_5"/>
+                <toolset name="msvc-6.5"/>
                 <toolset name="vc-7_0"/>
                 <note author="B. Dawes" refid="3"/>
             </mark-failure>
@@ -2356,6 +2426,7 @@ for more information.
                 <toolset name="borland-5_6_4"/>
                 <toolset name="msvc"/>
                 <toolset name="vc-6_5"/>
+                <toolset name="msvc-6.5"/>
                 <toolset name="vc-7_0"/>
                 <note author="B. Dawes" refid="3"/>
             </mark-failure>
@@ -2370,6 +2441,7 @@ for more information.
                 <toolset name="borland-5_6_4"/>
                 <toolset name="msvc"/>
                 <toolset name="vc-6_5"/>
+                <toolset name="msvc-6.5"/>
                 <toolset name="vc-7_0"/>
                 <note author="B. Dawes" refid="3"/>
             </mark-failure>
@@ -2384,6 +2456,7 @@ for more information.
                 <toolset name="borland-5_6_4"/>
                 <toolset name="msvc"/>
                 <toolset name="vc-6_5"/>
+                <toolset name="msvc-6.5"/>
                 <toolset name="vc-7_0"/>
                 <note author="B. Dawes" refid="3"/>
             </mark-failure>
@@ -2392,6 +2465,7 @@ for more information.
             <mark-failure>
                 <toolset name="msvc"/>
                 <toolset name="vc-6_5"/>
+                <toolset name="msvc-6.5"/>
                 <note author="B. Dawes" refid="5"/>
             </mark-failure>
         </test>
@@ -2401,6 +2475,7 @@ for more information.
                 <toolset name="borland-5_6_4"/>
                 <toolset name="msvc"/>
                 <toolset name="vc-6_5"/>
+                <toolset name="msvc-6.5"/>
                 <toolset name="vc-7_0"/>
                 <note author="B. Dawes" refid="3"/>
             </mark-failure>
@@ -2534,6 +2609,7 @@ for more information.
                 <toolset name="borland-5_6_4"/>
                 <toolset name="msvc"/>
                 <toolset name="vc-6_5*"/>
+                <toolset name="msvc-6.5*"/>
                 <note author="Fernando Cacciola" refid="30"/>
             </mark-failure>
         </test>
@@ -2552,6 +2628,7 @@ for more information.
             <toolset name="borland-5_6_4"/>
             <toolset name="msvc"/>
             <toolset name="vc-6_5*"/>
+            <toolset name="msvc-6.5*"/>
             <toolset name="vc-7_0"/>
         </mark-unusable>
         <mark-expected-failures>
@@ -2597,6 +2674,7 @@ for more information.
             <toolset name="cw-8_3"/>
             <toolset name="msvc"/>
             <toolset name="vc-6_5*"/>
+            <toolset name="msvc-6.5*"/>
             <toolset name="vc-7_0"/>
             <toolset name="iw-7_1-vc6"/>
             <toolset name="gcc-2.95*"/>
@@ -2631,6 +2709,7 @@ for more information.
         <mark-unusable>
             <toolset name="msvc"/>
             <toolset name="vc-6_5*"/>
+            <toolset name="msvc-6.5*"/>
             <note refid="17"/>
         </mark-unusable>
 
@@ -2647,6 +2726,7 @@ for more information.
                 <toolset name="iw-7_1-vc6-stlp-4_5_3"/>
                 <toolset name="msvc"/>
                 <toolset name="vc-6_5*"/>
+                <toolset name="msvc-6.5*"/>
                 <note>The failures are caused by problems
                     with std::locale implementation</note>
             </mark-failure>
@@ -2656,6 +2736,7 @@ for more information.
              <mark-failure>
                 <toolset name="msvc"/>
                 <toolset name="vc-6_5"/>
+                <toolset name="msvc-6.5"/>
                 <toolset name="iw-7_1-vc6"/>
                 <note refid="23"/>
             </mark-failure>
@@ -2687,6 +2768,7 @@ for more information.
             <test name="variable_map_test_dll"/>
             <toolset name="msvc"/>
             <toolset name="vc-6_5*"/>
+            <toolset name="msvc-6.5*"/>
             <note>
                The failures are caused by compiler bug: it's not possible to
                explicitly pass template arguments to member template function. The
@@ -2734,6 +2816,7 @@ for more information.
             <toolset name="borland-5_6_4"/>
             <toolset name="msvc"/>
             <toolset name="vc-6_5*"/>
+            <toolset name="msvc-6.5*"/>
             <toolset name="vc-7_0"/>
             <toolset name="dmc-8_43-stlport-4_5_3"/>
         </mark-unusable>
@@ -3012,6 +3095,7 @@ for more information.
             <mark-failure>
                 <toolset name="msvc"/>
                 <toolset name="vc-6_5"/>
+                <toolset name="msvc-6.5"/>
                 <note author="J. Maddock"/>
             </mark-failure>
         </test>
@@ -3057,6 +3141,7 @@ for more information.
                 <toolset name="sunpro-5_3-sunos"/>
                 <toolset name="msvc"/>
                 <toolset name="vc-6_5*"/>
+                <toolset name="msvc-6.5*"/>
                 <toolset name="vc-7_0"/>
                 <note author="John Maddock">
                   This test fails because a dependency (Boost.Program Options) doesn't build with this compiler.
@@ -3108,6 +3193,7 @@ for more information.
                 <toolset name="borland-5_6_4"/>
                 <toolset name="msvc"/>
                 <toolset name="vc-6_5"/>
+                <toolset name="msvc-6.5"/>
                 <toolset name="vc-7_0"/>
                 <note author="B. Dawes" refid="3"/>
             </mark-failure>
@@ -3122,6 +3208,7 @@ for more information.
             <toolset name="msvc-6.5*"/>
             <toolset name="msvc-7.0*"/>
             <toolset name="vc-6_5*"/>
+            <toolset name="msvc-6.5*"/>
             <toolset name="vc7*"/>
             <toolset name="vc-7_0*"/>
             <toolset name="dmc-8*"/>
@@ -3203,6 +3290,7 @@ for more information.
             <test name="custom_exception_test"/>
             <toolset name="msvc"/>
             <toolset name="vc-6_5*"/>
+            <toolset name="msvc-6.5*"/>
             <note author="Gennadiy Rozental" refid="2"/>
         </mark-expected-failures>
 
@@ -3216,6 +3304,7 @@ for more information.
             <test name="token_iterator_test"/>
             <toolset name="msvc"/>
             <toolset name="vc-6_5*"/>
+            <toolset name="msvc-6.5*"/>
             <toolset name="iw-7_1-vc6"/>
             <toolset name="vc-7_0"/>
             <toolset name="vc-7_0-stlport"/>
@@ -3238,6 +3327,7 @@ for more information.
             <test name="test_fp_comparisons"/>
             <toolset name="msvc"/>
             <toolset name="vc-6_5*"/>
+            <toolset name="msvc-6.5*"/>
             <toolset name="vc-7_0"/>
             <toolset name="vc-7_0-stlport"/>
             <toolset name="borland-5_6_4"/>
@@ -3362,6 +3452,7 @@ for more information.
             <test name="is_unsigned_test"/>
             <toolset name="msvc"/>
             <toolset name="vc-6_5*"/>
+            <toolset name="msvc-6.5*"/>
             <toolset name="vc-7_0"/>
             <note author="Aleksey Gurtovoy">
                 This failure is caused by the lack of compiler support for class template
@@ -3389,6 +3480,7 @@ for more information.
                 <toolset name="borland-5_6_4"/>
                 <toolset name="msvc"/>
                 <toolset name="vc-6_5*"/>
+                <toolset name="msvc-6.5*"/>
                 <toolset name="gcc-2.95.3-*"/>
             </mark-failure>
         </test>
@@ -3409,6 +3501,7 @@ for more information.
                 <toolset name="cw-9.5"/>
                 <toolset name="msvc"/>
                 <toolset name="vc-6_5*"/>
+                <toolset name="msvc-6.5*"/>
                 <toolset name="vc-7_0"/>
                 <toolset name="mingw-3_3*"/>
                 <toolset name="gcc-2*"/>
@@ -3737,6 +3830,7 @@ for more information.
             <test name="tr1_is_unsigned_test"/>
             <toolset name="msvc"/>
             <toolset name="vc-6_5*"/>
+            <toolset name="msvc-6.5*"/>
             <toolset name="vc-7_0"/>
             <note author="Aleksey Gurtovoy">
                 This failure is caused by the lack of compiler support for class template
@@ -3764,6 +3858,7 @@ for more information.
                 <toolset name="borland-5_6_4"/>
                 <toolset name="msvc"/>
                 <toolset name="vc-6_5*"/>
+                <toolset name="msvc-6.5*"/>
                 <toolset name="gcc-2.95.3-*"/>
             </mark-failure>
         </test>
@@ -3782,6 +3877,7 @@ for more information.
                 <toolset name="cw-9_5*"/>
                 <toolset name="msvc"/>
                 <toolset name="vc-6_5*"/>
+                <toolset name="msvc-6.5*"/>
                 <toolset name="vc-7_0"/>
                 <toolset name="mingw-3_3*"/>
                 <toolset name="gcc-2*"/>
@@ -3876,6 +3972,7 @@ for more information.
             <toolset name="cw-8_3*"/>
             <toolset name="msvc"/>
             <toolset name="vc-6_5*"/>
+            <toolset name="msvc-6.5*"/>
             <toolset name="vc-7_0"/>
             <toolset name="gcc-2.95.3-*"/>
             <note refid="3"/>
@@ -3909,6 +4006,7 @@ for more information.
                 <toolset name="cw-8_3*"/>
                 <toolset name="msvc"/>
                 <toolset name="vc-6_5*"/>
+                <toolset name="msvc-6.5*"/>
                 <toolset name="vc-7_0"/>
                 <toolset name="gcc-2.95.3*"/>
                 <toolset name="sunpro-5_3-sunos"/>
@@ -3919,6 +4017,7 @@ for more information.
             <test name="value_init_test"/>
             <toolset name="msvc"/>
             <toolset name="vc-6_5*"/>
+            <toolset name="msvc-6.5*"/>
             <toolset name="vc-7_0"/>
             <note author="Aleksey Gurtovoy">
                 This failure is caused by a compiler bug (default-constructed scalar
@@ -3942,6 +4041,7 @@ for more information.
                 <toolset name="como-win32"/>
                 <toolset name="msvc"/>
                 <toolset name="vc-6_5*"/>
+                <toolset name="msvc-6.5*"/>
                 <toolset name="vc-7_0"/>
                 <note refid="3"/>
             </mark-failure>
@@ -3960,6 +4060,7 @@ for more information.
                 <toolset name="cw-8_3*"/>
                 <toolset name="msvc"/>
                 <toolset name="vc-6_5*"/>
+                <toolset name="msvc-6.5*"/>
                 <toolset name="vc-7_0"/>
                 <note refid="3"/>
             </mark-failure>
@@ -3977,6 +4078,7 @@ for more information.
         <mark-unusable>
             <toolset name="msvc"/>
             <toolset name="vc-6_5*"/>
+            <toolset name="msvc-6.5*"/>
             <toolset name="sunpro-5_3-sunos"/>
             <toolset name="borland-5_5_1"/>
             <toolset name="borland-5_6_4"/>
@@ -4004,6 +4106,7 @@ for more information.
         <mark-expected-failures>
             <test name="testwave"/>
             <toolset name="gcc-3.2.3-linux"/>
+	    <toolset name="gcc-3.2.3_linux"/>
             <toolset name="gcc-3.3.6-linux"/>
             <toolset name="gcc-3.3.6"/>	    
             <note author="Hartmut Kaiser" refid="29"/>
@@ -4031,6 +4134,7 @@ for more information.
             <toolset name="gcc-2.95.3*"/>
             <toolset name="msvc"/>
             <toolset name="vc-6_5*"/>
+            <toolset name="msvc-6.5*"/>
             <toolset name="vc-7_0"/>
             <note author="Eric Niebler">
                 These compilers do not support class template partial