diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2019-06-24 21:46:05 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2019-06-24 21:46:05 +0000 |
| commit | 66e6e37447b183b1c8bac9330a4658530d2d49e6 (patch) | |
| tree | 3ad7b4934d5e2eae0cd42fbbdddd17b931cf8d5e /libcxx/test | |
| parent | 3081f78776ac4210dba16469f05a784fcb6fe7a8 (diff) | |
| download | bcm5719-llvm-66e6e37447b183b1c8bac9330a4658530d2d49e6.tar.gz bcm5719-llvm-66e6e37447b183b1c8bac9330a4658530d2d49e6.zip | |
Fix test failures when using a custom ABI namespace.
llvm-svn: 364239
Diffstat (limited to 'libcxx/test')
| -rw-r--r-- | libcxx/test/std/containers/views/span.tuple/tuple_size.fail.cpp | 4 | ||||
| -rw-r--r-- | libcxx/test/std/utilities/variant/variant.variant/variant.assign/copy.fail.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libcxx/test/std/containers/views/span.tuple/tuple_size.fail.cpp b/libcxx/test/std/containers/views/span.tuple/tuple_size.fail.cpp index 1d3d5b39878..d7a54403b29 100644 --- a/libcxx/test/std/containers/views/span.tuple/tuple_size.fail.cpp +++ b/libcxx/test/std/containers/views/span.tuple/tuple_size.fail.cpp @@ -15,7 +15,7 @@ int main(int, char**) { - (void) std::tuple_size<std::span<double>>::value; // expected-error-re {{implicit instantiation of undefined template 'std::__1::tuple_size<std::__1::span<double, {{.*}}}} - (void) std::tuple_size<std::span<int>>::value; // expected-error-re {{implicit instantiation of undefined template 'std::__1::tuple_size<std::__1::span<int, {{.*}}}} + (void) std::tuple_size<std::span<double>>::value; // expected-error-re {{implicit instantiation of undefined template 'std:{{.*}}:tuple_size<std:{{.*}}:span<double, {{.*}}}} + (void) std::tuple_size<std::span<int>>::value; // expected-error-re {{implicit instantiation of undefined template 'std:{{.*}}:tuple_size<std:{{.*}}:span<int, {{.*}}}} return 0; } diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.assign/copy.fail.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.assign/copy.fail.cpp index 46e26e71384..8b883fd2e36 100644 --- a/libcxx/test/std/utilities/variant/variant.variant/variant.assign/copy.fail.cpp +++ b/libcxx/test/std/utilities/variant/variant.variant/variant.assign/copy.fail.cpp @@ -29,5 +29,5 @@ int main(int, char**) std::variant<NotCopyConstructible> v; std::variant<NotCopyConstructible> v1; std::variant<NotCopyConstructible> v2(v); // expected-error {{call to implicitly-deleted copy constructor of 'std::variant<NotCopyConstructible>'}} - v1 = v; // expected-error {{object of type 'std::__1::variant<NotCopyConstructible>' cannot be assigned because its copy assignment operator is implicitly deleted}} + v1 = v; // expected-error-re {{object of type 'std:{{.*}}:variant<NotCopyConstructible>' cannot be assigned because its copy assignment operator is implicitly deleted}} } |
