TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'osx-clang-missing-ranges' to master

Browse source
This commit is contained in:
Kp 2023-01-14 19:05:37 +00:00
parent 99b98bb555 476affd806
commit 9839ca185b
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/main/d_enumerate.h
View file

@ -138,7 +138,7 @@ public:
* fully consumed. If `range_type &&` is an ephemeral range, then its
* storage may cease to exist after this constructor returns.
*/
requires(std::ranges::borrowed_range<range_type>)
requires(ranges::borrowed_range<range_type>)
enumerate(range_type &&t, const index_type i = index_type{}) :
base_type(std::forward<range_type>(t)), m_idx(i)
{
@ -158,5 +158,5 @@ template <typename range_iterator_type, typename range_sentinel_type, typename i
inline constexpr bool std::ranges::enable_borrowed_range<enumerate<range_iterator_type, range_sentinel_type, index_type>> = true;
template <typename range_type, typename index_type = decltype(d_enumerate::detail::array_index_type(static_cast<typename std::remove_reference<range_type>::type *>(nullptr)))>
requires(std::ranges::borrowed_range<range_type>)
requires(ranges::borrowed_range<range_type>)
enumerate(range_type &&r, index_type start = {/* value ignored for deduction guide */}) -> enumerate</* range_iterator_type = */ decltype(std::ranges::begin(std::declval<range_type &>())), /* range_sentinel_type = */ decltype(std::ranges::end(std::declval<range_type &>())), index_type>;

2
common/main/d_zip.h
View file

@ -345,7 +345,7 @@ public:
template <typename... rangeN_type>
requires(
sizeof...(rangeN_type) > 0 &&
(std::ranges::borrowed_range<rangeN_type> && ...)
(ranges::borrowed_range<rangeN_type> && ...)
)
constexpr zip(rangeN_type &&... rN) :
iterator(std::ranges::begin(rN)...), m_end(d_zip::detail::capture_end_iterators<range_sentinel_type>(typename iterator::index_sequence_type(), rN...))