From 476affd8060826e8b01c23cf8b2d38cd13bdc664 Mon Sep 17 00:00:00 2001 From: Kreeblah Date: Sat, 7 Jan 2023 15:47:23 -0800 Subject: [PATCH] Fix macOS compilation --- common/include/partial_range.h | 2 +- common/main/d_enumerate.h | 4 ++-- common/main/d_zip.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/include/partial_range.h b/common/include/partial_range.h index dc146d69a..d8988fc02 100644 --- a/common/include/partial_range.h +++ b/common/include/partial_range.h @@ -146,7 +146,7 @@ public: * and neither can be handled here. These checks attempt to * catch obvious mistakes. */ - requires(std::ranges::borrowed_range) + requires(ranges::borrowed_range) partial_range_t(T &&t) : m_begin(std::ranges::begin(t)), m_end(std::ranges::end(t)) { diff --git a/common/main/d_enumerate.h b/common/main/d_enumerate.h index 53aebc5ea..c6ea4a646 100644 --- a/common/main/d_enumerate.h +++ b/common/main/d_enumerate.h @@ -131,7 +131,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) + requires(ranges::borrowed_range) enumerate(range_type &&t, const index_type i = index_type{}) : base_type(std::forward(t)), m_idx(i) { @@ -151,5 +151,5 @@ template > = true; template ::type *>(nullptr)))> -requires(std::ranges::borrowed_range) +requires(ranges::borrowed_range) enumerate(range_type &&r, index_type start = {/* value ignored for deduction guide */}) -> enumerate())), /* range_sentinel_type = */ decltype(std::ranges::end(std::declval())), index_type>; diff --git a/common/main/d_zip.h b/common/main/d_zip.h index 7731f83b1..0d8198597 100644 --- a/common/main/d_zip.h +++ b/common/main/d_zip.h @@ -345,7 +345,7 @@ public: template requires( sizeof...(rangeN_type) > 0 && - (std::ranges::borrowed_range && ...) + (ranges::borrowed_range && ...) ) constexpr zip(rangeN_type &&... rN) : iterator(std::ranges::begin(rN)...), m_end(d_zip::detail::capture_end_iterators(typename iterator::index_sequence_type(), rN...))