@@ -50,7 +50,7 @@ struct __unwrap_range_impl {
50
50
}
51
51
52
52
_LIBCPP_HIDE_FROM_ABI static constexpr auto __rewrap (const _Iter&, _Iter __iter)
53
- requires (!(random_access_iterator<_Iter> && sized_sentinel_for<_Sent, _Iter>))
53
+ requires(!(random_access_iterator<_Iter> && sized_sentinel_for<_Sent, _Iter>))
54
54
{
55
55
return __iter;
56
56
}
@@ -73,10 +73,7 @@ _LIBCPP_HIDE_FROM_ABI constexpr auto __unwrap_range(_Iter __first, _Sent __last)
73
73
return __unwrap_range_impl<_Iter, _Sent>::__unwrap (std::move (__first), std::move (__last));
74
74
}
75
75
76
- template <
77
- class _Sent ,
78
- class _Iter ,
79
- class _Unwrapped = decltype (std::__unwrap_range(std::declval<_Iter>(), std::declval<_Sent>()))>
76
+ template < class _Sent , class _Iter , class _Unwrapped >
80
77
_LIBCPP_HIDE_FROM_ABI constexpr _Iter __rewrap_range (_Iter __orig_iter, _Unwrapped __iter) {
81
78
return __unwrap_range_impl<_Iter, _Sent>::__rewrap (std::move (__orig_iter), std::move (__iter));
82
79
}
@@ -86,7 +83,7 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR pair<_Unwrapped, _Unwrapped> __unwrap_ra
86
83
return std::make_pair (std::__unwrap_iter (std::move (__first)), std::__unwrap_iter (std::move (__last)));
87
84
}
88
85
89
- template <class _Iter , class _Unwrapped = decltype (std::__unwrap_iter(std::declval<_Iter>())) >
86
+ template <class _Iter , class _Unwrapped >
90
87
_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR _Iter __rewrap_range (_Iter __orig_iter, _Unwrapped __iter) {
91
88
return std::__rewrap_iter (std::move (__orig_iter), std::move (__iter));
92
89
}
0 commit comments