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/depr | |
| 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/depr')
4 files changed, 8 insertions, 24 deletions
diff --git a/libcxx/test/std/depr/depr.lib.binders/depr.lib.bind.1st/bind1st.depr_in_cxx11.fail.cpp b/libcxx/test/std/depr/depr.lib.binders/depr.lib.bind.1st/bind1st.depr_in_cxx11.fail.cpp index 3e61bd99fe2..652f53181a3 100644 --- a/libcxx/test/std/depr/depr.lib.binders/depr.lib.bind.1st/bind1st.depr_in_cxx11.fail.cpp +++ b/libcxx/test/std/depr/depr.lib.binders/depr.lib.bind.1st/bind1st.depr_in_cxx11.fail.cpp @@ -12,6 +12,7 @@ // bind1st // UNSUPPORTED: clang-4.0 +// UNSUPPORTED: c++98, c++03 // REQUIRES: verify-support // MODULES_DEFINES: _LIBCPP_ENABLE_DEPRECATION_WARNINGS @@ -26,10 +27,5 @@ int main() { -#if TEST_STD_VER < 11 - // expected-no-diagnostics -#else - // expected-error@* 1 {{'bind1st<test_func, int>' is deprecated}} -#endif - std::bind1st(test_func(1), 5); + std::bind1st(test_func(1), 5); // expected-error{{'bind1st<test_func, int>' is deprecated}} } diff --git a/libcxx/test/std/depr/depr.lib.binders/depr.lib.bind.2nd/bind2nd.depr_in_cxx11.fail.cpp b/libcxx/test/std/depr/depr.lib.binders/depr.lib.bind.2nd/bind2nd.depr_in_cxx11.fail.cpp index 1f0d24f1f34..95cf150cc9f 100644 --- a/libcxx/test/std/depr/depr.lib.binders/depr.lib.bind.2nd/bind2nd.depr_in_cxx11.fail.cpp +++ b/libcxx/test/std/depr/depr.lib.binders/depr.lib.bind.2nd/bind2nd.depr_in_cxx11.fail.cpp @@ -12,6 +12,7 @@ // bind2nd // UNSUPPORTED: clang-4.0 +// UNSUPPORTED: c++98, c++03 // REQUIRES: verify-support // MODULES_DEFINES: _LIBCPP_ENABLE_DEPRECATION_WARNINGS @@ -26,10 +27,5 @@ int main() { -#if TEST_STD_VER < 11 - // expected-no-diagnostics -#else - // expected-error@* 1 {{'bind2nd<test_func, int>' is deprecated}} -#endif - std::bind2nd(test_func(1), 5); + std::bind2nd(test_func(1), 5); // expected-error{{'bind2nd<test_func, int>' is deprecated}} } diff --git a/libcxx/test/std/depr/depr.lib.binders/depr.lib.binder.1st/binder1st.depr_in_cxx11.fail.cpp b/libcxx/test/std/depr/depr.lib.binders/depr.lib.binder.1st/binder1st.depr_in_cxx11.fail.cpp index b8dbc36a1f9..8f57eba4d97 100644 --- a/libcxx/test/std/depr/depr.lib.binders/depr.lib.binder.1st/binder1st.depr_in_cxx11.fail.cpp +++ b/libcxx/test/std/depr/depr.lib.binders/depr.lib.binder.1st/binder1st.depr_in_cxx11.fail.cpp @@ -12,6 +12,7 @@ // binder1st // UNSUPPORTED: clang-4.0 +// UNSUPPORTED: c++98, c++03 // REQUIRES: verify-support // MODULES_DEFINES: _LIBCPP_ENABLE_DEPRECATION_WARNINGS @@ -26,10 +27,5 @@ int main() { -#if TEST_STD_VER < 11 - // expected-no-diagnostics -#else - // expected-error@* 1 {{'binder1st<test_func>' is deprecated}} -#endif - typedef std::binder1st<test_func> B1ST; + typedef std::binder1st<test_func> B1ST; // expected-error{{'binder1st<test_func>' is deprecated}} } diff --git a/libcxx/test/std/depr/depr.lib.binders/depr.lib.binder.2nd/binder2nd.depr_in_cxx11.fail.cpp b/libcxx/test/std/depr/depr.lib.binders/depr.lib.binder.2nd/binder2nd.depr_in_cxx11.fail.cpp index f63c07837d1..c49334fa097 100644 --- a/libcxx/test/std/depr/depr.lib.binders/depr.lib.binder.2nd/binder2nd.depr_in_cxx11.fail.cpp +++ b/libcxx/test/std/depr/depr.lib.binders/depr.lib.binder.2nd/binder2nd.depr_in_cxx11.fail.cpp @@ -12,6 +12,7 @@ // binder2nd // UNSUPPORTED: clang-4.0 +// UNSUPPORTED: c++98, c++03 // REQUIRES: verify-support // MODULES_DEFINES: _LIBCPP_ENABLE_DEPRECATION_WARNINGS @@ -26,10 +27,5 @@ int main() { -#if TEST_STD_VER < 11 - // expected-no-diagnostics -#else - // expected-error@* 1 {{'binder2nd<test_func>' is deprecated}} -#endif - typedef std::binder2nd<test_func> B2ND; + typedef std::binder2nd<test_func> B2ND; // expected-error{{'binder2nd<test_func>' is deprecated}} } |
