From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 40F003858004 for ; Fri, 5 Jan 2024 10:24:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 40F003858004 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 40F003858004 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704450281; cv=none; b=gX0eRJgf0Jx1smau7V1Kx3nZfaq8ex7XSfwG5DmIJ/oq+DJMxxZ+sOl3U8izJxZLRFHePKvuYZbuX9wFqwKzxKPFGWwfntgFciVYA98SRSDoMyfjTlWsS5tehuycwkEH67+4UnqIBl6sJ0GVwuxE6TrcriRr9JKWSR+ViRZPg60= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704450281; c=relaxed/simple; bh=pTjF2y9vOErQ5/Ui6+YFmsJXIcE+8cV2edUfKmi3TZM=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=PEr1X4CNEmI6E+xkogdPYoE1FXCUvvpvTwsxhnvDs34+wt507eOeOStSubvqHY/EgmSqXBETBAXnd2hA13jFsTxzEieguqXt0R9s3U3vTE/vnBUgPGhwmSayf1TIU7tPeLczKGsCzWmPJelEUEooapsZP3PQaOZFlho8+zp+PuI= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1704450278; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FUjYs+Mb0rc3SsQpm3cS0ge1fvQRPcMWsIdTTpRNkJI=; b=Yq4SINwWe26El3+2gQ5837pgh7c+BUJfIsv7ZecWYyvYtBdbEWJ1Olw+ChIZgncujplp1H mjBfjIjICn/kyuwQHe0vwUt+1bHA0e7KxebdkBUmCJYQ2s9BqB50twgPjSpOlDheiQ9ywO lc3pGUN1SRZxNJV21ihMDxQcfTzEwtc= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-167-kBZBPCLnOaSa5V1seQ4CFg-1; Fri, 05 Jan 2024 05:24:34 -0500 X-MC-Unique: kBZBPCLnOaSa5V1seQ4CFg-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3C17F28040B4; Fri, 5 Jan 2024 10:24:33 +0000 (UTC) Received: from localhost (unknown [10.42.28.185]) by smtp.corp.redhat.com (Postfix) with ESMTP id 066723C25; Fri, 5 Jan 2024 10:24:32 +0000 (UTC) From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Use if-constexpr in std::__try_use_facet [PR113099] Date: Fri, 5 Jan 2024 10:23:48 +0000 Message-ID: <20240105102432.3180887-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-13.4 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_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Tested x86_64-linux. Pushed to trunk. -- >8 -- As noted in the PR, we can use if-constexpr for the explicit instantantiation definitions that are compiled with -std=gnu++11. We just need to disable the -Wc++17-extensions diagnostics. libstdc++-v3/ChangeLog: PR libstdc++/113099 * include/bits/locale_classes.tcc (__try_use_facet): Use if-constexpr for C++11 and up. --- libstdc++-v3/include/bits/locale_classes.tcc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/include/bits/locale_classes.tcc b/libstdc++-v3/include/bits/locale_classes.tcc index 2a6176fb4de..63097582dec 100644 --- a/libstdc++-v3/include/bits/locale_classes.tcc +++ b/libstdc++-v3/include/bits/locale_classes.tcc @@ -87,6 +87,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __s2.data(), __s2.data() + __s2.length()) < 0); } +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wc++17-extensions" template inline const _Facet* __try_use_facet(const locale& __loc) _GLIBCXX_NOTHROW @@ -97,7 +99,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // We know these standard facets are always installed in every locale // so dynamic_cast always succeeds, just use static_cast instead. #define _GLIBCXX_STD_FACET(...) \ - if _GLIBCXX17_CONSTEXPR (__is_same(_Facet, __VA_ARGS__)) \ + if _GLIBCXX_CONSTEXPR (__is_same(_Facet, __VA_ARGS__)) \ return static_cast(__facets[__i]) _GLIBCXX_STD_FACET(ctype); @@ -145,6 +147,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION return static_cast(__facets[__i]); #endif } +#pragma GCC diagnostic pop /** * @brief Test for the presence of a facet. -- 2.43.0