From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id B704C3858D32; Fri, 5 Jan 2024 10:23:47 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B704C3858D32 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1704450227; bh=nRW+RyjsLG/p0a8Qttgt+O8APhyhvAbCzjsBc65ldsc=; h=From:To:Subject:Date:From; b=QU/kR7RA64pN2QerJ8VY2/P7OcOedgmZXPH7WUbo4GyMDr270OdCox6UCMeTdRG0t xSiivOO57dx443ms/jq0aU8PWbZ5JXhGXwLglQtP1Z1+Yb3YFD9kFWywCeZncmOUol PGBKDYtrgvCQj3b+gW5rkzOYHFzjRswLq95xO2eE= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r14-6942] libstdc++: Use if-constexpr in std::__try_use_facet [PR113099] X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: b8faf1fca42a9b987fec0992ca5d63995b2640b3 X-Git-Newrev: 9f3eb93e72703f6ea30aa27d0b6fc6db62cb4a04 Message-Id: <20240105102347.B704C3858D32@sourceware.org> Date: Fri, 5 Jan 2024 10:23:47 +0000 (GMT) List-Id: https://gcc.gnu.org/g:9f3eb93e72703f6ea30aa27d0b6fc6db62cb4a04 commit r14-6942-g9f3eb93e72703f6ea30aa27d0b6fc6db62cb4a04 Author: Jonathan Wakely Date: Wed Jan 3 12:23:32 2024 +0000 libstdc++: Use if-constexpr in std::__try_use_facet [PR113099] 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. Diff: --- 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.