[gcc r9-9381] libstdc++: Fix failing tests for AIX

Jonathan Wakely redi@gcc.gnu.org
Tue Apr 20 18:53:20 GMT 2021


https://gcc.gnu.org/g:9f5c8ec3d175fdf5d6616992db8778cfba72da63

commit r9-9381-g9f5c8ec3d175fdf5d6616992db8778cfba72da63
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Tue Aug 11 16:16:22 2020 +0100

    libstdc++: Fix failing tests for AIX
    
    These two tests fail on AIX because <sys/thread.h> defines struct thread
    in the global namespace (despite it not being a reserved name). That
    means the using-declaration that adds it to the global namespace causes
    a redeclaration error.
    
    libstdc++-v3/ChangeLog:
    
            * testsuite/30_threads/thread/cons/84535.cc: Use a custom
            namespace.
            * testsuite/30_threads/thread/cons/lwg2097.cc: Likewise.
    
    (cherry picked from commit fe8d7fec4db838cae536eeef1965db83959cf6ee)

Diff:
---
 libstdc++-v3/testsuite/30_threads/thread/cons/84535.cc   | 3 +++
 libstdc++-v3/testsuite/30_threads/thread/cons/lwg2097.cc | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/libstdc++-v3/testsuite/30_threads/thread/cons/84535.cc b/libstdc++-v3/testsuite/30_threads/thread/cons/84535.cc
index 66c2aded22b..6c60763008b 100644
--- a/libstdc++-v3/testsuite/30_threads/thread/cons/84535.cc
+++ b/libstdc++-v3/testsuite/30_threads/thread/cons/84535.cc
@@ -20,6 +20,8 @@
 
 #include <thread>
 
+namespace __gnu_test
+{
 using std::is_constructible;
 using std::thread;
 
@@ -28,3 +30,4 @@ static_assert(!is_constructible<thread, thread, int>::value, "");
 static_assert(!is_constructible<thread, thread&, int>::value, "");
 static_assert(!is_constructible<thread, const thread&, int>::value, "");
 static_assert(!is_constructible<thread, const thread&&, int>::value, "");
+}
diff --git a/libstdc++-v3/testsuite/30_threads/thread/cons/lwg2097.cc b/libstdc++-v3/testsuite/30_threads/thread/cons/lwg2097.cc
index 4a540dcc9b4..86c990af5e0 100644
--- a/libstdc++-v3/testsuite/30_threads/thread/cons/lwg2097.cc
+++ b/libstdc++-v3/testsuite/30_threads/thread/cons/lwg2097.cc
@@ -20,9 +20,12 @@
 
 #include <thread>
 
+namespace __gnu_test
+{
 using std::thread;
 using std::is_constructible;
 
 static_assert( !is_constructible<thread, thread&>::value, "" );
 static_assert( !is_constructible<thread, const thread&>::value, "" );
 static_assert( !is_constructible<thread, const thread>::value, "" );
+}


More information about the Libstdc++-cvs mailing list