From: Jonathan Wakely <jwakely@redhat.com>
Date: Mon, 2 Jun 2025 22:25:43 +0000 (+0100)
Subject: libstdc++: Check feature test macro for jthread in <stop_token>
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dcc14761f34f9a9c8a6ed8f0f4e276fa8ef4d950;p=thirdparty%2Fgcc.git

libstdc++: Check feature test macro for jthread in <stop_token>

Check the appropriate feature test macro instead of checking that
__cplusplus >= 201703L.

libstdc++-v3/ChangeLog:

	* include/std/stop_token: Check __glibcxx_jthread instead of
	__cplusplus.
---

diff --git a/libstdc++-v3/include/std/stop_token b/libstdc++-v3/include/std/stop_token
index 1225b3afd27..775ec6aa207 100644
--- a/libstdc++-v3/include/std/stop_token
+++ b/libstdc++-v3/include/std/stop_token
@@ -34,8 +34,7 @@
 #define __glibcxx_want_jthread
 #include <bits/version.h>
 
-#if __cplusplus > 201703L
-
+#ifdef __glibcxx_jthread // C++ >= 20
 #include <atomic>
 #include <bits/std_thread.h>
 
@@ -650,6 +649,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
     stop_callback(stop_token, _Callback) -> stop_callback<_Callback>;
 
 _GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-#endif // __cplusplus > 201703L
+} // namespace std
+#endif // __glibcxx_jthread
 #endif // _GLIBCXX_STOP_TOKEN