[range.cartesian] Replace "tuple-or-pair" with "tuple".

These changes are part of LWG-Motion 12 (P2165R4, "Compatibility
between tuple and tuple-like objects").

Author: tkoeppe

source/ranges.tex

@@ -13871,9 +13871,9 @@
   public:
     using iterator_category = input_iterator_tag;
     using iterator_concept  = @\seebelow@;
-    using value_type = @\exposid{tuple-or-pair}@<range_value_t<@\exposid{maybe-const}@<Const, First>>,
+    using value_type = tuple<range_value_t<@\exposid{maybe-const}@<Const, First>>,
       range_value_t<@\exposid{maybe-const}@<Const, Vs>>...>;
-    using reference = @\exposid{tuple-or-pair}@<reference_t<@\exposid{maybe-const}@<Const, First>>,
+    using reference = tuple<reference_t<@\exposid{maybe-const}@<Const, First>>,
       reference_t<@\exposid{maybe-const}@<Const, Vs>>...>;
     using difference_type = @\seebelow@;
 
@@ -13931,7 +13931,7 @@
 
   private:
     @\exposid{maybe-const}@<Const, cartesian_product_view>* @\exposid{parent_}@ = nullptr;      // \expos
-    @\exposid{tuple-or-pair}@<iterator_t<@\exposid{maybe-const}@<Const, First>>,
+    tuple<iterator_t<@\exposid{maybe-const}@<Const, First>>,
       iterator_t<@\exposid{maybe-const}@<Const, Vs>>...> @\exposid{current_}@;                  // \expos
 
     template<size_t N = sizeof...(Vs)>
@@ -13943,7 +13943,7 @@
     template<class Tuple>
       constexpr difference_type @\exposid{distance-from}@(Tuple t);                 // \expos
 
-    constexpr explicit @\exposid{iterator}@(@\exposid{tuple-or-pair}@<iterator_t<@\exposid{maybe-const}@<Const, First>>,
+    constexpr explicit @\exposid{iterator}@(tuple<iterator_t<@\exposid{maybe-const}@<Const, First>>,
       iterator_t<@\exposid{maybe-const}@<Const, Vs>>...> current);                  // \expos
   };
 }
@@ -14057,7 +14057,7 @@
 \end{itemdescr}
 
 \begin{itemdecl}
-constexpr explicit @\exposid{iterator}@(@\exposid{tuple-or-pair}@<iterator_t<maybe-const<Const, First>>,
+constexpr explicit @\exposid{iterator}@(tuple<iterator_t<maybe-const<Const, First>>,
   iterator_t<maybe-const<Const, Vs>>...> current);
 \end{itemdecl}