Cross merge change in HEAD and RC_1_34_0 to bring both versions in sync with each other.

[SVN r34423]

status/explicit-failures-markup.xml

@@ -24,7 +24,6 @@
     <mark-toolset name="borland-5_8_2" status="required"/>
     <mark-toolset name="cw-9.4" 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-stlport" status="required"/>
@@ -45,13 +44,14 @@
     <mark-toolset name="gcc-3_4_4_tru64" status="required"/>
     <mark-toolset name="gcc-4_0_3_tru64" status="required"/>
     <mark-toolset name="gcc-3.4.3_sunos" status="required"/>
-    <mark-toolset name="hp_cxx-71_006_tru64" status="required"/>
-    <mark-toolset name="qcc-3.3.5-cpp" status="required"/>
-    <mark-toolset name="qcc-3.3.5-gpp" status="required"/>
     <mark-toolset name="darwin-4.0.1" status="required"/>
+    <mark-toolset name="qcc-3.3.5_cpp" status="required"/>
+    <mark-toolset name="qcc-3.3.5_gpp" status="required"/>
     <mark-toolset name="intel-win-9.1" status="required"/>
     <mark-toolset name="intel-linux-9.0" status="required"/>
+    <mark-toolset name="hp_cxx-71_006_tru64" status="required"/>
     <mark-toolset name="sun-5.8" status="required"/>
+    <mark-toolset name="gcc-4.1.1_sunos_i86pc" status="required"/>
 
     <!-- /////////////// Libraries /////////////// -->
 
@@ -147,6 +147,7 @@
                 <toolset name="borland-5.6.4"/>
                 <toolset name="msvc"/>
                 <toolset name="vc-6_5"/>
+                <toolset name="vc-6_5-stlport"/>
                 <toolset name="msvc-6.5"/>
                 <toolset name="vc-7_0"/>
                 <note refid="3"/>
@@ -472,6 +473,7 @@
             <toolset name="vc-6_5-stlport"/>
             <toolset name="vc-6_5"/>
             <toolset name="msvc-6.5"/>
+            <toolset name="vc-7_0"/>
             <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"/>
@@ -2812,6 +2814,14 @@ for more information.
             <toolset name="gcc-3_3-darwin"/>
             <note author="M.Stevens" refid="17"/>
         </mark-unusable>
+        <mark-unusable>
+            <toolset name="cw-9.4"/>
+            <note author="M.Stevens" refid="2"/>
+        </mark-unusable>
+        <mark-unusable>
+            <toolset name="sun-5.8"/>
+            <note author="M.Stevens" refid="4"/>
+        </mark-unusable>
         <mark-unusable>
             <toolset name="cw-8_3"/>
             <toolset name="msvc"/>
@@ -3403,6 +3413,14 @@ for more information.
                 </note>
             </mark-failure>
         </test>
+        <test name="wide_posix_api_check_c">
+            <mark-failure>
+                <toolset name="qcc-3.3.5_gpp"/>
+                <note author="J. Maddock">
+                    No Wide character support on this platform.
+                </note>
+            </mark-failure>
+        </test>
         <test name="*_dll">
             <mark-failure>
                 <toolset name="*como-4_3_3*"/>
@@ -3424,6 +3442,7 @@ for more information.
         <test name="concept_check">
             <mark-failure>
                 <toolset name="vc-8_0"/>
+                <toolset name="msvc-8_0"/>
                 <toolset name="sunpro-5_3-sunos"/>
                 <toolset name="sun-5.8"/>
                 <toolset name="borland-5_8_2"/>
@@ -3916,10 +3935,13 @@ for more information.
     <library name="tr1">
         <mark-unusable>
             <toolset name="msvc"/>
+            <toolset name="vc-7.0"/>
+            <toolset name="msvc-7.0"/>
+            <toolset name="msvc-6*"/>
             <toolset name="VC6*"/>
             <toolset name="vc-6*"/>
             <note author="John Maddock">
-                VC6 has a buggy using declaration syntax which
+                VC6/7 has a buggy using declaration syntax which
                 basically makes it impossible to implement the 
                 namespace forwarding that this library relies upon.
                 See KB article 263630 here: http://support.microsoft.com/default.aspx?scid=kb;en-us;263630
@@ -4777,3 +4799,4 @@ for more information.
 
 
 
+