diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2021-04-12 12:49:17 +0100 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2021-04-12 13:31:17 +0100 |
| commit | 7569ce583f540ae22c585cc5159e3b23deedd987 (patch) | |
| tree | 2060c4af90d8c20e0f6fadd6f8e34af0c1f10456 | |
| parent | 1c35444b919683be23208479312a45e73d23ed35 (diff) | |
| download | gcc-7569ce583f540ae22c585cc5159e3b23deedd987.zip gcc-7569ce583f540ae22c585cc5159e3b23deedd987.tar.gz gcc-7569ce583f540ae22c585cc5159e3b23deedd987.tar.bz2 | |
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/bits/ranges_util.h (__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.
| -rw-r--r-- | libstdc++-v3/include/bits/ranges_util.h | 15 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/std/ranges/subrange/lwg3282_neg.cc | 13 |
2 files changed, 13 insertions, 15 deletions
diff --git a/libstdc++-v3/include/bits/ranges_util.h b/libstdc++-v3/include/bits/ranges_util.h index ae53afd..9d51e1b 100644 --- a/libstdc++-v3/include/bits/ranges_util.h +++ b/libstdc++-v3/include/bits/ranges_util.h @@ -186,11 +186,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 }; @@ -352,16 +347,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 d9894e4..170f4d2 100644 --- a/libstdc++-v3/testsuite/std/ranges/subrange/lwg3282_neg.cc +++ b/libstdc++-v3/testsuite/std/ranges/subrange/lwg3282_neg.cc @@ -29,3 +29,16 @@ 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" } +} |