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 [207.211.31.81]) by sourceware.org (Postfix) with ESMTP id A2D143954C7F for ; Wed, 22 Apr 2020 21:58:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org A2D143954C7F 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-87-pWGxUPC-PxuPBD_lKUGJ6A-1; Wed, 22 Apr 2020 17:58:56 -0400 X-MC-Unique: pWGxUPC-PxuPBD_lKUGJ6A-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 50084800FF0; Wed, 22 Apr 2020 21:58:55 +0000 (UTC) Received: from localhost (unknown [10.33.36.131]) by smtp.corp.redhat.com (Postfix) with ESMTP id EF3461002380; Wed, 22 Apr 2020 21:58:54 +0000 (UTC) Date: Wed, 22 Apr 2020 22:58:54 +0100 From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed 4/8] libstdc++: Rename __cpp_lib_constexpr_invoke macro Message-ID: References: MIME-Version: 1.0 In-Reply-To: X-Clacks-Overhead: GNU Terry Pratchett X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 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=-29.0 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, RCVD_IN_MSPIKE_H2, 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:59 -0000 This macro was renamed after it was added to the working draft, but we never renamed it in libstdc++. We haven't made a release with the old macro name, so I see no need to keep it around. =09* include/std/functional (__cpp_lib_constexpr_invoke): Rename to =09__cpp_lib_constexpr_functional. =09* include/std/version (__cpp_lib_constexpr_invoke): Likewise. =09* testsuite/20_util/function_objects/invoke/constexpr.cc: Adjust. --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/include/std/functional | 2 +- libstdc++-v3/include/std/version | 2 +- .../testsuite/20_util/function_objects/invoke/constexpr.cc | 4 ++-- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 182f5dc4b7e..7053a63ee91 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,10 @@ 2020-04-22 Jonathan Wakely =20 +=09* include/std/functional (__cpp_lib_constexpr_invoke): Rename to +=09__cpp_lib_constexpr_functional. +=09* include/std/version (__cpp_lib_constexpr_invoke): Likewise. +=09* testsuite/20_util/function_objects/invoke/constexpr.cc: Adjust. + =09* include/bits/ptr_traits.h (__cpp_lib_constexpr_memory): Define to =09indicate P1006R1 support. =09(__cpp_lib_to_address): Define to indicate P0653R2 support. diff --git a/libstdc++-v3/include/std/functional b/libstdc++-v3/include/std= /functional index faa7e85c114..2a9b2a003db 100644 --- a/libstdc++-v3/include/std/functional +++ b/libstdc++-v3/include/std/functional @@ -76,7 +76,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION #if __cplusplus >=3D 201703L # define __cpp_lib_invoke 201411L # if __cplusplus > 201703L -# define __cpp_lib_constexpr_invoke 201907L +# define __cpp_lib_constexpr_functional 201907L # endif =20 /// Invoke a callable object. diff --git a/libstdc++-v3/include/std/version b/libstdc++-v3/include/std/ve= rsion index 3b1fd700069..77255915c4d 100644 --- a/libstdc++-v3/include/std/version +++ b/libstdc++-v3/include/std/version @@ -190,7 +190,7 @@ #define __cpp_lib_constexpr_algorithms 201806L #define __cpp_lib_constexpr_complex 201711L #define __cpp_lib_constexpr_dynamic_alloc 201907L -#define __cpp_lib_constexpr_invoke 201907L +#define __cpp_lib_constexpr_functional 201907L #define __cpp_lib_constexpr_memory 201811L #define __cpp_lib_constexpr_numeric 201911L #define __cpp_lib_erase_if 202002L diff --git a/libstdc++-v3/testsuite/20_util/function_objects/invoke/constex= pr.cc b/libstdc++-v3/testsuite/20_util/function_objects/invoke/constexpr.cc index 89cb9ca0fcc..3df48d44f49 100644 --- a/libstdc++-v3/testsuite/20_util/function_objects/invoke/constexpr.cc +++ b/libstdc++-v3/testsuite/20_util/function_objects/invoke/constexpr.cc @@ -20,9 +20,9 @@ =20 #include =20 -#ifndef __cpp_lib_constexpr_invoke +#ifndef __cpp_lib_constexpr_functional # error "Feature test macro for constexpr invoke is missing" -#elif __cpp_lib_constexpr_invoke < 201907L +#elif __cpp_lib_constexpr_functional < 201907L # error "Feature test macro for constexpr invoke has wrong value" #endif =20 --=20 2.25.3