diff options
| author | Alexandre Oliva <oliva@adacore.com> | 2022-06-21 23:11:00 -0300 |
|---|---|---|
| committer | Alexandre Oliva <oliva@gnu.org> | 2022-06-21 23:11:00 -0300 |
| commit | 345d69a7de7102bf152b7705d564145a9a1c5b95 (patch) | |
| tree | c9307f36f77e919c6d7f46164774fe171bd21a1c /libstdc++-v3 | |
| parent | 7a1790ac6b475e9848e24200de9a1c44be422f5b (diff) | |
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.
Diffstat (limited to 'libstdc++-v3')
5 files changed, 5 insertions, 0 deletions
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'); |