public inbox for libstdc++-cvs@sourceware.org help / color / mirror / Atom feed
From: Alexandre Oliva <aoliva@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc(refs/users/aoliva/heads/testme)] libstdc++: testsuite: work around bitset namespace pollution Date: Wed, 22 Jun 2022 00:44:17 +0000 (GMT) [thread overview] Message-ID: <20220622004417.D556738387BB@sourceware.org> (raw) https://gcc.gnu.org/g:b2319ade83aecfc33da93b413e62ce8e22ef68e0 commit b2319ade83aecfc33da93b413e62ce8e22ef68e0 Author: Alexandre Oliva <oliva@adacore.com> Date: Mon Jun 20 19:43:37 2022 -0300 libstdc++: testsuite: work around bitset namespace pollution rtems6 declares a global struct bitset in a header file included indirectly by sys/types.h, that ambiguates the unqualified references to bitset after "using namespace std" in the testsuite. Work around the namespace pollution with using declarations of std::bitset. for libstdc++-v3/ChangeLog * testsuite/23_containers/bitset/cons/dr1325-2.cc: Work around global struct bitset. * testsuite/23_containers/bitset/ext/15361.cc: Likewise. * testsuite/23_containers/bitset/input/1.cc: Likewise. * testsuite/23_containers/bitset/to_string/1.cc: Likewise. * testsuite/23_containers/bitset/to_string/dr396.cc: Likewise. Diff: --- libstdc++-v3/testsuite/23_containers/bitset/cons/dr1325-2.cc | 1 + libstdc++-v3/testsuite/23_containers/bitset/ext/15361.cc | 1 + libstdc++-v3/testsuite/23_containers/bitset/input/1.cc | 1 + libstdc++-v3/testsuite/23_containers/bitset/to_string/1.cc | 1 + libstdc++-v3/testsuite/23_containers/bitset/to_string/dr396.cc | 1 + 5 files changed, 5 insertions(+) diff --git a/libstdc++-v3/testsuite/23_containers/bitset/cons/dr1325-2.cc b/libstdc++-v3/testsuite/23_containers/bitset/cons/dr1325-2.cc index 4b79c9f046d..2371bef09cc 100644 --- a/libstdc++-v3/testsuite/23_containers/bitset/cons/dr1325-2.cc +++ b/libstdc++-v3/testsuite/23_containers/bitset/cons/dr1325-2.cc @@ -39,6 +39,7 @@ template<std::size_t Nb, typename CharT> void test01() { using namespace std; + using std::bitset; // Work around struct ::bitset on rtems. const char s1[4] = { '0', '1', '0', '1' }; VERIFY( bitset<4>(s1, 4) == test01_ref<4>(s1, 4) ); diff --git a/libstdc++-v3/testsuite/23_containers/bitset/ext/15361.cc b/libstdc++-v3/testsuite/23_containers/bitset/ext/15361.cc index 40cb94966ab..392470084ae 100644 --- a/libstdc++-v3/testsuite/23_containers/bitset/ext/15361.cc +++ b/libstdc++-v3/testsuite/23_containers/bitset/ext/15361.cc @@ -22,6 +22,7 @@ void test01() { using namespace std; + using std::bitset; // Work around struct ::bitset on rtems. bitset<256> b; b.set(225); diff --git a/libstdc++-v3/testsuite/23_containers/bitset/input/1.cc b/libstdc++-v3/testsuite/23_containers/bitset/input/1.cc index 8738c772383..939861b171e 100644 --- a/libstdc++-v3/testsuite/23_containers/bitset/input/1.cc +++ b/libstdc++-v3/testsuite/23_containers/bitset/input/1.cc @@ -26,6 +26,7 @@ void test01() { using namespace std; + using std::bitset; // Work around struct ::bitset on rtems. bitset<5> b5; bitset<0> b0; diff --git a/libstdc++-v3/testsuite/23_containers/bitset/to_string/1.cc b/libstdc++-v3/testsuite/23_containers/bitset/to_string/1.cc index f4af91373cc..8384eb96d25 100644 --- a/libstdc++-v3/testsuite/23_containers/bitset/to_string/1.cc +++ b/libstdc++-v3/testsuite/23_containers/bitset/to_string/1.cc @@ -25,6 +25,7 @@ void test01() { using namespace std; + using std::bitset; // Work around struct ::bitset on rtems. bitset<5> b5; string s0 = b5.to_string<char, char_traits<char>, allocator<char> >(); diff --git a/libstdc++-v3/testsuite/23_containers/bitset/to_string/dr396.cc b/libstdc++-v3/testsuite/23_containers/bitset/to_string/dr396.cc index 8faded34847..dfba27ed3af 100644 --- a/libstdc++-v3/testsuite/23_containers/bitset/to_string/dr396.cc +++ b/libstdc++-v3/testsuite/23_containers/bitset/to_string/dr396.cc @@ -26,6 +26,7 @@ void test01() { using namespace std; + using std::bitset; // Work around struct ::bitset on rtems. bitset<5> b5; string s0 = b5.to_string<char, char_traits<char>, allocator<char> >('a', 'b');
next reply other threads:[~2022-06-22 0:44 UTC|newest] Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-06-22 0:44 Alexandre Oliva [this message] -- strict thread matches above, loose matches on Subject: below -- 2022-06-21 0:15 Alexandre Oliva 2022-06-21 0:07 Alexandre Oliva
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=20220622004417.D556738387BB@sourceware.org \ --to=aoliva@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).