libstdc++: Update value of __cpp_lib_jthread macro

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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 2e1484fefb5d4179ea77a422324ad4aae6a8f8ac..dc0b1eecfb07b7a2b84867f733a7d544cd07d864 100644 (file)
--- 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 cc7f99f6921d216ed6650e65fafcc1cf54e0115d..2db9dff6c31a442491f51da580b8e7aa8860fc51 100644 (file)
--- 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 87beb08c71d908817ee324257a5e12559d6d431f..847d12f7454e6ef0d7c415d1c07c4d5783f02448 100644 (file)
--- 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 6d7dcc46023abce8fe78c7a11d9db95096cbdec4..dafb09f982a69e411dc820919df4a88043f2b0c2 100644 (file)
--- 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 59dafeb2d86e74ad1b870fa37e375a62f0938278..5b71cfb979f6bfd7b69c1b8befd0cd1a7fcdb032 100644 (file)
--- 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 7254024bbb36dfeb97cdbe95e4856b949d808603..0f017e439961cb6fd6cdf69848736e1e994303f7 100644 (file)
--- 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 dc47df9d205ca89f3caa7ec08e0afd82de58615a..d7c0a836b8b51c9e2765c4f6904dafff49af35aa 100644 (file)
--- 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 9a0abbe8f70611917ec8a8b95738ba561c983000..4c196c3fe92f82aa436ef82608b00d723eaa40ac 100644 (file)
--- 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 19294552fce81c61f9f61061121c0eef95b52a9a..fffff3740c575aa0dc66ebc8afbea9ed2717ac49 100644 (file)
--- 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 7254024bbb36dfeb97cdbe95e4856b949d808603..0f017e439961cb6fd6cdf69848736e1e994303f7 100644 (file)
--- 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