From: Jonathan Wakely <jwakely@redhat.com>
To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org
Subject: [committed 1/8] libstdc++: Update value of __cpp_lib_jthread macro
Date: Wed, 22 Apr 2020 22:58:19 +0100 [thread overview]
Message-ID: <aa12ab2e93b6fd7c0c5292504b0bbe2dd304e5ed.1587592482.git.jwakely@redhat.com> (raw)
In-Reply-To: <cover.1587592482.git.jwakely@redhat.com>
* include/std/condition_variable (__cpp_lib_jthread): Remove
redundant definition.
* include/std/stop_token (__cpp_lib_jthread): Update macro value to
indicate P1869R1 support.
* include/std/version (__cpp_lib_jthread): Update value.
* testsuite/30_threads/condition_variable_any/stop_token/1.cc: Check
for updated macro value.
* testsuite/30_threads/condition_variable_any/stop_token/2.cc:
Likewise.
* testsuite/30_threads/jthread/1.cc: Likewise.
* testsuite/30_threads/jthread/2.cc: Likewise.
* testsuite/30_threads/stop_token/1.cc: Likewise.
* testsuite/30_threads/stop_token/2.cc: Likewise.
---
libstdc++-v3/ChangeLog | 14 ++++++++++++++
libstdc++-v3/include/std/condition_variable | 3 +--
libstdc++-v3/include/std/stop_token | 2 +-
libstdc++-v3/include/std/version | 2 +-
.../condition_variable_any/stop_token/1.cc | 2 +-
.../condition_variable_any/stop_token/2.cc | 2 +-
libstdc++-v3/testsuite/30_threads/jthread/1.cc | 2 +-
libstdc++-v3/testsuite/30_threads/jthread/2.cc | 2 +-
libstdc++-v3/testsuite/30_threads/stop_token/1.cc | 2 +-
libstdc++-v3/testsuite/30_threads/stop_token/2.cc | 2 +-
10 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 2e1484fefb5..dc0b1eecfb0 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,19 @@
2020-04-22 Jonathan Wakely <jwakely@redhat.com>
+ * include/std/condition_variable (__cpp_lib_jthread): Remove
+ redundant definition.
+ * include/std/stop_token (__cpp_lib_jthread): Update macro value to
+ indicate P1869R1 support.
+ * include/std/version (__cpp_lib_jthread): Update value.
+ * testsuite/30_threads/condition_variable_any/stop_token/1.cc: Check
+ for updated macro value.
+ * testsuite/30_threads/condition_variable_any/stop_token/2.cc:
+ Likewise.
+ * testsuite/30_threads/jthread/1.cc: Likewise.
+ * testsuite/30_threads/jthread/2.cc: Likewise.
+ * testsuite/30_threads/stop_token/1.cc: Likewise.
+ * testsuite/30_threads/stop_token/2.cc: Likewise.
+
* testsuite/21_strings/basic_string/erasure.cc: Check for
__cpp_lib_erase_if macro.
* testsuite/23_containers/deque/erasure.cc: Add header name to #error
diff --git a/libstdc++-v3/include/std/condition_variable b/libstdc++-v3/include/std/condition_variable
index cc7f99f6921..2db9dff6c31 100644
--- a/libstdc++-v3/include/std/condition_variable
+++ b/libstdc++-v3/include/std/condition_variable
@@ -47,8 +47,7 @@
#include <bits/cxxabi_forced.h>
#if __cplusplus > 201703L
-#define __cpp_lib_jthread 201907L
-#include <stop_token>
+# include <stop_token>
#endif
#if defined(_GLIBCXX_HAS_GTHREADS)
diff --git a/libstdc++-v3/include/std/stop_token b/libstdc++-v3/include/std/stop_token
index 87beb08c71d..847d12f7454 100644
--- a/libstdc++-v3/include/std/stop_token
+++ b/libstdc++-v3/include/std/stop_token
@@ -34,7 +34,7 @@
#include <atomic>
#ifdef _GLIBCXX_HAS_GTHREADS
-# define __cpp_lib_jthread 201907L
+# define __cpp_lib_jthread 201911L
# include <bits/gthr.h>
# if __has_include(<semaphore>)
# include <semaphore>
diff --git a/libstdc++-v3/include/std/version b/libstdc++-v3/include/std/version
index 6d7dcc46023..dafb09f982a 100644
--- a/libstdc++-v3/include/std/version
+++ b/libstdc++-v3/include/std/version
@@ -191,7 +191,7 @@
#define __cpp_lib_erase_if 202002L
#define __cpp_lib_interpolate 201902L
#ifdef _GLIBCXX_HAS_GTHREADS
-# define __cpp_lib_jthread 201907L
+# define __cpp_lib_jthread 201911L
#endif
#define __cpp_lib_list_remove_return_type 201806L
#define __cpp_lib_math_constants 201907L
diff --git a/libstdc++-v3/testsuite/30_threads/condition_variable_any/stop_token/1.cc b/libstdc++-v3/testsuite/30_threads/condition_variable_any/stop_token/1.cc
index 59dafeb2d86..5b71cfb979f 100644
--- a/libstdc++-v3/testsuite/30_threads/condition_variable_any/stop_token/1.cc
+++ b/libstdc++-v3/testsuite/30_threads/condition_variable_any/stop_token/1.cc
@@ -22,6 +22,6 @@
#ifndef __cpp_lib_jthread
# error "Feature-test macro for jthread missing in <condition_variable>"
-#elif __cpp_lib_jthread != 201907L
+#elif __cpp_lib_jthread != 201911L
# error "Feature-test macro for jthread has wrong value in <condition_variable>"
#endif
diff --git a/libstdc++-v3/testsuite/30_threads/condition_variable_any/stop_token/2.cc b/libstdc++-v3/testsuite/30_threads/condition_variable_any/stop_token/2.cc
index 7254024bbb3..0f017e43996 100644
--- a/libstdc++-v3/testsuite/30_threads/condition_variable_any/stop_token/2.cc
+++ b/libstdc++-v3/testsuite/30_threads/condition_variable_any/stop_token/2.cc
@@ -22,6 +22,6 @@
#ifndef __cpp_lib_jthread
# error "Feature-test macro for jthread missing in <version>"
-#elif __cpp_lib_jthread != 201907L
+#elif __cpp_lib_jthread != 201911L
# error "Feature-test macro for jthread has wrong value in <version>"
#endif
diff --git a/libstdc++-v3/testsuite/30_threads/jthread/1.cc b/libstdc++-v3/testsuite/30_threads/jthread/1.cc
index dc47df9d205..d7c0a836b8b 100644
--- a/libstdc++-v3/testsuite/30_threads/jthread/1.cc
+++ b/libstdc++-v3/testsuite/30_threads/jthread/1.cc
@@ -23,6 +23,6 @@
#ifndef __cpp_lib_jthread
# error "Feature-test macro for jthread missing in <thread>"
-#elif __cpp_lib_jthread != 201907L
+#elif __cpp_lib_jthread != 201911L
# error "Feature-test macro for jthread has wrong value in <thread>"
#endif
diff --git a/libstdc++-v3/testsuite/30_threads/jthread/2.cc b/libstdc++-v3/testsuite/30_threads/jthread/2.cc
index 9a0abbe8f70..4c196c3fe92 100644
--- a/libstdc++-v3/testsuite/30_threads/jthread/2.cc
+++ b/libstdc++-v3/testsuite/30_threads/jthread/2.cc
@@ -23,6 +23,6 @@
#ifndef __cpp_lib_jthread
# error "Feature-test macro for jthread missing in <version>"
-#elif __cpp_lib_jthread != 201907L
+#elif __cpp_lib_jthread != 201911L
# error "Feature-test macro for jthread has wrong value in <version>"
#endif
diff --git a/libstdc++-v3/testsuite/30_threads/stop_token/1.cc b/libstdc++-v3/testsuite/30_threads/stop_token/1.cc
index 19294552fce..fffff3740c5 100644
--- a/libstdc++-v3/testsuite/30_threads/stop_token/1.cc
+++ b/libstdc++-v3/testsuite/30_threads/stop_token/1.cc
@@ -22,6 +22,6 @@
#ifndef __cpp_lib_jthread
# error "Feature-test macro for jthread missing in <stop_token>"
-#elif __cpp_lib_jthread != 201907L
+#elif __cpp_lib_jthread != 201911L
# error "Feature-test macro for jthread has wrong value in <stop_token>"
#endif
diff --git a/libstdc++-v3/testsuite/30_threads/stop_token/2.cc b/libstdc++-v3/testsuite/30_threads/stop_token/2.cc
index 7254024bbb3..0f017e43996 100644
--- a/libstdc++-v3/testsuite/30_threads/stop_token/2.cc
+++ b/libstdc++-v3/testsuite/30_threads/stop_token/2.cc
@@ -22,6 +22,6 @@
#ifndef __cpp_lib_jthread
# error "Feature-test macro for jthread missing in <version>"
-#elif __cpp_lib_jthread != 201907L
+#elif __cpp_lib_jthread != 201911L
# error "Feature-test macro for jthread has wrong value in <version>"
#endif
--
2.25.3
next prev parent reply other threads:[~2020-04-22 21:58 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-22 21:57 [committed 0/8] libstdc++: Add/update/fix feature test macros Jonathan Wakely
2020-04-22 21:58 ` Jonathan Wakely [this message]
2020-04-22 21:58 ` [committed 2/8] libstdc++: Remove non-standard " Jonathan Wakely
2020-04-22 21:58 ` [committed 3/8] libstdc++: Add missing " Jonathan Wakely
2020-04-22 21:58 ` [committed 4/8] libstdc++: Rename __cpp_lib_constexpr_invoke macro Jonathan Wakely
2020-04-22 21:59 ` [committed 5/8] libstdc++: Update __cpp_lib_concepts value Jonathan Wakely
2020-04-22 21:59 ` [committed 6/8] libstdc++: Do not define __cpp_lib_constexpr_algorithms in <utility> Jonathan Wakely
2020-04-22 21:59 ` [committed 7/8] libstdc++: Update (and revert) value of __cpp_lib_array_constexpr Jonathan Wakely
2020-04-23 20:44 ` Jonathan Wakely
2020-04-22 21:59 ` [committed 8/8] libstdc++: Define __cpp_lib_execution feature test macro Jonathan Wakely
2020-04-23 20:41 ` [committed 9/8] libstdc++: Define __cpp_lib_three_way_comparison for freestanding Jonathan Wakely
2020-04-23 20:46 ` [committed 0/8] libstdc++: Add/update/fix feature test macros Jonathan Wakely
2020-04-28 22:52 ` [committed 10/8] libstdc++: Fixes for feature test macros (PR 91480) Jonathan Wakely
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=aa12ab2e93b6fd7c0c5292504b0bbe2dd304e5ed.1587592482.git.jwakely@redhat.com \
--to=jwakely@redhat.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=libstdc++@gcc.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).