Clarify which kind of parameter pack is intended. (#2020)

Author: jensmaurer

source/expressions.tex

@@ -939,7 +939,7 @@
 to which is appended one invented type
 \grammarterm{template-parameter} for each occurrence of \tcode{auto} in the
 lambda's \grammarterm{parameter-declaration-clause}, in order of appearance.
-The invented type \grammarterm{template-parameter} is a parameter pack if
+The invented type \grammarterm{template-parameter} is a template parameter pack if
 the corresponding \grammarterm{parameter-declaration} declares a function
 parameter pack\iref{dcl.fct}. The return type and function parameters of the
 function call operator template are derived from the

source/future.tex

@@ -2198,7 +2198,7 @@
 \begin{itemdescr}
 \pnum
 \requires
-\tcode{Fn} and all types in the parameter pack \tcode{ArgTypes} shall be complete types,
+\tcode{Fn} and all types in the template parameter pack \tcode{ArgTypes} shall be complete types,
 \cv{}~\tcode{void}, or arrays of unknown bound.
 
 \pnum

source/templates.tex

@@ -7995,9 +7995,9 @@
 \pnum
 If, after considering the above, function template \tcode{F}
 is at least as specialized as function template \tcode{G} and vice-versa, and
-if \tcode{G} has a trailing parameter pack
+if \tcode{G} has a trailing function parameter pack
 for which \tcode{F} does not have a corresponding parameter, and
-if \tcode{F} does not have a trailing parameter pack,
+if \tcode{F} does not have a trailing function parameter pack,
 then \tcode{F} is more specialized than \tcode{G}.
 
 \pnum

source/utilities.tex

@@ -410,7 +410,7 @@
 
 \pnum
 The library provides a class template that can represent an integer sequence.
-When used as an argument to a function template the parameter pack defining the
+When used as an argument to a function template the template parameter pack defining the
 sequence can be deduced and used in a pack expansion.
 \begin{note}
 The \tcode{index_sequence} alias template is provided for the common case of
@@ -1575,7 +1575,7 @@
 \rSec3[tuple.creation]{Tuple creation functions}
 
 \pnum
-In the function descriptions that follow, the members of a parameter pack \tcode{\placeholder{X}Types}
+In the function descriptions that follow, the members of a template parameter pack \tcode{\placeholder{X}Types}
 are denoted by \tcode{\placeholder{X}}$_i$ for $i$ in \range{0}{sizeof...(\placeholder{X}Types)} in
 order, where indexing is zero-based.
 
@@ -1668,7 +1668,7 @@
 \pnum
 \requires For all $i$, $\tcode{U}_i$ shall be the type
 $\cv_i$ \tcode{tuple<$\tcode{Args}_i$...>}, where $\cv_i$ is the (possibly empty) $i^\text{th}$
-\grammarterm{cv-qualifier-seq} and $\tcode{Args}_i$ is the parameter pack representing the element
+\grammarterm{cv-qualifier-seq} and $\tcode{Args}_i$ is the template parameter pack representing the element
 types in $\tcode{U}_i$. Let $\tcode{A}_{ik}$ be the ${k}^\text{th}$ type in $\tcode{Args}_i$. For all
 $\tcode{A}_{ik}$ the following requirements shall be satisfied:
 \begin{itemize}
@@ -1696,7 +1696,7 @@
 
 \pnum
 \begin{note}
-An implementation may support additional types in the parameter
+An implementation may support additional types in the template parameter
 pack \tcode{Tuples} that support the \tcode{tuple}-like protocol, such as
 \tcode{pair} and \tcode{array}.
 \end{note}
@@ -16019,7 +16019,7 @@
  for a \cv{}~\tcode{void} type \tcode{T},
  \tcode{is_constructible_v<T, Args...>} is \tcode{false},
  otherwise \seebelow                &
- \tcode{T} and all types in the parameter pack \tcode{Args}
+ \tcode{T} and all types in the template parameter pack \tcode{Args}
  shall be complete types, \cv{}~\tcode{void},
  or arrays of unknown bound.  \\ \rowsep
 
@@ -16133,7 +16133,7 @@
   \tcode{Args...>} is \tcode{true} and the variable
   definition for \tcode{is_constructible}, as defined below, is known to call
   no operation that is not trivial~(\ref{basic.types}, \ref{special}). &
-  \tcode{T} and all types in the parameter pack \tcode{Args} shall be complete types,
+  \tcode{T} and all types in the template parameter pack \tcode{Args} shall be complete types,
   \cv{}~\tcode{void}, or arrays of unknown bound. \\ \rowsep
 
 \indexlibrary{\idxcode{is_trivially_default_constructible}}%
@@ -16206,7 +16206,7 @@
  variable definition for \tcode{is_constructible}, as defined below, is known not to
  throw any exceptions\iref{expr.unary.noexcept}.
  &
- \tcode{T} and all types in the parameter pack \tcode{Args}
+ \tcode{T} and all types in the template parameter pack \tcode{Args}
  shall be complete types, \cv{}~\tcode{void},
  or arrays of unknown bound.  \\ \rowsep
 
@@ -16505,7 +16505,7 @@
  \tcode{struct is_invocable;}                      &
  The expression \tcode{\placeholdernc{INVOKE}(declval<Fn>(), declval<ArgTypes>()...)}
  is well-formed when treated as an unevaluated operand                &
- \tcode{Fn} and all types in the parameter pack \tcode{ArgTypes}
+ \tcode{Fn} and all types in the template parameter pack \tcode{ArgTypes}
  shall be complete types, \cv{}~\tcode{void}, or
  arrays of unknown bound.                                             \\ \rowsep
 
@@ -16514,7 +16514,7 @@
  \tcode{struct is_invocable_r;}                      &
  The expression \tcode{\placeholdernc{INVOKE}<R>(declval<Fn>(), declval<ArgTypes>()...)}
  is well-formed when treated as an unevaluated operand                &
- \tcode{Fn}, \tcode{R}, and all types in the parameter pack \tcode{ArgTypes}
+ \tcode{Fn}, \tcode{R}, and all types in the template parameter pack \tcode{ArgTypes}
  shall be complete types, \cv{}~\tcode{void}, or
  arrays of unknown bound.                                             \\ \rowsep
 
@@ -16524,7 +16524,7 @@
  \tcode{is_invocable_v<}\br\tcode{Fn, ArgTypes...>} is \tcode{true} and
  the expression \tcode{\placeholdernc{INVOKE}(declval<Fn>(), declval<ArgTypes>()...)}
  is known not to throw any exceptions                                 &
- \tcode{Fn} and all types in the parameter pack \tcode{ArgTypes}
+ \tcode{Fn} and all types in the template parameter pack \tcode{ArgTypes}
  shall be complete types, \cv{}~\tcode{void}, or
  arrays of unknown bound.                                             \\ \rowsep
 
@@ -16534,7 +16534,7 @@
  \tcode{is_invocable_r_v<}\br\tcode{R, Fn, ArgTypes...>} is \tcode{true} and
  the expression \tcode{\placeholdernc{INVOKE}<R>(declval<Fn>(), declval<ArgTypes>()...)}
  is known not to throw any exceptions                                 &
- \tcode{Fn}, \tcode{R}, and all types in the parameter pack \tcode{ArgTypes}
+ \tcode{Fn}, \tcode{R}, and all types in the template parameter pack \tcode{ArgTypes}
  shall be complete types, \cv{}~\tcode{void}, or
  arrays of unknown bound.                                             \\
 \end{libreqtab3f}
@@ -16861,7 +16861,7 @@
   shall be an integral constant of type \tcode{size_t} whose value is the
   strictest alignment of all types listed in \tcode{Types}.\br
  \requires{} At least one type is provided.
-  Each type in the parameter pack \tcode{Types} shall be a complete object type.
+  Each type in the template parameter pack \tcode{Types} shall be a complete object type.
   \\ \rowsep
 
 \indexlibrary{\idxcode{remove_cvref}}%
@@ -16905,7 +16905,7 @@
  Unless this trait is specialized (as specified in Note B, below),
  the member \tcode{type} shall be defined or omitted as specified in Note A, below.
  If it is omitted, there shall be no member \tcode{type}.
- Each type in the parameter pack \tcode{T} shall be
+ Each type in the template parameter pack \tcode{T} shall be
  complete, \cv{}~\tcode{void}, or an array of unknown bound. \\ \rowsep
 
 \indexlibrary{\idxcode{underlying_type}}%
@@ -16935,7 +16935,7 @@
  functions, and so on. Such side effects are not in the ``immediate
  context'' and can result in the program being ill-formed.
  \end{note} \br
- \requires{} \tcode{Fn} and all types in the parameter pack \tcode{ArgTypes} shall
+ \requires{} \tcode{Fn} and all types in the template parameter pack \tcode{ArgTypes} shall
  be complete types, \cv{}~\tcode{void}, or arrays of
  unknown bound.\\
 \end{libreqtab2a}
@@ -16961,7 +16961,7 @@
 \indexlibrary{\idxcode{common_type}}%
 \pnum
 Note A:
-For the \tcode{common_type} trait applied to a parameter pack \tcode{T} of types,
+For the \tcode{common_type} trait applied to a template parameter pack \tcode{T} of types,
 the member \tcode{type} shall be either defined or not present as follows:
 
 \begin{itemize}