summaryrefslogtreecommitdiffstats
path: root/libcxx/test/std/utilities
diff options
context:
space:
mode:
authorLouis Dionne <ldionne@apple.com>2019-06-18 14:40:15 +0000
committerLouis Dionne <ldionne@apple.com>2019-06-18 14:40:15 +0000
commit1fab01f92bdb23bfce98ee1281fe7be10ec04373 (patch)
tree9caa5814c87b3da9cb20b8eafa5fa2203f831517 /libcxx/test/std/utilities
parenta45292cbfd24cea9b0f0927727295a82d99cc40b (diff)
downloadbcm5719-llvm-1fab01f92bdb23bfce98ee1281fe7be10ec04373.tar.gz
bcm5719-llvm-1fab01f92bdb23bfce98ee1281fe7be10ec04373.zip
[libc++] Revert the addition of map/multimap CTAD
This was found to be broken on Clang trunk. This is a revert of the following commits (the subsequent commits added XFAILs to the tests that were missing from the original submission): r362986: Implement deduction guides for map/multimap. r363014: Add some XFAILs r363097: Add more XFAILs r363197: Add even more XFAILs llvm-svn: 363688
Diffstat (limited to 'libcxx/test/std/utilities')
-rw-r--r--libcxx/test/std/utilities/meta/meta.rel/is_base_of_union.pass.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/libcxx/test/std/utilities/meta/meta.rel/is_base_of_union.pass.cpp b/libcxx/test/std/utilities/meta/meta.rel/is_base_of_union.pass.cpp
index 59f231f3c4d..67cffbd3613 100644
--- a/libcxx/test/std/utilities/meta/meta.rel/is_base_of_union.pass.cpp
+++ b/libcxx/test/std/utilities/meta/meta.rel/is_base_of_union.pass.cpp
@@ -17,8 +17,7 @@
// Clang before v9 and apple-clang up to and including v10 do not
// report that unions are never base classes - nor can they have bases.
// See https://reviews.llvm.org/D61858
-// XFAIL: apple-clang-6.0, apple-clang-7.0, apple-clang-8.0
-// XFAIL: apple-clang-9.0, apple-clang-9.1, apple-clang-10.0
+// XFAIL: apple-clang-6.0, apple-clang-7.0, apple-clang-8.0, apple-clang-9.0, apple-clang-10.0
// XFAIL: clang-3.3, clang-3.4, clang-3.5, clang-3.6, clang-3.7, clang-3.8, clang-3.9
// XFAIL: clang-4.0, clang-5.0, clang-6.0, clang-7.0, clang-8.0
OpenPOWER on IntegriCloud