Inspect unwrapped iterators by _Prefer_iterator_copies (#4775)

microsoft · Jul 5, 2024 · d09326a · d09326a
1 parent 9b63e8c
commit d09326a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/stl/inc/algorithm b/stl/inc/algorithm
@@ -10274,7 +10274,7 @@ namespace ranges {
  auto _ULast = _RANGES _Uend(_Range);
  _STL_ASSERT(
  _UFirst != _ULast, "A range passed to std::ranges::minmax must not be empty. (N4971 [alg.min.max]/21)");
- if constexpr (forward_range<_Rng> && _Prefer_iterator_copies<iterator_t<_Rng>>) {
+ if constexpr (forward_range<_Rng> && _Prefer_iterator_copies<decltype(_UFirst)>) {
  return _Minmax_fwd_unchecked(
  _STD move(_UFirst), _STD move(_ULast), _STD _Pass_fn(_Pred), _STD _Pass_fn(_Proj));
  } else {

diff --git a/stl/inc/xutility b/stl/inc/xutility
@@ -7005,7 +7005,7 @@ namespace ranges {
  }
  }
 #endif // _USE_STD_VECTOR_ALGORITHMS
- if constexpr (forward_range<_Rng> && _Prefer_iterator_copies<iterator_t<_Rng>>) {
+ if constexpr (forward_range<_Rng> && _Prefer_iterator_copies<decltype(_UFirst)>) {
  return static_cast<range_value_t<_Rng>>(*_RANGES _Max_element_unchecked(
  _STD move(_UFirst), _STD move(_ULast), _STD _Pass_fn(_Pred), _STD _Pass_fn(_Proj)));
  } else {
@@ -7223,7 +7223,7 @@ namespace ranges {
  }
  }
 #endif // _USE_STD_VECTOR_ALGORITHMS
- if constexpr (forward_range<_Rng> && _Prefer_iterator_copies<iterator_t<_Rng>>) {
+ if constexpr (forward_range<_Rng> && _Prefer_iterator_copies<decltype(_UFirst)>) {
  return static_cast<range_value_t<_Rng>>(*_RANGES _Min_element_unchecked(
  _STD move(_UFirst), _STD move(_ULast), _STD _Pass_fn(_Pred), _STD _Pass_fn(_Proj)));
  } else {