From patchwork Wed Mar 22 17:50:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 66766 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 0B79C388B6BB for ; Wed, 22 Mar 2023 17:52:02 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0B79C388B6BB DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1679507522; bh=LkniHjNW6xAkZ89B4YGO+a9nCSm8CcZHixHxrCYcH/Q=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=pX3MHY9475vHpNI7x99fiecKpk71V+uA2fjTqDhOExlv6VscdSli9FtgRLDXVBl2k HuG19ROGiqAW80cZ/kCyTRpPPE+Lnm8262oM0JAIpcIdfoYLyaclUtY061w9F7cFIE ag73L0MuERYdFGYdYOpZXkkfkTx5qUhR2IyH/e00= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 9E5F03851153 for ; Wed, 22 Mar 2023 17:50:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9E5F03851153 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-136-7dTQgbUyPQuljmK00B6PhQ-1; Wed, 22 Mar 2023 13:50:17 -0400 X-MC-Unique: 7dTQgbUyPQuljmK00B6PhQ-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 126808828C0; Wed, 22 Mar 2023 17:50:17 +0000 (UTC) Received: from localhost (unknown [10.33.36.149]) by smtp.corp.redhat.com (Postfix) with ESMTP id D00F3202701E; Wed, 22 Mar 2023 17:50:16 +0000 (UTC) To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Define __cpp_lib_constexpr_algorithms in (LWG 3792) Date: Wed, 22 Mar 2023 17:50:16 +0000 Message-Id: <20230322175016.408028-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Jonathan Wakely via Gcc-patches From: Jonathan Wakely Reply-To: Jonathan Wakely Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Tested powerpc64le-linux, pushed to trunk. -- >8-- We actually defined this macro in at one point, but I removed it in r10-7901-g2025db692e9ed1. libstdc++-v3/ChangeLog: * include/std/utility (__cpp_lib_constexpr_algorithms): Define, as per LWG 3792. * testsuite/20_util/exchange/constexpr.cc: Check for it. --- libstdc++-v3/include/std/utility | 4 ++++ libstdc++-v3/testsuite/20_util/exchange/constexpr.cc | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/libstdc++-v3/include/std/utility b/libstdc++-v3/include/std/utility index 43d8765228c..006b19c00fc 100644 --- a/libstdc++-v3/include/std/utility +++ b/libstdc++-v3/include/std/utility @@ -86,6 +86,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION #if __cplusplus >= 201402L #define __cpp_lib_exchange_function 201304L +#if __cplusplus > 201703L +# define __cpp_lib_constexpr_algorithms 201806L +#endif + /// Assign @p __new_val to @p __obj and return its previous value. template _GLIBCXX20_CONSTEXPR diff --git a/libstdc++-v3/testsuite/20_util/exchange/constexpr.cc b/libstdc++-v3/testsuite/20_util/exchange/constexpr.cc index 6c130f772f8..2ec13044681 100644 --- a/libstdc++-v3/testsuite/20_util/exchange/constexpr.cc +++ b/libstdc++-v3/testsuite/20_util/exchange/constexpr.cc @@ -20,6 +20,12 @@ #include +#ifndef __cpp_lib_constexpr_algorithms +# error "Feature test macro for constexpr std::exchange is missing in " +#elif __cpp_lib_constexpr_algorithms < 201806L +# error "Feature test macro for constexpr std::exchange has wrong value in " +#endif + constexpr bool test() {