Skip to content

Replace safe_subrange_t with borrowed_subrange_t #1542

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 6, 2020
Merged

Replace safe_subrange_t with borrowed_subrange_t #1542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/range/v3/algorithm/equal_range.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ namespace ranges
/// \pre
requires forward_range<Rng> AND
indirect_strict_weak_order<C, V const *, projected<iterator_t<Rng>, P>>)
safe_subrange_t<Rng> //
borrowed_subrange_t<Rng> //
RANGES_FUNC(equal_range)(Rng && rng, V const & val, C pred = C{}, P proj = P{}) //
{
if(RANGES_CONSTEXPR_IF(sized_range<Rng>))
Expand Down
2 changes: 1 addition & 1 deletion include/range/v3/algorithm/find_end.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ namespace ranges
/// \pre
requires forward_range<Rng1> AND forward_range<Rng2> AND
indirect_relation<R, projected<iterator_t<Rng1>, P>, iterator_t<Rng2>>)
safe_subrange_t<Rng1> RANGES_FUNC(find_end)(
borrowed_subrange_t<Rng1> RANGES_FUNC(find_end)(
Rng1 && rng1, Rng2 && rng2, R pred = R{}, P proj = P{}) //
{
return (*this)(begin(rng1),
Expand Down
2 changes: 1 addition & 1 deletion include/range/v3/algorithm/rotate.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ namespace ranges
template(typename Rng, typename I = iterator_t<Rng>)(
/// \pre
requires range<Rng> AND permutable<I>)
safe_subrange_t<Rng> RANGES_FUNC(rotate)(Rng && rng, I middle) //
borrowed_subrange_t<Rng> RANGES_FUNC(rotate)(Rng && rng, I middle) //
{
return (*this)(begin(rng), std::move(middle), end(rng));
}
Expand Down
2 changes: 1 addition & 1 deletion include/range/v3/algorithm/search.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ namespace ranges
/// \pre
requires forward_range<Rng1> AND forward_range<Rng2> AND
indirectly_comparable<iterator_t<Rng1>, iterator_t<Rng2>, C, P1, P2>)
safe_subrange_t<Rng1> RANGES_FUNC(search)(
borrowed_subrange_t<Rng1> RANGES_FUNC(search)(
Rng1 && rng1, Rng2 && rng2, C pred = C{}, P1 proj1 = P1{}, P2 proj2 = P2{}) //
{
if(empty(rng2))
Expand Down
2 changes: 1 addition & 1 deletion include/range/v3/algorithm/search_n.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ namespace ranges
/// \pre
requires forward_range<Rng> AND
indirectly_comparable<iterator_t<Rng>, V const *, C, P>)
safe_subrange_t<Rng> RANGES_FUNC(search_n)(Rng && rng,
borrowed_subrange_t<Rng> RANGES_FUNC(search_n)(Rng && rng,
iter_difference_t<iterator_t<Rng>> cnt,
V const & val,
C pred = C{},
Expand Down
12 changes: 10 additions & 2 deletions include/range/v3/view/subrange.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,11 @@ namespace ranges
RANGES_INLINE_VARIABLE(make_subrange_fn, make_subrange)

template<typename R>
using safe_subrange_t = detail::maybe_dangling_<R, subrange<iterator_t<R>>>;
using borrowed_subrange_t = detail::maybe_dangling_<R, subrange<iterator_t<R>>>;

template<typename R>
using safe_subrange_t RANGES_DEPRECATED("Use borrowed_subrange_t instead.") =
borrowed_subrange_t<R>;

namespace cpp20
{
Expand All @@ -447,7 +451,11 @@ namespace ranges
(K == subrange_kind::sized || !sized_sentinel_for<S, I>)) //
using subrange = ranges::subrange<I, S, K>;

using ranges::safe_subrange_t;
using ranges::borrowed_subrange_t;

template<typename R>
using safe_subrange_t RANGES_DEPRECATED("Use borrowed_subrange_t instead.") =
borrowed_subrange_t<R>;
} // namespace cpp20
/// @}
} // namespace ranges
Expand Down
4 changes: 2 additions & 2 deletions test/view/subrange.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

CPP_template(class Rng)(
requires ranges::range<Rng>)
ranges::safe_subrange_t<Rng> algorithm(Rng &&rng);
ranges::borrowed_subrange_t<Rng> algorithm(Rng &&rng);

struct Base {};
struct Derived : Base {};
Expand All @@ -33,7 +33,7 @@ int main()
std::vector<int> vi{1,2,3,4};

////////////////////////////////////////////////////////////////////////////
// safe_subrange_t tests:
// borrowed_subrange_t tests:

// lvalues are ReferenceableRanges and do not dangle:
CPP_assert(same_as<subrange<int*>,
Expand Down