public inbox for libstdc++-cvs@sourceware.org help / color / mirror / Atom feed
From: Jonathan Wakely <redi@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r13-8237] libstdc++: Use variable template to fix -fconcepts-ts error [PR113366] Date: Thu, 18 Jan 2024 21:03:20 +0000 (GMT) [thread overview] Message-ID: <20240118210320.8D6C73858414@sourceware.org> (raw) https://gcc.gnu.org/g:35000c65470792aed3a3c23a3b3fc45db4bec2c4 commit r13-8237-g35000c65470792aed3a3c23a3b3fc45db4bec2c4 Author: Jonathan Wakely <jwakely@redhat.com> Date: Sat Jan 13 12:13:33 2024 +0000 libstdc++: Use variable template to fix -fconcepts-ts error [PR113366] There's an error for -fconcepts-ts due to using a concept where a bool NTTP is required, which is fixed by using the vraiable template that already exists in the class scope. This doesn't fix the problem with -fconcepts-ts as changes to the placement of attributes is also needed. libstdc++-v3/ChangeLog: PR testsuite/113366 * include/std/format (basic_format_arg): Use __formattable variable template instead of __format::__formattable_with concept. (cherry picked from commit 6c703b4eb68cbc32de1d62e5b573cb1b9857af29) Diff: --- libstdc++-v3/include/std/format | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libstdc++-v3/include/std/format b/libstdc++-v3/include/std/format index d5ca962423c..401503e895c 100644 --- a/libstdc++-v3/include/std/format +++ b/libstdc++-v3/include/std/format @@ -2847,8 +2847,7 @@ namespace __format // Format as const if possible, to reduce instantiations. template<typename _Tp> using __maybe_const_t - = __conditional_t<__format::__formattable_with<_Tp, _Context>, - const _Tp, _Tp>; + = __conditional_t<__formattable<_Tp>, const _Tp, _Tp>; template<typename _Tq> static void @@ -2866,7 +2865,7 @@ namespace __format explicit handle(_Tp& __val) noexcept { - if constexpr (!__format::__formattable_with<const _Tp, _Context>) + if constexpr (!__formattable<const _Tp>) static_assert(!is_const_v<_Tp>, "std::format argument must be " "non-const for this type");
reply other threads:[~2024-01-18 21:03 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20240118210320.8D6C73858414@sourceware.org \ --to=redi@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ --cc=libstdc++-cvs@gcc.gnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).