From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by sourceware.org (Postfix) with ESMTP id 1CE4239540BC for ; Wed, 22 Apr 2020 21:59:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 1CE4239540BC 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-168-anHskQDfN2GCGKtFgDjdfA-1; Wed, 22 Apr 2020 17:59:03 -0400 X-MC-Unique: anHskQDfN2GCGKtFgDjdfA-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 320A413F6; Wed, 22 Apr 2020 21:59:02 +0000 (UTC) Received: from localhost (unknown [10.33.36.131]) by smtp.corp.redhat.com (Postfix) with ESMTP id CFFA360C87; Wed, 22 Apr 2020 21:59:01 +0000 (UTC) Date: Wed, 22 Apr 2020 22:59:01 +0100 From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed 5/8] libstdc++: Update __cpp_lib_concepts value 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.12 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.6 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=unavailable 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:59:08 -0000 =09* include/std/functional (__cpp_lib_concepts): Update macro value to =09indicate P1964R2 support. =09* include/std/version (__cpp_lib_concepts): Likewise. =09* testsuite/std/concepts/1.cc: Adjust expected value. =09* testsuite/std/concepts/2.cc: Likewise. --- libstdc++-v3/ChangeLog | 6 ++++++ libstdc++-v3/include/std/concepts | 2 +- libstdc++-v3/include/std/version | 2 +- libstdc++-v3/testsuite/std/concepts/1.cc | 2 +- libstdc++-v3/testsuite/std/concepts/2.cc | 2 +- 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 7053a63ee91..4e86ec188a5 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,11 @@ 2020-04-22 Jonathan Wakely =20 +=09* include/std/functional (__cpp_lib_concepts): Update macro value to +=09indicate P1964R2 support. +=09* include/std/version (__cpp_lib_concepts): Likewise. +=09* testsuite/std/concepts/1.cc: Adjust expected value. +=09* testsuite/std/concepts/2.cc: Likewise. + =09* include/std/functional (__cpp_lib_constexpr_invoke): Rename to =09__cpp_lib_constexpr_functional. =09* include/std/version (__cpp_lib_constexpr_invoke): Likewise. diff --git a/libstdc++-v3/include/std/concepts b/libstdc++-v3/include/std/c= oncepts index e8ce1adc93a..9ffed7007d9 100644 --- a/libstdc++-v3/include/std/concepts +++ b/libstdc++-v3/include/std/concepts @@ -47,7 +47,7 @@ namespace std _GLIBCXX_VISIBILITY(default) { _GLIBCXX_BEGIN_NAMESPACE_VERSION =20 -#define __cpp_lib_concepts 201806L +#define __cpp_lib_concepts 202002L =20 // [concepts.lang], language-related concepts =20 diff --git a/libstdc++-v3/include/std/version b/libstdc++-v3/include/std/ve= rsion index 77255915c4d..85bc142bc38 100644 --- a/libstdc++-v3/include/std/version +++ b/libstdc++-v3/include/std/version @@ -168,7 +168,7 @@ #define __cpp_lib_bounded_array_traits 201902L // __cpp_lib_char8_t is defined in #if __cpp_concepts >=3D 201907L -# define __cpp_lib_concepts 201806L +# define __cpp_lib_concepts 202002L #endif #if __cpp_impl_destroying_delete # define __cpp_lib_destroying_delete 201806L diff --git a/libstdc++-v3/testsuite/std/concepts/1.cc b/libstdc++-v3/testsu= ite/std/concepts/1.cc index 41726faa731..4f5812ce121 100644 --- a/libstdc++-v3/testsuite/std/concepts/1.cc +++ b/libstdc++-v3/testsuite/std/concepts/1.cc @@ -22,6 +22,6 @@ =20 #ifndef __cpp_lib_concepts # error "Feature test macro for concepts is missing in " -#elif __cpp_lib_concepts < 201806L +#elif __cpp_lib_concepts < 202002L # error "Feature test macro for concepts has wrong value in " #endif diff --git a/libstdc++-v3/testsuite/std/concepts/2.cc b/libstdc++-v3/testsu= ite/std/concepts/2.cc index 706de7dd913..6967c8454a9 100644 --- a/libstdc++-v3/testsuite/std/concepts/2.cc +++ b/libstdc++-v3/testsuite/std/concepts/2.cc @@ -22,6 +22,6 @@ =20 #ifndef __cpp_lib_concepts # error "Feature test macro for concepts is missing in " -#elif __cpp_lib_concepts < 201806L +#elif __cpp_lib_concepts < 202002L # error "Feature test macro for concepts has wrong value in " #endif --=20 2.25.3