From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <aoliva@sourceware.org>
Received: by sourceware.org (Postfix, from userid 2140)
 id D556738387BB; Wed, 22 Jun 2022 00:44:17 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D556738387BB
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
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
X-Act-Checkin: gcc
X-Git-Author: Alexandre Oliva <oliva@adacore.com>
X-Git-Refname: refs/users/aoliva/heads/testme
X-Git-Oldrev: 863e38de2ac0f80f089f90c255aa136da2a97fa2
X-Git-Newrev: b2319ade83aecfc33da93b413e62ce8e22ef68e0
Message-Id: <20220622004417.D556738387BB@sourceware.org>
Date: Wed, 22 Jun 2022 00:44:17 +0000 (GMT)
X-BeenThere: libstdc++-cvs@gcc.gnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Libstdc++-cvs mailing list <libstdc++-cvs.gcc.gnu.org>
List-Unsubscribe: <https://gcc.gnu.org/mailman/options/libstdc++-cvs>,
 <mailto:libstdc++-cvs-request@gcc.gnu.org?subject=unsubscribe>
List-Archive: <https://gcc.gnu.org/pipermail/libstdc++-cvs/>
List-Help: <mailto:libstdc++-cvs-request@gcc.gnu.org?subject=help>
List-Subscribe: <https://gcc.gnu.org/mailman/listinfo/libstdc++-cvs>,
 <mailto:libstdc++-cvs-request@gcc.gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 22 Jun 2022 00:44:17 -0000

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');