https://gcc.gnu.org/bugzilla/show_bug.cgi?id=99277

--- Comment #6 from Thiago Macieira <thiago at kde dot org> ---
We don't have to delay the release. Either of these two patches give us one
more year to get it right:

--- libstdc++-v3/include/bits/atomic_wait.h
+++ libstdc++-v3/include/bits/atomic_wait.h
@@ -32,9 +32,9 @@

 #pragma GCC system_header

 #include <bits/c++config.h>
-#if defined _GLIBCXX_HAS_GTHREADS || defined _GLIBCXX_HAVE_LINUX_FUTEX
+#if defined _GLIBCXX_ENABLE_EXPERIMENTAL_ATOMIC_WAIT && (defined
_GLIBCXX_HAS_GTHREADS || defined _GLIBCXX_HAVE_LINUX_FUTEX)
 #include <bits/functional_hash.h>
 #include <bits/gthr.h>
 #include <ext/numeric_traits.h>

Or

--- libstdc++-v3/include/bits/atomic_base.h
+++ libstdc++-v3/include/bits/atomic_base.h
@@ -36,9 +36,9 @@
 #include <stdint.h>
 #include <bits/atomic_lockfree_defines.h>
 #include <bits/move.h>

-#if __cplusplus > 201703L
+#if __cplusplus > 201703L && defined _GLIBCXX_ENABLE_EXPERIMENTAL_ATOMIC_WAIT
 #include <bits/atomic_wait.h>
 #endif

 #ifndef _GLIBCXX_ALWAYS_INLINE

Reply via email to