fixup: formatting, namespace, spacing

Author: jensmaurer

source/algorithms.tex

@@ -1214,7 +1214,7 @@
       requires @\libconcept{constructible_from}@<iter_value_t<I>, iter_reference_t<I>>
       constexpr auto fold_left_first(I first, S last, F f);
 
-    template <@\libconcept{input_range}@ R, @\exposconcept{indirectly-binary-left-foldable}@<range_value_t<R>, iterator_t<R>> F>
+    template<@\libconcept{input_range}@ R, @\exposconcept{indirectly-binary-left-foldable}@<range_value_t<R>, iterator_t<R>> F>
       requires @\libconcept{constructible_from}@<range_value_t<R>, range_reference_t<R>>
       constexpr auto fold_left_first(R&& r, F f);
 
@@ -1226,13 +1226,19 @@
       @\exposconcept{indirectly-binary-right-foldable}@<T, iterator_t<R>> F>
       constexpr auto fold_right(R&& r, T init, F f);
 
+<<<<<<< Updated upstream
     template <@\libconcept{bidirectional_iterator}@ I, @\libconcept{sentinel_for}@<I> S,
+      @\exposconcept{indirectly-binary-right-foldable}@<iter_value_t<I>, I> F>
+      requires @\libconcept{constructible_from}@<iter_value_t<I>, iter_reference_t<I>>
+=======
+    template<@\libconcept{bidirectional_iterator}@ I, @\libconcept{sentinel_for}@<I> S,
       indirectly-binary-right-foldable<iter_value_t<I>, I> F>
       requires constructible_from<iter_value_t<I>, iter_reference_t<I>>
+>>>>>>> Stashed changes
     constexpr auto fold_right_last(I first, S last, F f);
 
-    template <@\libconcept{bidirectional_range}@ R,
-              @\exposconcept{indirectly-binary-right-foldable}@<range_value_t<R>, iterator_t<R>> F>
+    template<@\libconcept{bidirectional_range}@ R,
+             @\exposconcept{indirectly-binary-right-foldable}@<range_value_t<R>, iterator_t<R>> F>
       requires @\libconcept{constructible_from}@<range_value_t<R>, range_reference_t<R>>
       constexpr auto fold_right_last(R&& r, F f);
 
@@ -1248,13 +1254,13 @@
     template<@\libconcept{input_range}@ R, class T, @\exposconcept{indirectly-binary-left-foldable}@<T, iterator_t<R>> F>
       constexpr @\seebelow@ fold_left_with_iter(R&& r, T init, F f);
 
-    template <@\libconcept{input_iterator}@ I, @\libconcept{sentinel_for}@<I> S,
-              @\exposconcept{indirectly-binary-left-foldable}@<iter_value_t<I>, I> F>
+    template<@\libconcept{input_iterator}@ I, @\libconcept{sentinel_for}@<I> S,
+             @\exposconcept{indirectly-binary-left-foldable}@<iter_value_t<I>, I> F>
       requires @\libconcept{constructible_from}@<iter_value_t<I>, iter_reference_t<I>>
       constexpr @\seebelow@ fold_left_first_with_iter(I first, S last, F f);
 
-    template <@\libconcept{input_range}@ R,
-              @\exposconcept{indirectly-binary-left-foldable}@<range_value_t<R>, iterator_t<R>> F>
+    template<@\libconcept{input_range}@ R,
+             @\exposconcept{indirectly-binary-left-foldable}@<range_value_t<R>, iterator_t<R>> F>
       requires @\libconcept{constructible_from}@<range_value_t<R>, range_reference_t<R>>
       constexpr @\seebelow@ fold_left_first_with_iter(R&& r, F f);
   }
@@ -4514,7 +4520,7 @@
          @\exposconcept{indirectly-binary-left-foldable}@<iter_value_t<I>, I> F>
   requires @\libconcept{constructible_from}@<iter_value_t<I>, iter_reference_t<I>>
   constexpr auto ranges::fold_left_first(I first, S last, F f);
-template <@\libconcept{input_range}@ R, @\exposconcept{indirectly-binary-left-foldable}@<range_value_t<R>, iterator_t<R>> F>
+template<@\libconcept{input_range}@ R, @\exposconcept{indirectly-binary-left-foldable}@<range_value_t<R>, iterator_t<R>> F>
   requires @\libconcept{constructible_from}@<range_value_t<R>, range_reference_t<R>>
   constexpr auto ranges::fold_left_first(R&& r, F f);
 \end{itemdecl}
@@ -4555,12 +4561,12 @@
 
 \indexlibraryglobal{fold_right_last}%
 \begin{itemdecl}
-template <@\libconcept{bidirectional_iterator}@ I, @\libconcept{sentinel_for}@<I> S,
-          @\exposconcept{indirectly-binary-right-foldable}@<iter_value_t<I>, I> F>
+template<@\libconcept{bidirectional_iterator}@ I, @\libconcept{sentinel_for}@<I> S,
+         @\exposconcept{indirectly-binary-right-foldable}@<iter_value_t<I>, I> F>
   requires @\libconcept{constructible_from}@<iter_value_t<I>, iter_reference_t<I>>
   constexpr auto ranges::fold_right_last(I first, S last, F f);
-template <@\libconcept{bidirectional_range}@ R,
-          @\exposconcept{indirectly-binary-right-foldable}@<range_value_t<R>, iterator_t<R>> F>
+template<@\libconcept{bidirectional_range}@ R,
+         @\exposconcept{indirectly-binary-right-foldable}@<range_value_t<R>, iterator_t<R>> F>
   requires @\libconcept{constructible_from}@<range_value_t<R>, range_reference_t<R>>
   constexpr auto ranges::fold_right_last(R&& r, F f);
 \end{itemdecl}
@@ -4586,9 +4592,9 @@
 \begin{itemdecl}
 template<@\libconcept{input_iterator}@ I, @\libconcept{sentinel_for}@<I> S, class T,
          @\exposconcept{indirectly-binary-left-foldable}@<T, I> F>
-  constexpr @\seebelow@ fold_left_with_iter(I first, S last, T init, F f);
+  constexpr @\seebelow@ ranges::fold_left_with_iter(I first, S last, T init, F f);
 template<@\libconcept{input_range}@ R, class T, @\exposconcept{indirectly-binary-left-foldable}@<T, iterator_t<R>> F>
-  constexpr @\seebelow@ fold_left_with_iter(R&& r, T init, F f);
+  constexpr @\seebelow@ ranges::fold_left_with_iter(R&& r, T init, F f);
 \end{itemdecl}
 
 \begin{itemdescr}
@@ -4620,10 +4626,10 @@
 template<@\libconcept{input_iterator}@ I, @\libconcept{sentinel_for}@<I> S,
          @\exposconcept{indirectly-binary-left-foldable}@<iter_value_t<I>, I> F>
   requires @\libconcept{constructible_from}@<iter_value_t<I>, iter_reference_t<I>>
-  constexpr @\seebelow@ fold_left_first_with_iter(I first, S last, F f)
+  constexpr @\seebelow@ ranges::fold_left_first_with_iter(I first, S last, F f);
 template<@\libconcept{input_range}@ R, @\exposconcept{indirectly-binary-left-foldable}@<range_value_t<R>, iterator_t<R>> F>
   requires @\libconcept{constructible_from}@<range_value_t<R>, range_reference_t<R>>
-  constexpr @\seebelow@ fold_left_first_with_iter(R&& r, F f);
+  constexpr @\seebelow@ ranges::fold_left_first_with_iter(R&& r, F f);
 \end{itemdecl}
 
 \begin{itemdescr}