LWG3664 LWG 3392 broke std::ranges::distance(a, a+3)

Author: burblebee

source/iterators.tex

@@ -243,11 +243,11 @@
                                              S bound);
 
     // \ref{range.iter.op.distance}, \tcode{ranges::distance}
-    template<@\libconcept{input_or_output_iterator}@ I, @\libconcept{sentinel_for}@<I> S>
+    template<class I, @\libconcept{sentinel_for}@<I> S>
       requires (!@\libconcept{sized_sentinel_for}@<S, I>)
       constexpr iter_difference_t<I> distance(I first, S last);                     // freestanding
-    template<@\libconcept{input_or_output_iterator}@ I, @\libconcept{sized_sentinel_for}@<I> S>
-      constexpr iter_difference_t<I> distance(const I& first, const S& last);       // freestanding
+    template<class I, @\libconcept{sized_sentinel_for}@<decay_t<I>> S>
+      constexpr iter_difference_t<decay_t<I>> distance(I&& first, S last);          // freestanding
     template<@\libconcept{range}@ R>
       constexpr range_difference_t<R> distance(R&& r);                              // freestanding
 
@@ -3028,7 +3028,7 @@
 \rSec3[range.iter.op.distance]{\tcode{ranges::distance}}
 \indexlibraryglobal{distance}%
 \begin{itemdecl}
-template<@\libconcept{input_or_output_iterator}@ I, @\libconcept{sentinel_for}@<I> S>
+template<class I, @\libconcept{sentinel_for}@<I> S>
   requires (!@\libconcept{sized_sentinel_for}@<S, I>)
   constexpr iter_difference_t<I> ranges::distance(I first, S last);
 \end{itemdecl}
@@ -3046,14 +3046,14 @@
 
 \indexlibraryglobal{distance}%
 \begin{itemdecl}
-template<@\libconcept{input_or_output_iterator}@ I, @\libconcept{sized_sentinel_for}@<I> S>
-  constexpr iter_difference_t<I> ranges::distance(const I& first, const S& last);
+template<class I, @\libconcept{sized_sentinel_for}@<decay_t<I>> S>
+  constexpr iter_difference_t<decay_t<I>> ranges::distance(I&& first, S last);
 \end{itemdecl}
 
 \begin{itemdescr}
 \pnum
 \effects
-Equivalent to: \tcode{return last - first;}
+Equivalent to: \tcode{return last - static_cast<const decay_t<I>\&>(first);}
 \end{itemdescr}
 
 \indexlibraryglobal{distance}%