From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by sourceware.org (Postfix) with ESMTP id E41803954419 for ; Wed, 22 Apr 2020 21:58:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org E41803954419 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-184-nIuF9faDMX2JWiqSEga_5Q-1; Wed, 22 Apr 2020 17:58:21 -0400 X-MC-Unique: nIuF9faDMX2JWiqSEga_5Q-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 50D3D8017F5; Wed, 22 Apr 2020 21:58:20 +0000 (UTC) Received: from localhost (unknown [10.33.36.131]) by smtp.corp.redhat.com (Postfix) with ESMTP id F19795D70A; Wed, 22 Apr 2020 21:58:19 +0000 (UTC) Date: Wed, 22 Apr 2020 22:58:19 +0100 From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed 1/8] libstdc++: Update value of __cpp_lib_jthread macro Message-ID: References: MIME-Version: 1.0 In-Reply-To: X-Clacks-Overhead: GNU Terry Pratchett X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Content-Disposition: inline X-Spam-Status: No, score=-28.4 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libstdc++@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++ mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Apr 2020 21:58:24 -0000 =09* include/std/condition_variable (__cpp_lib_jthread): Remove =09redundant definition. =09* include/std/stop_token (__cpp_lib_jthread): Update macro value to =09indicate P1869R1 support. =09* include/std/version (__cpp_lib_jthread): Update value. =09* testsuite/30_threads/condition_variable_any/stop_token/1.cc: Check =09for updated macro value. =09* testsuite/30_threads/condition_variable_any/stop_token/2.cc: =09Likewise. =09* testsuite/30_threads/jthread/1.cc: Likewise. =09* testsuite/30_threads/jthread/2.cc: Likewise. =09* testsuite/30_threads/stop_token/1.cc: Likewise. =09* 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 =20 +=09* include/std/condition_variable (__cpp_lib_jthread): Remove +=09redundant definition. +=09* include/std/stop_token (__cpp_lib_jthread): Update macro value to +=09indicate P1869R1 support. +=09* include/std/version (__cpp_lib_jthread): Update value. +=09* testsuite/30_threads/condition_variable_any/stop_token/1.cc: Check +=09for updated macro value. +=09* testsuite/30_threads/condition_variable_any/stop_token/2.cc: +=09Likewise. +=09* testsuite/30_threads/jthread/1.cc: Likewise. +=09* testsuite/30_threads/jthread/2.cc: Likewise. +=09* testsuite/30_threads/stop_token/1.cc: Likewise. +=09* testsuite/30_threads/stop_token/2.cc: Likewise. + =09* testsuite/21_strings/basic_string/erasure.cc: Check for =09__cpp_lib_erase_if macro. =09* testsuite/23_containers/deque/erasure.cc: Add header name to #error diff --git a/libstdc++-v3/include/std/condition_variable b/libstdc++-v3/inc= lude/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 =20 #if __cplusplus > 201703L -#define __cpp_lib_jthread 201907L -#include +# include #endif =20 #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 =20 #ifdef _GLIBCXX_HAS_GTHREADS -# define __cpp_lib_jthread 201907L +# define __cpp_lib_jthread 201911L # include # if __has_include() # include diff --git a/libstdc++-v3/include/std/version b/libstdc++-v3/include/std/ve= rsion 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 @@ =20 #ifndef __cpp_lib_jthread # error "Feature-test macro for jthread missing in " -#elif __cpp_lib_jthread !=3D 201907L +#elif __cpp_lib_jthread !=3D 201911L # error "Feature-test macro for jthread has wrong value in " #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 @@ =20 #ifndef __cpp_lib_jthread # error "Feature-test macro for jthread missing in " -#elif __cpp_lib_jthread !=3D 201907L +#elif __cpp_lib_jthread !=3D 201911L # error "Feature-test macro for jthread has wrong value in " #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 @@ =20 #ifndef __cpp_lib_jthread # error "Feature-test macro for jthread missing in " -#elif __cpp_lib_jthread !=3D 201907L +#elif __cpp_lib_jthread !=3D 201911L # error "Feature-test macro for jthread has wrong value in " #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 @@ =20 #ifndef __cpp_lib_jthread # error "Feature-test macro for jthread missing in " -#elif __cpp_lib_jthread !=3D 201907L +#elif __cpp_lib_jthread !=3D 201911L # error "Feature-test macro for jthread has wrong value in " #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 @@ =20 #ifndef __cpp_lib_jthread # error "Feature-test macro for jthread missing in " -#elif __cpp_lib_jthread !=3D 201907L +#elif __cpp_lib_jthread !=3D 201911L # error "Feature-test macro for jthread has wrong value in " #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 @@ =20 #ifndef __cpp_lib_jthread # error "Feature-test macro for jthread missing in " -#elif __cpp_lib_jthread !=3D 201907L +#elif __cpp_lib_jthread !=3D 201911L # error "Feature-test macro for jthread has wrong value in " #endif --=20 2.25.3