Browse Source

vc-6_5 markup

[SVN r29835]
Aleksey Gurtovoy 21 years ago
parent
commit
5a63856f7b
1 changed files with 94 additions and 96 deletions
  1. 94 96
      status/explicit-failures-markup.xml

+ 94 - 96
status/explicit-failures-markup.xml

@@ -56,10 +56,8 @@
     <library name="algorithm/string">
         <mark-unusable>
             <toolset name="borland"/>
-            <toolset name="msvc"/>
-            <toolset name="msvc-stlport"/>
-            <toolset name="vc-6_5"/>
-            <toolset name="vc-6_5-stlport"/>
+            <toolset name="msvc*"/>
+            <toolset name="vc-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"/>
@@ -76,9 +74,8 @@
     <library name="any">
         <test name="any_to_ref_test">
           <mark-failure>
-              <toolset name="msvc"/>
-              <toolset name="msvc-stlport"/>
-              <toolset name="vc-6_5-stlport"/>
+              <toolset name="msvc*"/>
+              <toolset name="vc-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
@@ -97,6 +94,7 @@
                 <toolset name="borland"/>
                 <toolset name="borland-5_6_4"/>
                 <toolset name="msvc"/>
+                <toolset name="vc-6_5"/>
                 <toolset name="vc-7_0"/>
                 <note refid="3"/>
             </mark-failure>
@@ -110,6 +108,7 @@
                 <toolset name="borland"/>
                 <toolset name="borland-5_6_4"/>
                 <toolset name="msvc"/>
+                <toolset name="vc-6_5"/>
                 <toolset name="vc-7_0"/>
                 <note refid="3"/>
             </mark-failure>
@@ -157,9 +156,8 @@
             <toolset name="sunpro-5_3-sunos"/>
             <toolset name="tru64cxx65*"/>
             <toolset name="borland-5_6_4"/>
-            <toolset name="msvc"/>
-            <toolset name="msvc-stlport"/>
-            <toolset name="vc-6_5-stlport"/>
+            <toolset name="msvc*"/>
+            <toolset name="vc-6_5*"/>
             <toolset name="vc-7_0"/>
             <note author="Thorsten Ottosen" >
                 The test would (most likely) compile and run properly if the workaround
@@ -196,9 +194,8 @@
         </mark-expected-failures>
         <mark-expected-failures>
             <test name="multi_index_container"/>
-            <toolset name="msvc"/>
-            <toolset name="msvc-stlport"/>
-            <toolset name="vc-6_5-stlport"/>
+            <toolset name="msvc*"/>
+            <toolset name="vc-6_5*"/>
             <toolset name="vc-7_0"/>
             <toolset name="mipspro"/>
             <toolset name="tru64cxx65"/>
@@ -218,9 +215,8 @@
             <toolset name="tru64cxx65*"/>
             <toolset name="borland-5_6_4"/>
             <toolset name="gcc-2.95.3*"/>
-            <toolset name="msvc"/>
-            <toolset name="msvc-stlport"/>
-            <toolset name="vc-6_5-stlport"/>
+            <toolset name="msvc*"/>
+            <toolset name="vc-6_5*"/>
             <toolset name="vc-7_0"/>
             <toolset name="mipspro"/>
             <note author="Thorsten Ottosen" >
@@ -233,9 +229,8 @@
             <toolset name="tru64cxx65*"/>
             <toolset name="borland-5_6_4"/>
             <toolset name="gcc-2.95.3*"/>
-            <toolset name="msvc"/>
-            <toolset name="msvc-stlport"/>
-            <toolset name="vc-6_5-stlport"/>
+            <toolset name="msvc*"/>
+            <toolset name="vc-6_5*"/>
             <toolset name="mipspro"/>
             <note author="Thorsten Ottosen" >
                 The test depends on Boost.Pointer Container which probably does not work for
@@ -254,9 +249,8 @@
             <test name="tuple_list_of"/>
             <toolset name="sunpro-5_3-sunos"/>
             <toolset name="borland-5_6_4"/>
-            <toolset name="msvc"/>
-            <toolset name="msvc-stlport"/>
-            <toolset name="vc-6_5-stlport"/>
+            <toolset name="msvc*"/>
+            <toolset name="vc-6_5*"/>
             <toolset name="vc-7_0"/>
             <note author="Thorsten Ottosen" >
                 The test depends on Boost.Tuple which probably does not work for
@@ -450,6 +444,7 @@
         <test name="testgreg_wstream">
             <mark-failure>
                 <toolset name="msvc"/>
+                <toolset name="vc-6_5"/>
                 <toolset name="vc-7_0"/>
                 <toolset name="cw-8_3*"/>
                 <toolset name="borland-5_6_4"/>
@@ -483,6 +478,7 @@
             <toolset name="gcc-2.95.3-stlport-4.5.3-linux"/>
             <toolset name="gcc-2.95.3-stlport-4.6.2-linux"/>
             <toolset name="msvc"/>
+            <toolset name="vc-6_5"/>
             <toolset name="vc-7_0"/>
                 <note author="J. Garland">
                    Some older compilers are confused by the template code here.
@@ -495,6 +491,7 @@
         <test name="testlocal_time">
             <mark-failure>
             <toolset name="msvc"/>
+            <toolset name="vc-6_5"/>
             <toolset name="*como-4_3_3*"/>
             <toolset name="borland-5_6_4"/>
             <toolset name="gcc-2.95.3-linux"/>
@@ -514,6 +511,7 @@
             <toolset name="borland-5_6_4"/>
             <toolset name="gcc-2.95.3-linux"/>
             <toolset name="msvc"/>
+            <toolset name="vc-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
@@ -531,6 +529,7 @@
             <toolset name="gcc-2.95.3-stlport-4.5.3-linux"/>
             <toolset name="gcc-2.95.3-stlport-4.6.2-linux"/>
             <toolset name="msvc"/>
+            <toolset name="vc-6_5"/>
             <toolset name="vc-7_0"/>
                 <note author="J. Garland">
                    Some older compilers are confused by the template code here.
@@ -550,6 +549,7 @@
             <toolset name="gcc-2.95.3-stlport-4.5.3-linux"/>
             <toolset name="gcc-2.95.3-stlport-4.6.2-linux"/>
             <toolset name="msvc"/>
+            <toolset name="vc-6_5"/>
             <toolset name="vc-7_0"/>
                 <note author="J. Garland">
                    Some older compilers are confused by the template code here.
@@ -565,6 +565,7 @@
             <toolset name="gcc-2.95.3-linux"/>
             <toolset name="*como-4_3_3*"/>
             <toolset name="msvc"/>
+            <toolset name="vc-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
@@ -578,6 +579,7 @@
             <toolset name="borland-5_6_4"/>
             <toolset name="gcc-2.95.3-linux"/>
             <toolset name="msvc"/>
+            <toolset name="vc-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
@@ -602,6 +604,7 @@
                 <toolset name="*como-4_3_3*"/>
                 <toolset name="gcc-2.95.3-linux"/>
                 <toolset name="msvc"/>
+                <toolset name="vc-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
@@ -615,6 +618,7 @@
                 <toolset name="gcc-2.95.3-linux"/>
                 <toolset name="gcc-3.1-darwin"/>
                 <toolset name="msvc"/>
+                <toolset name="vc-6_5"/>
                 <toolset name="vc-7_0"/>
                 <toolset name="borland-5_6_4"/>
                 <toolset name="mingw*"/>
@@ -629,6 +633,7 @@
                 <toolset name="gcc-2.95.3-linux"/>
                 <toolset name="gcc-3.1-darwin"/>
                 <toolset name="msvc"/>
+                <toolset name="vc-6_5"/>
                 <toolset name="vc-7_0"/>
                 <toolset name="borland-5_6_4"/>
                 <toolset name="mingw*"/>
@@ -642,6 +647,7 @@
                 <toolset name="gcc-2.95.3-linux"/>
                 <toolset name="gcc-3.1-darwin"/>
                 <toolset name="msvc"/>
+                <toolset name="vc-6_5"/>
                 <toolset name="mingw*"/>
                 <toolset name="tru64cxx65-042"/>
                 <note author="B. Garst" refid="18,19"/>
@@ -652,6 +658,7 @@
                 <toolset name="gcc-2.95.3-linux"/>
                 <toolset name="gcc-3.1-darwin"/>
                 <toolset name="msvc"/>
+                <toolset name="vc-6_5"/>
                 <toolset name="mingw*"/>
                 <toolset name="*como-4_3_3*"/>
                 <toolset name="tru64cxx65-042"/>
@@ -667,6 +674,7 @@
             <mark-failure>
                 <toolset name="gcc-2.95.3-linux"/>
                 <toolset name="msvc"/>
+                <toolset name="vc-6_5"/>
                 <toolset name="vc-7_0"/>
                 <toolset name="tru64cxx65-042"/>
                 <note author="B. Garst" refid="18,20"/>
@@ -685,6 +693,7 @@
                 <toolset name="gcc-2.95.3-linux"/>
                 <toolset name="gcc-3.1-darwin"/>
                 <toolset name="msvc"/>
+                <toolset name="vc-6_5"/>
                 <toolset name="vc-7_0"/>
                 <toolset name="borland-5_6_4"/>
                 <toolset name="mingw-3*"/>
@@ -811,10 +820,8 @@
     <library name="functional/hash">
         <mark-expected-failures>
             <test name="hash_value_array_test"/>
-            <toolset name="msvc"/>
-            <toolset name="msvc-stlport"/>
-            <toolset name="vc-6_5"/>
-            <toolset name="vc-6_5-stlport"/>
+            <toolset name="msvc*"/>
+            <toolset name="vc-6_5*"/>
             <toolset name="vc-7_0"/>
             <note author="Daniel James">
               hash_value is not overloaded for arrays for older versions
@@ -826,10 +833,8 @@
 
         <mark-expected-failures>
             <test name="hash_function_pointer_test"/>
-            <toolset name="msvc"/>
-            <toolset name="msvc-stlport"/>
-            <toolset name="vc-6_5"/>
-            <toolset name="vc-6_5-stlport"/>
+            <toolset name="msvc*"/>
+            <toolset name="vc-6_5*"/>
             <toolset name="vc-7_0"/>
             <note refid="2" author="Daniel James"/>
         </mark-expected-failures>
@@ -855,9 +860,8 @@
     <library name="graph">
         <mark-unusable>
             <toolset name="borland-5_6_4"/>
-            <toolset name="msvc"/>
-            <toolset name="msvc-stlport"/>
-            <toolset name="vc-6_5-stlport"/>
+            <toolset name="msvc*"/>
+            <toolset name="vc-6_5*"/>
             <toolset name="sunpro-5_3-sunos"/>
         </mark-unusable>
         <mark-expected-failures>
@@ -916,9 +920,8 @@
             <test name="ios_state_unit_test"/>
             <toolset name="borland-5_6_4"/>
             <toolset name="iw-7_1-vc6*"/>
-            <toolset name="msvc"/>
-            <toolset name="msvc-stlport"/>
-            <toolset name="vc-6_5-stlport"/>
+            <toolset name="msvc*"/>
+            <toolset name="vc-6_5*"/>
             <note refid="4" author="Aleksey Gurtovoy"/>
         </mark-expected-failures>
         <mark-expected-failures>
@@ -1000,9 +1003,8 @@
     <!-- lambda -->
     <library name="lambda">
         <mark-unusable>
-            <toolset name="msvc"/>
-            <toolset name="msvc-stlport"/>
-            <toolset name="vc-6_5-stlport"/>
+            <toolset name="msvc*"/>
+            <toolset name="vc-6_5*"/>
             <toolset name="borland"/>
             <toolset name="borland-5_6_4"/>
             <toolset name="borland-5_5_1"/>
@@ -1148,6 +1150,7 @@
         <test name="constructors">
             <mark-failure>
                <toolset name="msvc"/>
+               <toolset name="vc-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">
@@ -1223,9 +1226,8 @@ for more information.
     <library name="optional">
         <mark-expected-failures>
             <test name="optional_test_ref"/>
-            <toolset name="msvc"/>
-            <toolset name="msvc-stlport"/>
-            <toolset name="vc-6_5-stlport"/>
+            <toolset name="msvc*"/>
+            <toolset name="vc-6_5*"/>
             <toolset name="vc-7_0"/>
             <note author="Aleksey Gurtovoy" refid="3"/>
         </mark-expected-failures>
@@ -1450,9 +1452,8 @@ for more information.
     <!-- spirit -->
     <library name="spirit">
         <mark-unusable>
-            <toolset name="msvc"/>
-            <toolset name="msvc-stlport"/>
-            <toolset name="vc-6_5-stlport"/>
+            <toolset name="msvc*"/>
+            <toolset name="vc-6_5*"/>
             <toolset name="borland-5_5_1"/>
             <toolset name="borland-5_6_4"/>
             <toolset name="vc-7_0"/>
@@ -1536,15 +1537,15 @@ for more information.
         <test name="allocator_test">
             <mark-failure>
                 <toolset name="msvc"/>
+                <toolset name="vc-6_5"/>
                 <toolset name="vc-7_0"/>
                 <note author="B. Dawes" refid="5"/>
             </mark-failure>
         </test>
         <test name="contains_test">
             <mark-failure>
-                <toolset name="msvc"/>
-                <toolset name="msvc-stlport"/>
-                <toolset name="vc-6_5-stlport"/>
+                <toolset name="msvc*"/>
+                <toolset name="vc-6_5*"/>
                 <note refid="3" author="D. Gregor"/>
             </mark-failure>
         </test>
@@ -1559,6 +1560,7 @@ for more information.
                 <toolset name="borland"/>
                 <toolset name="borland-5_6_4"/>
                 <toolset name="msvc"/>
+                <toolset name="vc-6_5"/>
                 <toolset name="vc-7_0"/>
                 <note author="B. Dawes" refid="3"/>
             </mark-failure>
@@ -1568,6 +1570,7 @@ for more information.
                 <toolset name="borland"/>
                 <toolset name="borland-5_6_4"/>
                 <toolset name="msvc"/>
+                <toolset name="vc-6_5"/>
                 <toolset name="vc-7_0"/>
                 <note author="B. Dawes" refid="3"/>
             </mark-failure>
@@ -1577,6 +1580,7 @@ for more information.
                 <toolset name="borland"/>
                 <toolset name="borland-5_6_4"/>
                 <toolset name="msvc"/>
+                <toolset name="vc-6_5"/>
                 <toolset name="vc-7_0"/>
                 <note author="B. Dawes" refid="3"/>
             </mark-failure>
@@ -1590,6 +1594,7 @@ for more information.
                 <toolset name="borland"/>
                 <toolset name="borland-5_6_4"/>
                 <toolset name="msvc"/>
+                <toolset name="vc-6_5"/>
                 <toolset name="vc-7_0"/>
                 <note author="B. Dawes" refid="3"/>
             </mark-failure>
@@ -1603,6 +1608,7 @@ for more information.
                 <toolset name="borland"/>
                 <toolset name="borland-5_6_4"/>
                 <toolset name="msvc"/>
+                <toolset name="vc-6_5"/>
                 <toolset name="vc-7_0"/>
                 <note author="B. Dawes" refid="3"/>
             </mark-failure>
@@ -1616,6 +1622,7 @@ for more information.
                 <toolset name="borland"/>
                 <toolset name="borland-5_6_4"/>
                 <toolset name="msvc"/>
+                <toolset name="vc-6_5"/>
                 <toolset name="vc-7_0"/>
                 <note author="B. Dawes" refid="3"/>
             </mark-failure>
@@ -1623,6 +1630,7 @@ for more information.
         <test name="std_bind_portable">
             <mark-failure>
                 <toolset name="msvc"/>
+                <toolset name="vc-6_5"/>
                 <note author="B. Dawes" refid="5"/>
             </mark-failure>
         </test>
@@ -1631,6 +1639,7 @@ for more information.
                 <toolset name="borland"/>
                 <toolset name="borland-5_6_4"/>
                 <toolset name="msvc"/>
+                <toolset name="vc-6_5"/>
                 <toolset name="vc-7_0"/>
                 <note author="B. Dawes" refid="3"/>
             </mark-failure>
@@ -1645,6 +1654,7 @@ for more information.
                 <toolset name="borland"/>
                 <toolset name="borland-5_6_4"/>
                 <toolset name="msvc"/>
+                <toolset name="vc-6_5"/>
                 <toolset name="vc-7_0"/>
                 <note author="B. Dawes" refid="2"/>
             </mark-failure>
@@ -1670,6 +1680,7 @@ for more information.
                 <toolset name="borland"/>
                 <toolset name="borland-5_6_4"/>
                 <toolset name="msvc"/>
+                <toolset name="vc-6_5"/>
                 <toolset name="vc-7_0"/>
                 <note refid="2"/>
             </mark-failure>
@@ -1758,9 +1769,8 @@ for more information.
         <mark-unusable>
             <toolset name="borland"/>
             <toolset name="borland-5_6_4"/>
-            <toolset name="msvc"/>
-            <toolset name="msvc-stlport"/>
-            <toolset name="vc-6_5-stlport"/>
+            <toolset name="msvc*"/>
+            <toolset name="vc-6_5*"/>
             <toolset name="vc-7_0"/>
         </mark-unusable>
         <test name="test_float">
@@ -1806,9 +1816,8 @@ for more information.
         </mark-unusable>
         <mark-unusable>
             <toolset name="cw-8_3"/>
-            <toolset name="msvc"/>
-            <toolset name="msvc-stlport"/>
-            <toolset name="vc-6_5-stlport"/>
+            <toolset name="msvc*"/>
+            <toolset name="vc-6_5*"/>
             <toolset name="vc-7_0"/>
             <toolset name="iw-7_1-vc6"/>
             <toolset name="gcc-2.95.3-linux"/>
@@ -1844,9 +1853,8 @@ for more information.
         </mark-unusable>
 
         <mark-unusable>
-            <toolset name="msvc"/>
-            <toolset name="msvc-stlport"/>
-            <toolset name="vc-6_5-stlport"/>
+            <toolset name="msvc*"/>
+            <toolset name="vc-6_5*"/>
             <note refid="17"/>
         </mark-unusable>
 
@@ -1857,9 +1865,8 @@ for more information.
             <mark-failure>
                 <toolset name="iw-7_1-vc6"/>
                 <toolset name="iw-7_1-vc6-stlp-4_5_3"/>
-                <toolset name="msvc"/>
-                <toolset name="msvc-stlport"/>
-                <toolset name="vc-6_5-stlport"/>
+                <toolset name="msvc*"/>
+                <toolset name="vc-6_5*"/>
                 <note>The failures are caused by problems
                     with std::locale implementation</note>
             </mark-failure>
@@ -1868,6 +1875,7 @@ for more information.
         <test name="options_description_test_dll">
              <mark-failure>
                 <toolset name="msvc"/>
+                <toolset name="vc-6_5"/>
                 <toolset name="iw-7_1-vc6"/>
                 <note refid="23"/>
             </mark-failure>
@@ -1897,9 +1905,8 @@ for more information.
         <mark-expected-failures>
             <test name="variable_map_test"/>
             <test name="variable_map_test_dll"/>
-            <toolset name="msvc"/>
-            <toolset name="msvc-stlport"/>
-            <toolset name="vc-6_5-stlport"/>
+            <toolset name="msvc*"/>
+            <toolset name="vc-6_5*"/>
             <note>
                The failures are caused by compiler bug: it's not possible to
                explicitly pass template arguments to member template function. The
@@ -2197,6 +2204,7 @@ for more information.
         <test name="regex_token_iterator_eg_2">
             <mark-failure>
                 <toolset name="msvc"/>
+                <toolset name="vc-6_5"/>
                 <note author="J. Maddock"/>
             </mark-failure>
         </test>
@@ -2236,9 +2244,8 @@ for more information.
             <mark-failure>
                 <toolset name="gcc-2.95.3-linux"/>
                 <toolset name="sunpro-5_3-sunos"/>
-                <toolset name="msvc-stlport"/>
-                <toolset name="vc-6_5-stlport"/>
-                <toolset name="msvc"/>
+                <toolset name="msvc*"/>
+                <toolset name="vc-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.
@@ -2287,6 +2294,7 @@ for more information.
                 <toolset name="borland"/>
                 <toolset name="borland-5_6_4"/>
                 <toolset name="msvc"/>
+                <toolset name="vc-6_5"/>
                 <toolset name="vc-7_0"/>
                 <note author="B. Dawes" refid="3"/>
             </mark-failure>
@@ -2348,9 +2356,8 @@ for more information.
 
         <mark-expected-failures>
             <test name="token_iterator_test"/>
-            <toolset name="msvc"/>
-            <toolset name="msvc-stlport"/>
-            <toolset name="vc-6_5-stlport"/>
+            <toolset name="msvc*"/>
+            <toolset name="vc-6_5*"/>
             <toolset name="iw-7_1-vc6"/>
             <toolset name="vc-7_0"/>
             <toolset name="vc-7_0-stlport"/>
@@ -2365,9 +2372,8 @@ for more information.
 
         <mark-expected-failures>
             <test name="test_fp_comparisons"/>
-            <toolset name="msvc"/>
-            <toolset name="msvc-stlport"/>
-            <toolset name="vc-6_5-stlport"/>
+            <toolset name="msvc*"/>
+            <toolset name="vc-6_5*"/>
             <toolset name="vc-7_0"/>
             <toolset name="vc-7_0-stlport"/>
             <note author="Gennadiy Rozental" refid="3"/>
@@ -2480,9 +2486,8 @@ for more information.
             <test name="remove_all_extents_test"/>
             <test name="rank_test"/>
             <test name="is_unsigned_test"/>
-            <toolset name="msvc"/>
-            <toolset name="msvc-stlport"/>
-            <toolset name="vc-6_5-stlport"/>
+            <toolset name="msvc*"/>
+            <toolset name="vc-6_5*"/>
             <toolset name="vc-7_0"/>
             <note author="Aleksey Gurtovoy">
                 This failure is caused by the lack of compiler support for class template
@@ -2508,9 +2513,8 @@ for more information.
         <test name="tricky_is_enum_test">
             <mark-failure>
                 <toolset name="borland-5_6_4"/>
-                <toolset name="msvc"/>
-                <toolset name="msvc-stlport"/>
-                <toolset name="vc-6_5-stlport"/>
+                <toolset name="msvc*"/>
+                <toolset name="vc-6_5*"/>
                 <toolset name="gcc-2.95.3-*"/>
             </mark-failure>
         </test>
@@ -2527,9 +2531,8 @@ for more information.
                 <toolset name="cw-9_3*"/>
                 <toolset name="cw-9_4*"/>
                 <toolset name="cw-9_5*"/>
-                <toolset name="msvc"/>
-                <toolset name="msvc-stlport"/>
-                <toolset name="vc-6_5-stlport"/>
+                <toolset name="msvc*"/>
+                <toolset name="vc-6_5*"/>
                 <toolset name="vc-7_0"/>
                 <toolset name="mingw-3_3*"/>
                 <toolset name="gcc-2*"/>
@@ -2623,9 +2626,8 @@ for more information.
             <toolset name="borland"/>
             <toolset name="borland-5_6_4"/>
             <toolset name="cw-8_3*"/>
-            <toolset name="msvc"/>
-            <toolset name="msvc-stlport"/>
-            <toolset name="vc-6_5-stlport"/>
+            <toolset name="msvc*"/>
+            <toolset name="vc-6_5*"/>
             <toolset name="vc-7_0"/>
             <note refid="3"/>
         </mark-unusable>
@@ -2650,9 +2652,8 @@ for more information.
             <mark-failure>
                 <toolset name="borland-5*"/>
                 <toolset name="cw-8_3*"/>
-                <toolset name="msvc"/>
-                <toolset name="msvc-stlport"/>
-                <toolset name="vc-6_5-stlport"/>
+                <toolset name="msvc*"/>
+                <toolset name="vc-6_5*"/>
                 <toolset name="vc-7_0"/>
                 <toolset name="gcc-2.95.3*"/>
                 <toolset name="sunpro-5_3-sunos"/>
@@ -2683,9 +2684,8 @@ for more information.
         <test name="recursive_variant_test">
             <mark-failure>
                 <toolset name="como-win32"/>
-                <toolset name="msvc"/>
-                <toolset name="msvc-stlport"/>
-                <toolset name="vc-6_5-stlport"/>
+                <toolset name="msvc*"/>
+                <toolset name="vc-6_5*"/>
                 <toolset name="vc-7_0"/>
                 <note refid="3"/>
             </mark-failure>
@@ -2702,9 +2702,8 @@ for more information.
         <test name="variant_reference_test">
             <mark-failure>
                 <toolset name="cw-8_3*"/>
-                <toolset name="msvc"/>
-                <toolset name="msvc-stlport"/>
-                <toolset name="vc-6_5-stlport"/>
+                <toolset name="msvc*"/>
+                <toolset name="vc-6_5*"/>
                 <toolset name="vc-7_0"/>
                 <note refid="3"/>
             </mark-failure>
@@ -2720,10 +2719,9 @@ for more information.
     <!-- wave -->
     <library name="wave">
         <mark-unusable>
-            <toolset name="msvc"/>
+            <toolset name="msvc*"/>
+            <toolset name="vc-6_5*"/>
             <toolset name="sunpro-5_3-sunos"/>
-            <toolset name="msvc-stlport"/>
-            <toolset name="vc-6_5-stlport"/>
             <toolset name="borland-5_5_1"/>
             <toolset name="borland-5_6_4"/>
             <toolset name="gcc-2.95.3-linux"/>

粤ICP备19079148号