diff options
| author | Louis Dionne <ldionne@apple.com> | 2018-09-23 23:17:48 +0000 |
|---|---|---|
| committer | Louis Dionne <ldionne@apple.com> | 2018-09-23 23:17:48 +0000 |
| commit | 255f376f6b08e3040449b5eb98ff9f8382577a8b (patch) | |
| tree | e1c97f177c57c1031cf567853a5b27b88e0dc22a /libcxx/test/std/utilities/function.objects | |
| parent | 593b23f6a74e99e63b12b5b2159faee66800dd85 (diff) | |
| download | bcm5719-llvm-255f376f6b08e3040449b5eb98ff9f8382577a8b.tar.gz bcm5719-llvm-255f376f6b08e3040449b5eb98ff9f8382577a8b.zip | |
[libcxx] Fix the binder deprecation tests on Clang 5.
Tested on Docker containers with Clang 4, 5 and 6.
llvm-svn: 342855
Diffstat (limited to 'libcxx/test/std/utilities/function.objects')
4 files changed, 8 insertions, 24 deletions
diff --git a/libcxx/test/std/utilities/function.objects/negators/binary_negate.depr_in_cxx17.fail.cpp b/libcxx/test/std/utilities/function.objects/negators/binary_negate.depr_in_cxx17.fail.cpp index 232c8964ee4..c8247a19591 100644 --- a/libcxx/test/std/utilities/function.objects/negators/binary_negate.depr_in_cxx17.fail.cpp +++ b/libcxx/test/std/utilities/function.objects/negators/binary_negate.depr_in_cxx17.fail.cpp @@ -13,6 +13,7 @@ // deprecated in C++17 // UNSUPPORTED: clang-4.0 +// UNSUPPORTED: c++98, c++03, c++11, c++14 // REQUIRES: verify-support // MODULES_DEFINES: _LIBCPP_ENABLE_DEPRECATION_WARNINGS @@ -29,11 +30,6 @@ struct Predicate { }; int main() { -#if TEST_STD_VER < 17 - // expected-no-diagnostics -#else - // expected-error@* 1 {{'binary_negate<Predicate>' is deprecated}} -#endif - std::binary_negate<Predicate> f((Predicate())); + std::binary_negate<Predicate> f((Predicate())); // expected-error{{'binary_negate<Predicate>' is deprecated}} (void)f; } diff --git a/libcxx/test/std/utilities/function.objects/negators/not1.depr_in_cxx17.fail.cpp b/libcxx/test/std/utilities/function.objects/negators/not1.depr_in_cxx17.fail.cpp index 85c2d0ad94a..584d3ab0639 100644 --- a/libcxx/test/std/utilities/function.objects/negators/not1.depr_in_cxx17.fail.cpp +++ b/libcxx/test/std/utilities/function.objects/negators/not1.depr_in_cxx17.fail.cpp @@ -13,6 +13,7 @@ // deprecated in C++17 // UNSUPPORTED: clang-4.0 +// UNSUPPORTED: c++98, c++03, c++11, c++14 // REQUIRES: verify-support // MODULES_DEFINES: _LIBCPP_ENABLE_DEPRECATION_WARNINGS @@ -28,10 +29,5 @@ struct Predicate { }; int main() { -#if TEST_STD_VER < 17 - // expected-no-diagnostics -#else - // expected-error@* 1 {{'not1<Predicate>' is deprecated}} -#endif - std::not1(Predicate()); + std::not1(Predicate()); // expected-error{{'not1<Predicate>' is deprecated}} } diff --git a/libcxx/test/std/utilities/function.objects/negators/not2.depr_in_cxx17.fail.cpp b/libcxx/test/std/utilities/function.objects/negators/not2.depr_in_cxx17.fail.cpp index c2e51aee3c1..92e3be580af 100644 --- a/libcxx/test/std/utilities/function.objects/negators/not2.depr_in_cxx17.fail.cpp +++ b/libcxx/test/std/utilities/function.objects/negators/not2.depr_in_cxx17.fail.cpp @@ -13,6 +13,7 @@ // deprecated in C++17 // UNSUPPORTED: clang-4.0 +// UNSUPPORTED: c++98, c++03, c++11, c++14 // REQUIRES: verify-support // MODULES_DEFINES: _LIBCPP_ENABLE_DEPRECATION_WARNINGS @@ -29,10 +30,5 @@ struct Predicate { }; int main() { -#if TEST_STD_VER < 17 - // expected-no-diagnostics -#else - // expected-error@* 1 {{'not2<Predicate>' is deprecated}} -#endif - std::not2(Predicate()); + std::not2(Predicate()); // expected-error{{'not2<Predicate>' is deprecated}} } diff --git a/libcxx/test/std/utilities/function.objects/negators/unary_negate.depr_in_cxx17.fail.cpp b/libcxx/test/std/utilities/function.objects/negators/unary_negate.depr_in_cxx17.fail.cpp index a0d559acbd2..b38a7d2f1c0 100644 --- a/libcxx/test/std/utilities/function.objects/negators/unary_negate.depr_in_cxx17.fail.cpp +++ b/libcxx/test/std/utilities/function.objects/negators/unary_negate.depr_in_cxx17.fail.cpp @@ -13,6 +13,7 @@ // deprecated in C++17 // UNSUPPORTED: clang-4.0 +// UNSUPPORTED: c++98, c++03, c++11, c++14 // REQUIRES: verify-support // MODULES_DEFINES: _LIBCPP_ENABLE_DEPRECATION_WARNINGS @@ -28,11 +29,6 @@ struct Predicate { }; int main() { -#if TEST_STD_VER < 17 - // expected-no-diagnostics -#else - // expected-error@* 1 {{'unary_negate<Predicate>' is deprecated}} -#endif - std::unary_negate<Predicate> f((Predicate())); + std::unary_negate<Predicate> f((Predicate())); // expected-error{{'unary_negate<Predicate>' is deprecated}} (void)f; } |
