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 r10-9699] libstdc++: Implement LWG 3404 for C++20 subrange [PR 100044] Date: Mon, 12 Apr 2021 14:59:48 +0000 (GMT) [thread overview] Message-ID: <20210412145948.7BED03898529@sourceware.org> (raw) https://gcc.gnu.org/g:b6bef1cbc14080d5dd0a7ddbb81aa4b68ece84a3 commit r10-9699-gb6bef1cbc14080d5dd0a7ddbb81aa4b68ece84a3 Author: Jonathan Wakely <jwakely@redhat.com> Date: Mon Apr 12 12:49:17 2021 +0100 libstdc++: Implement LWG 3404 for C++20 subrange [PR 100044] These deduction guides became useless with LWG 3282 (implemented in commit r10-6741) and so were removed by LWG 3404. libstdc++-v3/ChangeLog: PR libstdc++/100044 * include/std/ranges (__detail::__iterator_sentinel_pair): Remove helper concept. (subrange(_Pr), subrange(Pr, __make_unsigned_like<...>)): Remove deduction guides, as per LWG 3404. * testsuite/std/ranges/subrange/lwg3282_neg.cc: Check that class template argument deduction fails. (cherry picked from commit 7569ce583f540ae22c585cc5159e3b23deedd987) Diff: --- libstdc++-v3/include/std/ranges | 15 --------------- libstdc++-v3/testsuite/std/ranges/subrange/lwg3282_neg.cc | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges index 8e00222c2e8..a8ec806235d 100644 --- a/libstdc++-v3/include/std/ranges +++ b/libstdc++-v3/include/std/ranges @@ -222,11 +222,6 @@ namespace ranges && __convertible_to_non_slicing<_Up, tuple_element_t<0, _Tp>> && convertible_to<_Vp, tuple_element_t<1, _Tp>>; - template<typename _Tp> - concept __iterator_sentinel_pair - = !range<_Tp> && __pair_like<_Tp> - && sentinel_for<tuple_element_t<1, _Tp>, tuple_element_t<0, _Tp>>; - } // namespace __detail enum class subrange_kind : bool { unsized, sized }; @@ -387,16 +382,6 @@ namespace ranges __detail::__make_unsigned_like_t<iter_difference_t<_It>>) -> subrange<_It, _Sent, subrange_kind::sized>; - template<__detail::__iterator_sentinel_pair _Pr> - subrange(_Pr) - -> subrange<tuple_element_t<0, _Pr>, tuple_element_t<1, _Pr>>; - - template<__detail::__iterator_sentinel_pair _Pr> - subrange(_Pr, __detail::__make_unsigned_like_t<iter_difference_t< - tuple_element_t<0, _Pr>>>) - -> subrange<tuple_element_t<0, _Pr>, tuple_element_t<1, _Pr>, - subrange_kind::sized>; - template<borrowed_range _Rng> subrange(_Rng&&) -> subrange<iterator_t<_Rng>, sentinel_t<_Rng>, diff --git a/libstdc++-v3/testsuite/std/ranges/subrange/lwg3282_neg.cc b/libstdc++-v3/testsuite/std/ranges/subrange/lwg3282_neg.cc index 5c2f1de45ad..3d21774c966 100644 --- a/libstdc++-v3/testsuite/std/ranges/subrange/lwg3282_neg.cc +++ b/libstdc++-v3/testsuite/std/ranges/subrange/lwg3282_neg.cc @@ -29,3 +29,18 @@ struct Base {}; struct Derived : Base {}; subrange<Derived*> sd; subrange<Base*> sb = sd; // { dg-error "conversion" } + +void +test_lwg3404() +{ + // LWG 3404. Finish removing subrange's conversions from pair-like + std::pair<char*, char*> p; + subrange sb1(p); // { dg-error "no matching function" } + // { dg-error "class template argument deduction" "" { target *-*-* } 38 } + subrange sb2(p, p.second - p.first); // { dg-error "no matching function" } + // { dg-error "class template argument deduction" "" { target *-*-* } 40 } + + // { dg-prune-output "in requirements with" } + // { dg-prune-output "template constraint failure" } + // { dg-prune-output "unsatisfied constraints" } +}
reply other threads:[~2021-04-12 14:59 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=20210412145948.7BED03898529@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).