From: Jonathan Wakely <jwakely@redhat.com>
Date: Sat, 15 Nov 2025 10:55:55 +0000 (+0000)
Subject: libstdc++: Tweak static_assert messages for volatile atomic waits
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=85066ad6c301390fbab2805307a6cc61aef22c21;p=thirdparty%2Fgcc.git

libstdc++: Tweak static_assert messages for volatile atomic waits

libstdc++-v3/ChangeLog:

	* include/bits/atomic_base.h: Tweak grammar of static assert
	messages for unsupported atomic wait on volatile.
---

diff --git a/libstdc++-v3/include/bits/atomic_base.h b/libstdc++-v3/include/bits/atomic_base.h
index ccea132bb67..90b8df55ede 100644
--- a/libstdc++-v3/include/bits/atomic_base.h
+++ b/libstdc++-v3/include/bits/atomic_base.h
@@ -1584,7 +1584,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       wait(value_type __old, memory_order __m = memory_order_seq_cst) const noexcept
       {
 	// TODO remove when volatile is supported
-	static_assert(!is_volatile_v<_Tp>, "atomics waits on volatile are not supported");
+	static_assert(!is_volatile_v<_Tp>,
+		      "atomic waits on volatile are not supported");
 	__atomic_impl::wait(_M_ptr, __old, __m);
       }
 #endif // __glibcxx_atomic_wait
@@ -1666,7 +1667,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       notify_one() const noexcept
       {
 	// TODO remove when volatile is supported
-	static_assert(!is_volatile_v<_Tp>, "atomics waits on volatile are not supported");
+	static_assert(!is_volatile_v<_Tp>,
+		      "atomic waits on volatile are not supported");
 	__atomic_impl::notify_one(this->_M_ptr);
       }
 
@@ -1674,7 +1676,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       notify_all() const noexcept
       {
 	// TODO remove when volatile is supported
-	static_assert(!is_volatile_v<_Tp>, "atomics waits on volatile are not supported");
+	static_assert(!is_volatile_v<_Tp>,
+		      "atomic waits on volatile are not supported");
 	__atomic_impl::notify_all(this->_M_ptr);
       }
 #endif // __glibcxx_atomic_wait