public inbox for libstdc++-cvs@sourceware.org help / color / mirror / Atom feed
From: Tamar Christina <tnfchris@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc(refs/vendors/ARM/heads/arm-perf-staging)] libstdc++: Improve tests for __cpp_lib_erase_if macro Date: Fri, 17 Jul 2020 14:49:07 +0000 (GMT) [thread overview] Message-ID: <20200717144907.C972039DE41F@sourceware.org> (raw) https://gcc.gnu.org/g:0fe9eaaa083b6cc032cbd3ad1286b1dd73ccdf54 commit 0fe9eaaa083b6cc032cbd3ad1286b1dd73ccdf54 Author: Jonathan Wakely <jwakely@redhat.com> Date: Wed Apr 22 07:21:01 2020 +0100 libstdc++: Improve tests for __cpp_lib_erase_if macro * testsuite/21_strings/basic_string/erasure.cc: Check for updated value of __cpp_lib_erase_if. * testsuite/23_containers/deque/erasure.cc: Likewise. * testsuite/23_containers/forward_list/erasure.cc: Likewise. * testsuite/23_containers/list/erasure.cc: Likewise. * testsuite/23_containers/map/erasure.cc: Likewise. * testsuite/23_containers/set/erasure.cc: Likewise. * testsuite/23_containers/unordered_map/erasure.cc: Likewise. * testsuite/23_containers/unordered_set/erasure.cc: Likewise. * testsuite/23_containers/vector/erasure.cc: Likewise. Diff: --- libstdc++-v3/ChangeLog | 14 ++++++++++++++ libstdc++-v3/testsuite/21_strings/basic_string/erasure.cc | 6 ++++++ libstdc++-v3/testsuite/23_containers/deque/erasure.cc | 4 ++-- .../testsuite/23_containers/forward_list/erasure.cc | 4 ++-- libstdc++-v3/testsuite/23_containers/list/erasure.cc | 4 ++-- libstdc++-v3/testsuite/23_containers/map/erasure.cc | 4 ++-- libstdc++-v3/testsuite/23_containers/set/erasure.cc | 4 ++-- .../testsuite/23_containers/unordered_map/erasure.cc | 4 ++-- .../testsuite/23_containers/unordered_set/erasure.cc | 4 ++-- libstdc++-v3/testsuite/23_containers/vector/erasure.cc | 4 ++-- 10 files changed, 36 insertions(+), 16 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 55df9a31244..2e1484fefb5 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,17 @@ +2020-04-22 Jonathan Wakely <jwakely@redhat.com> + + * testsuite/21_strings/basic_string/erasure.cc: Check for + __cpp_lib_erase_if macro. + * testsuite/23_containers/deque/erasure.cc: Add header name to #error + messages. + * testsuite/23_containers/forward_list/erasure.cc: Likewise. + * testsuite/23_containers/list/erasure.cc: Likewise. + * testsuite/23_containers/map/erasure.cc: Likewise. + * testsuite/23_containers/set/erasure.cc: Likewise. + * testsuite/23_containers/unordered_map/erasure.cc: Likewise. + * testsuite/23_containers/unordered_set/erasure.cc: Likewise. + * testsuite/23_containers/vector/erasure.cc: Likewise. + 2020-04-21 Jonathan Wakely <jwakely@redhat.com> * include/bits/stl_iterator.h (__normal_iterator): Use synth-three-way diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/erasure.cc b/libstdc++-v3/testsuite/21_strings/basic_string/erasure.cc index 6e475cf40bc..f36562a3f19 100644 --- a/libstdc++-v3/testsuite/21_strings/basic_string/erasure.cc +++ b/libstdc++-v3/testsuite/21_strings/basic_string/erasure.cc @@ -21,6 +21,12 @@ #include <string> #include <testsuite_hooks.h> +#ifndef __cpp_lib_erase_if +# error "Feature-test macro for erase_if missing in <string>" +#elif __cpp_lib_erase_if < 202002 +# error "Feature-test macro for erase_if has wrong value in <string>" +#endif + void test01() { diff --git a/libstdc++-v3/testsuite/23_containers/deque/erasure.cc b/libstdc++-v3/testsuite/23_containers/deque/erasure.cc index 328e2fdbefa..8bd0206c890 100644 --- a/libstdc++-v3/testsuite/23_containers/deque/erasure.cc +++ b/libstdc++-v3/testsuite/23_containers/deque/erasure.cc @@ -22,9 +22,9 @@ #include <testsuite_hooks.h> #ifndef __cpp_lib_erase_if -# error "Feature-test macro for erase_if missing" +# error "Feature-test macro for erase_if missing in <deque>" #elif __cpp_lib_erase_if < 202002 -# error "Feature-test macro for erase_if has wrong value" +# error "Feature-test macro for erase_if has wrong value in <deque>" #endif void diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/erasure.cc b/libstdc++-v3/testsuite/23_containers/forward_list/erasure.cc index ce321cf0c59..133dc3a699b 100644 --- a/libstdc++-v3/testsuite/23_containers/forward_list/erasure.cc +++ b/libstdc++-v3/testsuite/23_containers/forward_list/erasure.cc @@ -22,9 +22,9 @@ #include <testsuite_hooks.h> #ifndef __cpp_lib_erase_if -# error "Feature-test macro for erase_if missing" +# error "Feature-test macro for erase_if missing in <forward_list>" #elif __cpp_lib_erase_if < 202002 -# error "Feature-test macro for erase_if has wrong value" +# error "Feature-test macro for erase_if has wrong value in <forward_list>" #endif void diff --git a/libstdc++-v3/testsuite/23_containers/list/erasure.cc b/libstdc++-v3/testsuite/23_containers/list/erasure.cc index 2b543d2f321..3620342ba9a 100644 --- a/libstdc++-v3/testsuite/23_containers/list/erasure.cc +++ b/libstdc++-v3/testsuite/23_containers/list/erasure.cc @@ -22,9 +22,9 @@ #include <testsuite_hooks.h> #ifndef __cpp_lib_erase_if -# error "Feature-test macro for erase_if missing" +# error "Feature-test macro for erase_if missing in <list>" #elif __cpp_lib_erase_if < 202002 -# error "Feature-test macro for erase_if has wrong value" +# error "Feature-test macro for erase_if has wrong value in <list>" #endif void diff --git a/libstdc++-v3/testsuite/23_containers/map/erasure.cc b/libstdc++-v3/testsuite/23_containers/map/erasure.cc index 4575e191267..1bd84813a97 100644 --- a/libstdc++-v3/testsuite/23_containers/map/erasure.cc +++ b/libstdc++-v3/testsuite/23_containers/map/erasure.cc @@ -23,9 +23,9 @@ #include <testsuite_hooks.h> #ifndef __cpp_lib_erase_if -# error "Feature-test macro for erase_if missing" +# error "Feature-test macro for erase_if missing in <map>" #elif __cpp_lib_erase_if < 202002 -# error "Feature-test macro for erase_if has wrong value" +# error "Feature-test macro for erase_if has wrong value in <map>" #endif auto is_odd_pair = [](const std::pair<const int, std::string>& p) diff --git a/libstdc++-v3/testsuite/23_containers/set/erasure.cc b/libstdc++-v3/testsuite/23_containers/set/erasure.cc index 48e70db814f..e5cc4a2c949 100644 --- a/libstdc++-v3/testsuite/23_containers/set/erasure.cc +++ b/libstdc++-v3/testsuite/23_containers/set/erasure.cc @@ -22,9 +22,9 @@ #include <testsuite_hooks.h> #ifndef __cpp_lib_erase_if -# error "Feature-test macro for erase_if missing" +# error "Feature-test macro for erase_if missing in <set>" #elif __cpp_lib_erase_if < 202002 -# error "Feature-test macro for erase_if has wrong value" +# error "Feature-test macro for erase_if has wrong value in <set>" #endif auto is_odd = [](const int i) { return i % 2 != 0; }; diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/erasure.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/erasure.cc index a5af7f02d4f..d08510f789c 100644 --- a/libstdc++-v3/testsuite/23_containers/unordered_map/erasure.cc +++ b/libstdc++-v3/testsuite/23_containers/unordered_map/erasure.cc @@ -23,9 +23,9 @@ #include <testsuite_hooks.h> #ifndef __cpp_lib_erase_if -# error "Feature-test macro for erase_if missing" +# error "Feature-test macro for erase_if missing in <unordered_map>" #elif __cpp_lib_erase_if < 202002 -# error "Feature-test macro for erase_if has wrong value" +# error "Feature-test macro for erase_if has wrong value in <unordered_map>" #endif auto is_odd_pair = [](const std::pair<const int, std::string>& p) diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/erasure.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/erasure.cc index c129b1bbfd3..bc719d6a1dd 100644 --- a/libstdc++-v3/testsuite/23_containers/unordered_set/erasure.cc +++ b/libstdc++-v3/testsuite/23_containers/unordered_set/erasure.cc @@ -22,9 +22,9 @@ #include <testsuite_hooks.h> #ifndef __cpp_lib_erase_if -# error "Feature-test macro for erase_if missing" +# error "Feature-test macro for erase_if missing in <unordered_set>" #elif __cpp_lib_erase_if < 202002 -# error "Feature-test macro for erase_if has wrong value" +# error "Feature-test macro for erase_if has wrong value in <unordered_set>" #endif void diff --git a/libstdc++-v3/testsuite/23_containers/vector/erasure.cc b/libstdc++-v3/testsuite/23_containers/vector/erasure.cc index c3fb41f576b..548068741d2 100644 --- a/libstdc++-v3/testsuite/23_containers/vector/erasure.cc +++ b/libstdc++-v3/testsuite/23_containers/vector/erasure.cc @@ -22,9 +22,9 @@ #include <testsuite_hooks.h> #ifndef __cpp_lib_erase_if -# error "Feature-test macro for erase_if missing" +# error "Feature-test macro for erase_if missing in <vector>" #elif __cpp_lib_erase_if < 202002 -# error "Feature-test macro for erase_if has wrong value" +# error "Feature-test macro for erase_if has wrong value in <vector>" #endif void
reply other threads:[~2020-07-17 14:49 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200717144907.C972039DE41F@sourceware.org \ --to=tnfchris@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ --cc=libstdc++-cvs@gcc.gnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).