From 58c10b84ed7778ad3b48b7f0381bb0d57472d301 Mon Sep 17 00:00:00 2001
From: Eric Niebler <eric@boostpro.com>
Date: Sun, 25 Sep 2011 19:20:56 +0000
Subject: merge [74567] from trunk

[SVN r74568]
---
 status/explicit-failures-markup.xml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'status')

diff --git a/status/explicit-failures-markup.xml b/status/explicit-failures-markup.xml
index 0b577a4754..eaac2c9671 100644
--- a/status/explicit-failures-markup.xml
+++ b/status/explicit-failures-markup.xml
@@ -1571,7 +1571,7 @@
             <toolset name="gcc-3.2*"/>
             <toolset name="gcc-3_3-darwin"/>
             <toolset name="intel-linux"/>
-            <toolset name="vacpp"/>
+            <toolset name="vacpp*"/>
             <toolset name="cw-8.3"/>
             <toolset name="cw-9.4"/>
             <toolset name="cw-9.5-darwin"/>
@@ -1582,7 +1582,7 @@
             <toolset name="sun-5.7"/>
             <toolset name="sun-5.8"/>
             <toolset name="sun-5.9"/>
-            <toolset name="pathscale*"/>
+            <toolset name="sun-5.10"/>
             <note author="Eric Niebler">
                 This compiler does not support detection of
                 const rvalues.
@@ -1601,7 +1601,7 @@
             <toolset name="gcc-3.2*"/>
             <toolset name="gcc-3_3-darwin"/>
             <toolset name="intel-linux"/>
-            <toolset name="vacpp"/>
+            <toolset name="vacpp*"/>
             <toolset name="cw-8.3"/>
             <toolset name="cw-9.4"/>
             <toolset name="cw-9.5-darwin"/>
@@ -1612,7 +1612,7 @@
             <toolset name="sun-5.7"/>
             <toolset name="sun-5.8"/>
             <toolset name="sun-5.9"/>
-            <toolset name="pathscale*"/>
+            <toolset name="sun-5.10"/>
             <note author="Eric Niebler">
                 This compiler does not support detection of
                 const rvalues.
@@ -1632,6 +1632,7 @@
             <toolset name="sun-5.7"/>
             <toolset name="sun-5.8"/>
             <toolset name="sun-5.9"/>
+            <toolset name="sun-5.10"/>
             <note author="Eric Niebler">
                 This compiler does not support detection of
                 rvalues.
@@ -1651,6 +1652,7 @@
             <toolset name="sun-5.7"/>
             <toolset name="sun-5.8"/>
             <toolset name="sun-5.9"/>
+            <toolset name="sun-5.10"/>
             <note author="Eric Niebler">
                 This compiler does not support detection of
                 rvalues.
-- 
cgit v1.2.1