Skip to content

R
riscv-gcc-1
Commit 15411a64 by Jonathan Wakely
Options

libstdc++: "safe" in several library names is misleading (LWG 3379) 

	* include/bits/range_access.h (enable_safe_range): Rename to
	enable_borrowed_range.
	(__detail::__maybe_safe_range): Rename to __maybe_borrowed_range.
	(safe_range): Rename to borrowed_range.
	* include/bits/ranges_algo.h: Adjust to use new names.
	* include/bits/ranges_algobase.h: Likewise.
	* include/bits/ranges_uninitialized.h: Likewise.
	* include/std/ranges: Likewise.
	(safe_iterator_t): Rename to borrowed_iterator_t.
	(safe_subrange_t): Rename to borrowed_subrange_t.
	* include/std/span: Adjust to use new names.
	* include/std/string_view: Likewise.
	* include/experimental/string_view: Likewise.
	* testsuite/std/ranges/access/begin.cc: Likewise.
	* testsuite/std/ranges/access/cbegin.cc: Likewise.
	* testsuite/std/ranges/access/cdata.cc: Likewise.
	* testsuite/std/ranges/access/cend.cc: Likewise.
	* testsuite/std/ranges/access/crbegin.cc: Likewise.
	* testsuite/std/ranges/access/crend.cc: Likewise.
	* testsuite/std/ranges/access/data.cc: Likewise.
	* testsuite/std/ranges/access/end.cc: Likewise.
	* testsuite/std/ranges/access/rbegin.cc: Likewise.
	* testsuite/std/ranges/access/rend.cc: Likewise.
	* testsuite/std/ranges/safe_range.cc: Likewise.
	* testsuite/std/ranges/safe_range_types.cc: Likewise.
	* testsuite/util/testsuite_iterators.h: Likewise.
parent fa89adaa
Showing with 136 additions and 105 deletions
libstdc++-v3/ChangeLog
2020-02-19 Jonathan Wakely <jwakely@redhat.com>
LWG 3379. "safe" in several library names is misleading
* include/bits/range_access.h (enable_safe_range): Rename to
enable_borrowed_range.
(__detail::__maybe_safe_range): Rename to __maybe_borrowed_range.
(safe_range): Rename to borrowed_range.
* include/bits/ranges_algo.h: Adjust to use new names.
* include/bits/ranges_algobase.h: Likewise.
* include/bits/ranges_uninitialized.h: Likewise.
* include/std/ranges: Likewise.
(safe_iterator_t): Rename to borrowed_iterator_t.
(safe_subrange_t): Rename to borrowed_subrange_t.
* include/std/span: Adjust to use new names.
* include/std/string_view: Likewise.
* include/experimental/string_view: Likewise.
* testsuite/std/ranges/access/begin.cc: Likewise.
* testsuite/std/ranges/access/cbegin.cc: Likewise.
* testsuite/std/ranges/access/cdata.cc: Likewise.
* testsuite/std/ranges/access/cend.cc: Likewise.
* testsuite/std/ranges/access/crbegin.cc: Likewise.
* testsuite/std/ranges/access/crend.cc: Likewise.
* testsuite/std/ranges/access/data.cc: Likewise.
* testsuite/std/ranges/access/end.cc: Likewise.
* testsuite/std/ranges/access/rbegin.cc: Likewise.
* testsuite/std/ranges/access/rend.cc: Likewise.
* testsuite/std/ranges/safe_range.cc: Likewise.
* testsuite/std/ranges/safe_range_types.cc: Likewise.
* testsuite/util/testsuite_iterators.h: Likewise.
* include/std/ranges (tuple_element<0, const subrange<I, S, K>>)
(tuple_element<1, const subrange<I, S, K>>): Add partial
specializations (LWG 3398).
......
libstdc++-v3/include/bits/range_access.h
......@@ -344,7 +344,7 @@ namespace ranges
inline constexpr bool disable_sized_range = false;
template<typename _Tp>
inline constexpr bool enable_safe_range = false;
inline constexpr bool enable_borrowed_range = false;
namespace __detail
{
......@@ -357,16 +357,17 @@ namespace ranges
using __make_unsigned_like_t
= conditional_t<_MaxDiff, __max_size_type, make_unsigned_t<_Tp>>;
// Part of the constraints of ranges::safe_range
// Part of the constraints of ranges::borrowed_range
template<typename _Tp>
concept __maybe_safe_range
= is_lvalue_reference_v<_Tp> || enable_safe_range<remove_cvref_t<_Tp>>;
concept __maybe_borrowed_range
= is_lvalue_reference_v<_Tp>
|| enable_borrowed_range<remove_cvref_t<_Tp>>;
} // namespace __detail
namespace __cust_access
{
using std::ranges::__detail::__maybe_safe_range;
using std::ranges::__detail::__maybe_borrowed_range;
using std::__detail::__class_or_enum;
template<typename _Tp>
......@@ -407,7 +408,7 @@ namespace ranges
}
public:
template<__maybe_safe_range _Tp>
template<__maybe_borrowed_range _Tp>
requires is_array_v<remove_reference_t<_Tp>> || __member_begin<_Tp>
|| __adl_begin<_Tp>
constexpr auto
......@@ -459,7 +460,7 @@ namespace ranges
}
public:
template<__maybe_safe_range _Tp>
template<__maybe_borrowed_range _Tp>
requires is_array_v<remove_reference_t<_Tp>> || __member_end<_Tp>
|| __adl_end<_Tp>
constexpr auto
......@@ -559,7 +560,7 @@ namespace ranges
}
public:
template<__maybe_safe_range _Tp>
template<__maybe_borrowed_range _Tp>
requires __member_rbegin<_Tp> || __adl_rbegin<_Tp> || __reversable<_Tp>
constexpr auto
operator()(_Tp&& __t) const
......@@ -616,7 +617,7 @@ namespace ranges
}
public:
template<__maybe_safe_range _Tp>
template<__maybe_borrowed_range _Tp>
requires __member_rend<_Tp> || __adl_rend<_Tp> || __reversable<_Tp>
constexpr auto
operator()(_Tp&& __t) const
......@@ -875,9 +876,10 @@ namespace ranges
ranges::end(__t);
};
/// [range.range] The safe_range concept.
/// [range.range] The borrowed_range concept.
template<typename _Tp>
concept safe_range = range<_Tp> && __detail::__maybe_safe_range<_Tp>;
concept borrowed_range
= range<_Tp> && __detail::__maybe_borrowed_range<_Tp>;
template<range _Range>
using iterator_t = decltype(ranges::begin(std::declval<_Range&>()));
......
libstdc++-v3/include/bits/ranges_algobase.h
......@@ -310,7 +310,7 @@ namespace ranges
template<input_range _Range, weakly_incrementable _Out>
requires indirectly_copyable<iterator_t<_Range>, _Out>
constexpr copy_result<safe_iterator_t<_Range>, _Out>
constexpr copy_result<borrowed_iterator_t<_Range>, _Out>
operator()(_Range&& __r, _Out __result) const
{
return (*this)(ranges::begin(__r), ranges::end(__r),
......@@ -335,7 +335,7 @@ namespace ranges
template<input_range _Range, weakly_incrementable _Out>
requires indirectly_movable<iterator_t<_Range>, _Out>
constexpr move_result<safe_iterator_t<_Range>, _Out>
constexpr move_result<borrowed_iterator_t<_Range>, _Out>
operator()(_Range&& __r, _Out __result) const
{
return (*this)(ranges::begin(__r), ranges::end(__r),
......@@ -452,7 +452,7 @@ namespace ranges
template<bidirectional_range _Range, bidirectional_iterator _Iter>
requires indirectly_copyable<iterator_t<_Range>, _Iter>
constexpr copy_backward_result<safe_iterator_t<_Range>, _Iter>
constexpr copy_backward_result<borrowed_iterator_t<_Range>, _Iter>
operator()(_Range&& __r, _Iter __result) const
{
return (*this)(ranges::begin(__r), ranges::end(__r),
......@@ -477,7 +477,7 @@ namespace ranges
template<bidirectional_range _Range, bidirectional_iterator _Iter>
requires indirectly_movable<iterator_t<_Range>, _Iter>
constexpr move_backward_result<safe_iterator_t<_Range>, _Iter>
constexpr move_backward_result<borrowed_iterator_t<_Range>, _Iter>
operator()(_Range&& __r, _Iter __result) const
{
return (*this)(ranges::begin(__r), ranges::end(__r),
......@@ -577,7 +577,7 @@ namespace ranges
}
template<typename _Tp, output_range<const _Tp&> _Range>
constexpr safe_iterator_t<_Range>
constexpr borrowed_iterator_t<_Range>
operator()(_Range&& __r, const _Tp& __value) const
{
return (*this)(ranges::begin(__r), ranges::end(__r), __value);
......
libstdc++-v3/include/bits/ranges_uninitialized.h
......@@ -88,7 +88,7 @@ namespace ranges
template<__detail::__nothrow_input_range _Range>
requires destructible<range_value_t<_Range>>
constexpr safe_iterator_t<_Range>
constexpr borrowed_iterator_t<_Range>
operator()(_Range&& __r) const noexcept;
};
......@@ -159,7 +159,7 @@ namespace ranges
template<__detail::__nothrow_forward_range _Range>
requires default_initializable<range_value_t<_Range>>
safe_iterator_t<_Range>
borrowed_iterator_t<_Range>
operator()(_Range&& __r) const
{
return (*this)(ranges::begin(__r), ranges::end(__r));
......@@ -217,7 +217,7 @@ namespace ranges
template<__detail::__nothrow_forward_range _Range>
requires default_initializable<range_value_t<_Range>>
safe_iterator_t<_Range>
borrowed_iterator_t<_Range>
operator()(_Range&& __r) const
{
return (*this)(ranges::begin(__r), ranges::end(__r));
......@@ -290,8 +290,8 @@ namespace ranges
template<input_range _IRange, __detail::__nothrow_forward_range _ORange>
requires constructible_from<range_value_t<_ORange>,
range_reference_t<_IRange>>
uninitialized_copy_result<safe_iterator_t<_IRange>,
safe_iterator_t<_ORange>>
uninitialized_copy_result<borrowed_iterator_t<_IRange>,
borrowed_iterator_t<_ORange>>
operator()(_IRange&& __inr, _ORange&& __outr) const
{
return (*this)(ranges::begin(__inr), ranges::end(__inr),
......@@ -377,8 +377,8 @@ namespace ranges
template<input_range _IRange, __detail::__nothrow_forward_range _ORange>
requires constructible_from<range_value_t<_ORange>,
range_rvalue_reference_t<_IRange>>
uninitialized_move_result<safe_iterator_t<_IRange>,
safe_iterator_t<_ORange>>
uninitialized_move_result<borrowed_iterator_t<_IRange>,
borrowed_iterator_t<_ORange>>
operator()(_IRange&& __inr, _ORange&& __outr) const
{
return (*this)(ranges::begin(__inr), ranges::end(__inr),
......@@ -450,7 +450,7 @@ namespace ranges
template<__detail::__nothrow_forward_range _Range, typename _Tp>
requires constructible_from<range_value_t<_Range>, const _Tp&>
safe_iterator_t<_Range>
borrowed_iterator_t<_Range>
operator()(_Range&& __r, const _Tp& __x) const
{
return (*this)(ranges::begin(__r), ranges::end(__r), __x);
......@@ -531,7 +531,7 @@ namespace ranges
template<__detail::__nothrow_input_range _Range>
requires destructible<range_value_t<_Range>>
constexpr safe_iterator_t<_Range>
constexpr borrowed_iterator_t<_Range>
__destroy_fn::operator()(_Range&& __r) const noexcept
{
return (*this)(ranges::begin(__r), ranges::end(__r));
......
libstdc++-v3/include/experimental/string_view
......@@ -694,11 +694,11 @@ namespace experimental
#if __cpp_lib_concepts
namespace ranges
{
template<typename> extern inline const bool enable_safe_range;
// Opt-in to safe_range concept
template<typename> extern inline const bool enable_borrowed_range;
// Opt-in to borrowed_range concept
template<typename _CharT, typename _Traits>
inline constexpr bool
enable_safe_range<experimental::basic_string_view<_CharT, _Traits>>
enable_borrowed_range<experimental::basic_string_view<_CharT, _Traits>>
= true;
}
#endif
......
libstdc++-v3/include/std/ranges
......@@ -93,7 +93,7 @@ namespace ranges
/// A range which can be safely converted to a view.
template<typename _Tp>
concept viewable_range = range<_Tp>
&& (safe_range<_Tp> || view<remove_cvref_t<_Tp>>);
&& (borrowed_range<_Tp> || view<remove_cvref_t<_Tp>>);
namespace __detail
{
......@@ -294,7 +294,7 @@ namespace ranges
}
template<__detail::__not_same_as<subrange> _Rng>
requires safe_range<_Rng>
requires borrowed_range<_Rng>
&& convertible_to<iterator_t<_Rng>, _It>
&& convertible_to<sentinel_t<_Rng>, _Sent>
constexpr
......@@ -305,7 +305,7 @@ namespace ranges
_M_size._M_size = ranges::size(__r);
}
template<safe_range _Rng>
template<borrowed_range _Rng>
requires convertible_to<iterator_t<_Rng>, _It>
&& convertible_to<sentinel_t<_Rng>, _Sent>
constexpr
......@@ -417,14 +417,14 @@ namespace ranges
-> subrange<tuple_element_t<0, _Pr>, tuple_element_t<1, _Pr>,
subrange_kind::sized>;
template<safe_range _Rng>
template<borrowed_range _Rng>
subrange(_Rng&&)
-> subrange<iterator_t<_Rng>, sentinel_t<_Rng>,
(sized_range<_Rng>
|| sized_sentinel_for<sentinel_t<_Rng>, iterator_t<_Rng>>)
? subrange_kind::sized : subrange_kind::unsized>;
template<safe_range _Rng>
template<borrowed_range _Rng>
subrange(_Rng&&,
__detail::__make_unsigned_like_t<range_difference_t<_Rng>>)
-> subrange<iterator_t<_Rng>, sentinel_t<_Rng>, subrange_kind::sized>;
......@@ -454,7 +454,7 @@ namespace ranges
template<input_or_output_iterator _It, sentinel_for<_It> _Sent,
subrange_kind _Kind>
inline constexpr bool
enable_safe_range<subrange<_It, _Sent, _Kind>> = true;
enable_borrowed_range<subrange<_It, _Sent, _Kind>> = true;
} // namespace ranges
......@@ -471,14 +471,14 @@ namespace ranges
};
template<range _Range>
using safe_iterator_t = conditional_t<safe_range<_Range>,
iterator_t<_Range>,
dangling>;
using borrowed_iterator_t = conditional_t<borrowed_range<_Range>,
iterator_t<_Range>,
dangling>;
template<range _Range>
using safe_subrange_t = conditional_t<safe_range<_Range>,
subrange<iterator_t<_Range>>,
dangling>;
using borrowed_subrange_t = conditional_t<borrowed_range<_Range>,
subrange<iterator_t<_Range>>,
dangling>;
template<typename _Tp> requires is_object_v<_Tp>
class empty_view
......@@ -493,7 +493,7 @@ namespace ranges
};
template<typename _Tp>
inline constexpr bool enable_safe_range<empty_view<_Tp>> = true;
inline constexpr bool enable_borrowed_range<empty_view<_Tp>> = true;
namespace __detail
{
......@@ -919,7 +919,8 @@ namespace ranges
iota_view(_Winc, _Bound) -> iota_view<_Winc, _Bound>;
template<weakly_incrementable _Winc, semiregular _Bound>
inline constexpr bool enable_safe_range<iota_view<_Winc, _Bound>> = true;
inline constexpr bool
enable_borrowed_range<iota_view<_Winc, _Bound>> = true;
namespace views
{
......@@ -1221,7 +1222,7 @@ namespace views
ref_view(_Range&) -> ref_view<_Range>;
template<typename _Tp>
inline constexpr bool enable_safe_range<ref_view<_Tp>> = true;
inline constexpr bool enable_borrowed_range<ref_view<_Tp>> = true;
namespace views
{
......
libstdc++-v3/include/std/span
......@@ -207,7 +207,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _Range>
requires ranges::contiguous_range<_Range> && ranges::sized_range<_Range>
&& (ranges::safe_range<_Range> || is_const_v<element_type>)
&& (ranges::borrowed_range<_Range> || is_const_v<element_type>)
&& (!__detail::__is_std_span<remove_cvref_t<_Range>>::value)
&& (!__detail::__is_std_array<remove_cvref_t<_Range>>::value)
&& (!is_array_v<remove_cvref_t<_Range>>)
......@@ -465,11 +465,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace ranges
{
template<typename> extern inline const bool enable_safe_range;
// Opt-in to safe_range concept
template<typename> extern inline const bool enable_borrowed_range;
// Opt-in to borrowed_range concept
template<typename _ElementType, size_t _Extent>
inline constexpr bool
enable_safe_range<span<_ElementType, _Extent>> = true;
enable_borrowed_range<span<_ElementType, _Extent>> = true;
}
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std
......
libstdc++-v3/include/std/string_view
......@@ -727,11 +727,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#if __cpp_lib_concepts
namespace ranges
{
template<typename> extern inline const bool enable_safe_range;
// Opt-in to safe_range concept
template<typename> extern inline const bool enable_borrowed_range;
// Opt-in to borrowed_range concept
template<typename _CharT, typename _Traits>
inline constexpr bool
enable_safe_range<basic_string_view<_CharT, _Traits>> = true;
enable_borrowed_range<basic_string_view<_CharT, _Traits>> = true;
}
#endif
_GLIBCXX_END_NAMESPACE_VERSION
......
libstdc++-v3/testsuite/std/ranges/access/begin.cc
......@@ -85,7 +85,7 @@ struct RV // view on an R
};
// Allow ranges::begin to work with RV&&
template<> constexpr bool std::ranges::enable_safe_range<RV> = true;
template<> constexpr bool std::ranges::enable_borrowed_range<RV> = true;
void
test03()
......@@ -102,7 +102,7 @@ test03()
VERIFY( std::ranges::begin(c) == begin(c) );
RV v{r};
// enable_safe_range<RV> allows ranges::begin to work for rvalues,
// enable_borrowed_range<RV> allows ranges::begin to work for rvalues,
// but it will call v.begin() or begin(v) on an lvalue:
static_assert(same_as<decltype(std::ranges::begin(std::move(v))),
decltype(begin(v))>);
......@@ -132,7 +132,7 @@ struct RR
};
// N.B. this is a lie, begin on an RR rvalue will return a dangling pointer.
template<> constexpr bool std::ranges::enable_safe_range<RR> = true;
template<> constexpr bool std::ranges::enable_borrowed_range<RR> = true;
void
test04()
......
libstdc++-v3/testsuite/std/ranges/access/cbegin.cc
......@@ -54,7 +54,7 @@ struct RV // view on an R
};
// Allow ranges::begin to work with RV&&
template<> constexpr bool std::ranges::enable_safe_range<RV> = true;
template<> constexpr bool std::ranges::enable_borrowed_range<RV> = true;
void
test03()
......@@ -86,7 +86,7 @@ struct RR
};
// N.B. this is a lie, cbegin on an RR rvalue will return a dangling pointer.
template<> constexpr bool std::ranges::enable_safe_range<RR> = true;
template<> constexpr bool std::ranges::enable_borrowed_range<RR> = true;
void
test04()
......
libstdc++-v3/testsuite/std/ranges/access/cdata.cc
......@@ -57,7 +57,7 @@ struct R
};
// This is a lie, ranges::begin(R&&) returns a dangling iterator.
template<> constexpr bool std::ranges::enable_safe_range<R> = true;
template<> constexpr bool std::ranges::enable_borrowed_range<R> = true;
void
test03()
......
libstdc++-v3/testsuite/std/ranges/access/cend.cc
......@@ -60,7 +60,7 @@ struct RV // view on an R
};
// Allow ranges::end to work with RV&&
template<> constexpr bool std::ranges::enable_safe_range<RV> = true;
template<> constexpr bool std::ranges::enable_borrowed_range<RV> = true;
void
test03()
......@@ -98,7 +98,7 @@ struct RR
};
// N.B. this is a lie, begin/end on an RR rvalue will return a dangling pointer.
template<> constexpr bool std::ranges::enable_safe_range<RR> = true;
template<> constexpr bool std::ranges::enable_borrowed_range<RR> = true;
void
test04()
......
libstdc++-v3/testsuite/std/ranges/access/crbegin.cc
......@@ -40,7 +40,7 @@ struct R1V // view on an R1
};
// Allow ranges::end to work with R1V&&
template<> constexpr bool std::ranges::enable_safe_range<R1V> = true;
template<> constexpr bool std::ranges::enable_borrowed_range<R1V> = true;
void
test01()
......@@ -69,7 +69,7 @@ struct R2
};
// N.B. this is a lie, rbegin on an R2 rvalue will return a dangling pointer.
template<> constexpr bool std::ranges::enable_safe_range<R2> = true;
template<> constexpr bool std::ranges::enable_borrowed_range<R2> = true;
void
test02()
......
libstdc++-v3/testsuite/std/ranges/access/crend.cc
......@@ -34,7 +34,7 @@ struct R1
};
// N.B. this is a lie, rend on an R1 rvalue will return a dangling pointer.
template<> constexpr bool std::ranges::enable_safe_range<R1> = true;
template<> constexpr bool std::ranges::enable_borrowed_range<R1> = true;
void
test01()
......@@ -60,7 +60,7 @@ struct R2
};
// N.B. this is a lie, rend on an R2 rvalue will return a dangling pointer.
template<> constexpr bool std::ranges::enable_safe_range<R2> = true;
template<> constexpr bool std::ranges::enable_borrowed_range<R2> = true;
void
test02()
......@@ -85,7 +85,7 @@ struct R3
};
// N.B. this is a lie, rend on an R3 rvalue will return a dangling pointer.
template<> constexpr bool std::ranges::enable_safe_range<R3> = true;
template<> constexpr bool std::ranges::enable_borrowed_range<R3> = true;
void
test03()
......
libstdc++-v3/testsuite/std/ranges/access/data.cc
......@@ -61,7 +61,7 @@ struct R3
};
// N.B. this is a lie, begin on an R3 rvalue will return a dangling pointer.
template<> constexpr bool std::ranges::enable_safe_range<R3> = true;
template<> constexpr bool std::ranges::enable_borrowed_range<R3> = true;
void
test03()
......@@ -69,7 +69,7 @@ test03()
R3 r;
const R3& c = r;
// r.data() can only be used on an lvalue, but ranges::begin(R3&&) is OK
// because R3 satisfies ranges::safe_range.
// because R3 satisfies ranges::borrowed_range.
VERIFY( std::ranges::data(std::move(r)) == std::to_address(std::ranges::begin(std::move(r))) );
VERIFY( std::ranges::data(std::move(c)) == std::to_address(std::ranges::begin(std::move(c))) );
}
......
libstdc++-v3/testsuite/std/ranges/access/end.cc
......@@ -90,7 +90,7 @@ struct RV // view on an R
};
// Allow ranges::begin to work with RV&&
template<> constexpr bool std::ranges::enable_safe_range<RV> = true;
template<> constexpr bool std::ranges::enable_borrowed_range<RV> = true;
void
test03()
......@@ -146,7 +146,7 @@ struct RR
};
// N.B. this is a lie, end on an RR rvalue will return a dangling pointer.
template<> constexpr bool std::ranges::enable_safe_range<RR> = true;
template<> constexpr bool std::ranges::enable_borrowed_range<RR> = true;
void
test04()
......
libstdc++-v3/testsuite/std/ranges/access/rbegin.cc
......@@ -32,7 +32,7 @@ struct R1
};
// N.B. this is a lie, rbegin on an R1 rvalue will return a dangling pointer.
template<> constexpr bool std::ranges::enable_safe_range<R1> = true;
template<> constexpr bool std::ranges::enable_borrowed_range<R1> = true;
void
test01()
......@@ -56,7 +56,7 @@ struct R2
};
// N.B. this is a lie, begin/end on an R2 rvalue will return a dangling pointer.
template<> constexpr bool std::ranges::enable_safe_range<R2> = true;
template<> constexpr bool std::ranges::enable_borrowed_range<R2> = true;
void
test02()
......
libstdc++-v3/testsuite/std/ranges/access/rend.cc
......@@ -34,7 +34,7 @@ struct R1
};
// N.B. this is a lie, rend on an R1 rvalue will return a dangling pointer.
template<> constexpr bool std::ranges::enable_safe_range<R1> = true;
template<> constexpr bool std::ranges::enable_borrowed_range<R1> = true;
void
test01()
......@@ -87,7 +87,7 @@ struct R3
};
// N.B. this is a lie, begin/end on an R3 rvalue will return a dangling pointer.
template<> constexpr bool std::ranges::enable_safe_range<R3> = true;
template<> constexpr bool std::ranges::enable_borrowed_range<R3> = true;
void
test03()
......
libstdc++-v3/testsuite/std/ranges/safe_range.cc
......@@ -21,21 +21,21 @@
#include <ranges>
#include <testsuite_iterators.h>
static_assert( std::ranges::safe_range<int(&)[1]> );
static_assert( std::ranges::safe_range<const int(&)[1]> );
static_assert( !std::ranges::safe_range<int[1]> );
static_assert( !std::ranges::safe_range<int*> );
static_assert( std::ranges::borrowed_range<int(&)[1]> );
static_assert( std::ranges::borrowed_range<const int(&)[1]> );
static_assert( !std::ranges::borrowed_range<int[1]> );
static_assert( !std::ranges::borrowed_range<int*> );
using __gnu_test::test_contiguous_range;
static_assert( !std::ranges::safe_range<test_contiguous_range<int>> );
static_assert( std::ranges::safe_range<test_contiguous_range<int>&> );
static_assert( !std::ranges::safe_range<test_contiguous_range<int>&&> );
static_assert( !std::ranges::borrowed_range<test_contiguous_range<int>> );
static_assert( std::ranges::borrowed_range<test_contiguous_range<int>&> );
static_assert( !std::ranges::borrowed_range<test_contiguous_range<int>&&> );
template<>
constexpr bool
std::ranges::enable_safe_range<test_contiguous_range<long>> = true;
std::ranges::enable_borrowed_range<test_contiguous_range<long>> = true;
static_assert( std::ranges::safe_range<test_contiguous_range<long>> );
static_assert( std::ranges::safe_range<test_contiguous_range<long>&> );
static_assert( std::ranges::safe_range<test_contiguous_range<long>&&> );
static_assert( std::ranges::borrowed_range<test_contiguous_range<long>> );
static_assert( std::ranges::borrowed_range<test_contiguous_range<long>&> );
static_assert( std::ranges::borrowed_range<test_contiguous_range<long>&&> );
libstdc++-v3/testsuite/std/ranges/safe_range_types.cc
......@@ -25,35 +25,35 @@
template<typename T>
constexpr bool
rvalue_is_safe_range()
rvalue_is_borrowed_range()
{
using std::ranges::safe_range;
using std::ranges::borrowed_range;
// An lvalue range always models safe_range
static_assert( safe_range<T&> );
static_assert( safe_range<const T&> );
// An lvalue range always models borrowed_range
static_assert( borrowed_range<T&> );
static_assert( borrowed_range<const T&> );
// Result should not depend on addition of const or rvalue-reference.
static_assert( safe_range<T&&> == safe_range<T> );
static_assert( safe_range<const T> == safe_range<T> );
static_assert( safe_range<const T&&> == safe_range<T> );
static_assert( borrowed_range<T&&> == borrowed_range<T> );
static_assert( borrowed_range<const T> == borrowed_range<T> );
static_assert( borrowed_range<const T&&> == borrowed_range<T> );
return std::ranges::safe_range<T>;
return std::ranges::borrowed_range<T>;
}
static_assert( rvalue_is_safe_range<std::ranges::subrange<int*, int*>>() );
static_assert( rvalue_is_safe_range<std::ranges::empty_view<int>>() );
static_assert( rvalue_is_safe_range<std::ranges::iota_view<int>>() );
static_assert( rvalue_is_safe_range<std::ranges::iota_view<int, int>>() );
static_assert( rvalue_is_borrowed_range<std::ranges::subrange<int*, int*>>() );
static_assert( rvalue_is_borrowed_range<std::ranges::empty_view<int>>() );
static_assert( rvalue_is_borrowed_range<std::ranges::iota_view<int>>() );
static_assert( rvalue_is_borrowed_range<std::ranges::iota_view<int, int>>() );
static_assert( rvalue_is_safe_range<std::span<int>>() );
static_assert( rvalue_is_safe_range<std::span<int, 99>>() );
static_assert( rvalue_is_borrowed_range<std::span<int>>() );
static_assert( rvalue_is_borrowed_range<std::span<int, 99>>() );
static_assert( ! rvalue_is_safe_range<std::string>() );
static_assert( ! rvalue_is_safe_range<std::wstring>() );
static_assert( ! rvalue_is_borrowed_range<std::string>() );
static_assert( ! rvalue_is_borrowed_range<std::wstring>() );
static_assert( rvalue_is_safe_range<std::string_view>() );
static_assert( rvalue_is_safe_range<std::wstring_view>() );
static_assert( rvalue_is_borrowed_range<std::string_view>() );
static_assert( rvalue_is_borrowed_range<std::wstring_view>() );
static_assert( rvalue_is_safe_range<std::experimental::string_view>() );
static_assert( rvalue_is_safe_range<std::experimental::wstring_view>() );
static_assert( rvalue_is_borrowed_range<std::experimental::string_view>() );
static_assert( rvalue_is_borrowed_range<std::experimental::wstring_view>() );
libstdc++-v3/testsuite/util/testsuite_iterators.h
......@@ -765,8 +765,8 @@ namespace __gnu_test
= test_sized_range<T, output_iterator_wrapper>;
// test_range and test_sized_range do not own their elements, so they model
// std::ranges::safe_range. This file does not define specializations of
// std::ranges::enable_safe_range, so that individual tests can decide
// std::ranges::borrowed_range. This file does not define specializations of
// std::ranges::enable_borrowed_range, so that individual tests can decide
// whether or not to do so.
// This is also true for test_container, although only when it has forward
// iterators (because output_iterator_wrapper and input_iterator_wrapper are
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment