public inbox for libstdc++-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r14-4045] libstdc++: Fix 29_atomics/headers/atomic/types_std_c++2a_neg.cc for C++23
@ 2023-09-15 23:02 Jonathan Wakely
  0 siblings, 0 replies; only message in thread
From: Jonathan Wakely @ 2023-09-15 23:02 UTC (permalink / raw)
  To: gcc-cvs, libstdc++-cvs

https://gcc.gnu.org/g:038c0afa893f8cb2277ff44be3e2c09cfab4bc0c

commit r14-4045-g038c0afa893f8cb2277ff44be3e2c09cfab4bc0c
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Fri Sep 15 21:37:46 2023 +0100

    libstdc++: Fix 29_atomics/headers/atomic/types_std_c++2a_neg.cc for C++23
    
    This test fails when run as C++23 because the <bits/stdc++.h> PCH
    includes <stdatomic.h> which declares ::memory_order, invalidating the
    test's assumptions. Disable PCH so that the test verifies that <atomic>
    doesn't declare ::memory_order, as originally intended.
    
    Also fix the using-declaration which would be invalid even if the type
    was declared in the global namespace, and adjust the expected error.
    
    libstdc++-v3/ChangeLog:
    
            * testsuite/29_atomics/headers/atomic/types_std_c++2a_neg.cc:
            Fix test to work for C++23 and C++26 too.

Diff:
---
 .../testsuite/29_atomics/headers/atomic/types_std_c++2a_neg.cc     | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/libstdc++-v3/testsuite/29_atomics/headers/atomic/types_std_c++2a_neg.cc b/libstdc++-v3/testsuite/29_atomics/headers/atomic/types_std_c++2a_neg.cc
index 8eba8bfd779..65199ce15e5 100644
--- a/libstdc++-v3/testsuite/29_atomics/headers/atomic/types_std_c++2a_neg.cc
+++ b/libstdc++-v3/testsuite/29_atomics/headers/atomic/types_std_c++2a_neg.cc
@@ -1,5 +1,8 @@
 // { dg-options "-std=gnu++2a" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
+// Disable PCH because <bits/stdc++.h> includes <stdatomic.h> which declares
+// memory_order in the global namespace.
+// { dg-add-options no_pch }
 
 // Copyright (C) 2019-2023 Free Software Foundation, Inc.
 //
@@ -23,7 +26,7 @@
 void test01()
 {
   // Not global scoped, only namespace std.
-  using memory_order; // { dg-error "expected nested-name-specifier" }
+  using ::memory_order; // { dg-error "has not been declared" }
   constexpr auto relaxed = memory_order::relaxed; // { dg-error "has not been declared" }
   constexpr auto consume = memory_order::consume; // { dg-error "has not been declared" }
   constexpr auto acquire = memory_order::acquire; // { dg-error "has not been declared" }

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2023-09-15 23:02 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-09-15 23:02 [gcc r14-4045] libstdc++: Fix 29_atomics/headers/atomic/types_std_c++2a_neg.cc for C++23 Jonathan Wakely

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).