Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[utility.requirements] Dismantle requirements tables #6034

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
102 changes: 51 additions & 51 deletions source/algorithms.tex
Original file line number Diff line number Diff line change
Expand Up @@ -3409,10 +3409,10 @@
\pnum
\expects
\tcode{Function} meets
the \oldconcept{MoveConstructible} requirements (\tref{cpp17.moveconstructible}).
the \oldconcept{MoveConstructible} requirements\iref{utility.req.cpp17.moveconstructible}.
\begin{note}
\tcode{Function} need not meet the requirements of
\oldconcept{CopyConstructible} (\tref{cpp17.copyconstructible}).
\oldconcept{CopyConstructible}\iref{utility.req.cpp17.copyconstructible}.
\end{note}

\pnum
Expand Down Expand Up @@ -4963,7 +4963,7 @@
For the overload with an \tcode{ExecutionPolicy},
there might be a performance cost
if \tcode{iterator_traits<For\-ward\-It\-er\-ator1>::value_type}
is not \oldconcept{\-Move\-Constructible} (\tref{cpp17.moveconstructible}).
is not \oldconcept{\-Move\-Constructible}\iref{utility.req.cpp17.moveconstructible}.
\end{note}

\pnum
Expand Down Expand Up @@ -5758,7 +5758,7 @@
\expects
For the algorithms in namespace \tcode{std},
the type of \tcode{*first}
meets the \oldconcept{MoveAssignable} requirements (\tref{cpp17.moveassignable}).
meets the \oldconcept{MoveAssignable} requirements\iref{utility.req.cpp17.moveassignable}.

\pnum
\effects
Expand Down Expand Up @@ -5866,7 +5866,7 @@
For the overloads with an \tcode{ExecutionPolicy},
there might be a performance cost
if \tcode{iterator_traits<ForwardIterator1>::value_type} does not meet
the \oldconcept{\-Move\-Constructible} (\tref{cpp17.moveconstructible}) requirements.
the \oldconcept{\-Move\-Constructible}\iref{utility.req.cpp17.moveconstructible} requirements.
\end{note}

\pnum
Expand Down Expand Up @@ -5939,7 +5939,7 @@
For the overloads in namespace \tcode{std},
\tcode{pred} is an equivalence relation and
the type of \tcode{*first} meets
the \oldconcept{MoveAssignable} requirements (\tref{cpp17.moveassignable}).
the \oldconcept{MoveAssignable} requirements\iref{utility.req.cpp17.moveassignable}.

\pnum
\effects
Expand Down Expand Up @@ -6045,9 +6045,9 @@
the \oldconcept{ForwardIterator} requirements and
its value type is the same as \tcode{T},
then \tcode{T} meets
the \oldconcept{CopyAssignable} (\tref{cpp17.copyassignable}) requirements.
the \oldconcept{CopyAssignable}\iref{utility.req.cpp17.copyassignable} requirements.
Otherwise, \tcode{T} meets both
the \oldconcept{CopyConstructible} (\tref{cpp17.copyconstructible}) and
the \oldconcept{CopyConstructible}\iref{utility.req.cpp17.copyconstructible} and
\oldconcept{CopyAssignable} requirements.
\begin{note}
For the overloads with an \tcode{ExecutionPolicy},
Expand Down Expand Up @@ -6195,8 +6195,8 @@
\tcode{ForwardIterator} meets
the \oldconcept{ValueSwappable} requirements\iref{swappable.requirements}, and
the type of \tcode{*first} meets
the \oldconcept{MoveConstructible} (\tref{cpp17.moveconstructible}) and
\oldconcept{MoveAssignable} (\tref{cpp17.moveassignable}) requirements.
the \oldconcept{MoveConstructible}\iref{utility.req.cpp17.moveconstructible} and
\oldconcept{MoveAssignable}\iref{utility.req.cpp17.moveassignable} requirements.

\pnum
\effects
Expand Down Expand Up @@ -6693,8 +6693,8 @@
\tcode{RandomAccessIterator} meets
the \oldconcept{Value\-Swappable} requirements\iref{swappable.requirements} and
the type of \tcode{*first} meets
the \oldconcept{MoveConstructible} (\tref{cpp17.moveconstructible}) and
\oldconcept{MoveAssignable} (\tref{cpp17.moveassignable}) requirements.
the \oldconcept{MoveConstructible}\iref{utility.req.cpp17.moveconstructible} and
\oldconcept{MoveAssignable}\iref{utility.req.cpp17.moveassignable} requirements.

\pnum
\effects
Expand Down Expand Up @@ -6751,8 +6751,8 @@
\tcode{RandomAccessIterator} meets
the \oldconcept{Value\-Swappable} requirements\iref{swappable.requirements} and
the type of \tcode{*first} meets
the \oldconcept{MoveConstructible} (\tref{cpp17.moveconstructible}) and
\oldconcept{MoveAssignable} (\tref{cpp17.moveassignable}) requirements.
the \oldconcept{MoveConstructible}\iref{utility.req.cpp17.moveconstructible} and
\oldconcept{MoveAssignable}\iref{utility.req.cpp17.moveassignable} requirements.

\pnum
\effects
Expand Down Expand Up @@ -6821,8 +6821,8 @@
\tcode{RandomAccessIterator} meets
the \oldconcept{ValueSwappable} requirements\iref{swappable.requirements} and
the type of \tcode{*first} meets
the \oldconcept{MoveConstructible} (\tref{cpp17.moveconstructible}) and
\oldconcept{MoveAssignable} (\tref{cpp17.moveassignable}) requirements.
the \oldconcept{MoveConstructible}\iref{utility.req.cpp17.moveconstructible} and
\oldconcept{MoveAssignable}\iref{utility.req.cpp17.moveassignable} requirements.

\pnum
\effects
Expand Down Expand Up @@ -6929,8 +6929,8 @@
\tcode{RandomAccessIterator} meets
the \oldconcept{Value\-Swappable} requirements\iref{swappable.requirements},
the type of \tcode{*result_first} meets
the \oldconcept{MoveConstructible} (\tref{cpp17.moveconstructible}) and
\oldconcept{\-Move\-Assignable} (\tref{cpp17.moveassignable}) requirements.
the \oldconcept{MoveConstructible}\iref{utility.req.cpp17.moveconstructible} and
\oldconcept{\-Move\-Assignable}\iref{utility.req.cpp17.moveassignable} requirements.

\pnum
For iterators \tcode{a1} and \tcode{b1} in \range{first}{last}, and
Expand Down Expand Up @@ -7134,8 +7134,8 @@
\tcode{RandomAccessIterator} meets
the \oldconcept{ValueSwappable} requirements\iref{swappable.requirements}, and
the type of \tcode{*first} meets
the \oldconcept{MoveConstructible} (\tref{cpp17.moveconstructible}) and
\oldconcept{MoveAssignable} (\tref{cpp17.moveassignable}) requirements.
the \oldconcept{MoveConstructible}\iref{utility.req.cpp17.moveconstructible} and
\oldconcept{MoveAssignable}\iref{utility.req.cpp17.moveassignable} requirements.

\pnum
\effects
Expand Down Expand Up @@ -7543,8 +7543,8 @@
\tcode{BidirectionalIterator} meets
the \oldconcept{Value\-Swappable} requirements\iref{swappable.requirements} and
the type of \tcode{*first} meets
the \oldconcept{MoveConstructible} (\tref{cpp17.moveconstructible}) and
\oldconcept{MoveAssignable} (\tref{cpp17.moveassignable}) requirements.
the \oldconcept{MoveConstructible}\iref{utility.req.cpp17.moveconstructible} and
\oldconcept{MoveAssignable}\iref{utility.req.cpp17.moveassignable} requirements.

\pnum
\effects
Expand Down Expand Up @@ -7834,8 +7834,8 @@
\tcode{BidirectionalIterator} meets
the \oldconcept{Value\-Swappable} requirements\iref{swappable.requirements} and
the type of \tcode{*first} meets
the \oldconcept{MoveConstructible} (\tref{cpp17.moveconstructible}) and
\oldconcept{MoveAssignable} (\tref{cpp17.moveassignable}) requirements.
the \oldconcept{MoveConstructible}\iref{utility.req.cpp17.moveconstructible} and
\oldconcept{MoveAssignable}\iref{utility.req.cpp17.moveassignable} requirements.

\pnum
\effects
Expand Down Expand Up @@ -8404,8 +8404,8 @@
\tcode{RandomAccessIterator} meets
the \oldconcept{ValueSwappable} requirements\iref{swappable.requirements} and
the type of \tcode{*first} meets
the \oldconcept{MoveConstructible} requirements (\tref{cpp17.moveconstructible}) and
the \oldconcept{MoveAssignable} requirements (\tref{cpp17.moveassignable}).
the \oldconcept{MoveConstructible} requirements\iref{utility.req.cpp17.moveconstructible} and
the \oldconcept{MoveAssignable} requirements\iref{utility.req.cpp17.moveassignable}.

\pnum
\effects
Expand Down Expand Up @@ -8457,8 +8457,8 @@
\tcode{RandomAccessIterator} meets
the \oldconcept{ValueSwappable} requirements\iref{swappable.requirements} and
the type of \tcode{*first} meets
the \oldconcept{MoveConstructible} (\tref{cpp17.moveconstructible}) and
\oldconcept{MoveAssignable} (\tref{cpp17.moveassignable}) requirements.
the \oldconcept{MoveConstructible}\iref{utility.req.cpp17.moveconstructible} and
\oldconcept{MoveAssignable}\iref{utility.req.cpp17.moveassignable} requirements.

\pnum
\effects
Expand Down Expand Up @@ -8513,8 +8513,8 @@
\tcode{RandomAccessIterator} meets
the \oldconcept{ValueSwap\-pable} requirements\iref{swappable.requirements} and
the type of \tcode{*first} meets
the \oldconcept{MoveConstructible} (\tref{cpp17.moveconstructible}) and
\oldconcept{MoveAssignable} (\tref{cpp17.moveassignable}) requirements.
the \oldconcept{MoveConstructible}\iref{utility.req.cpp17.moveconstructible} and
\oldconcept{MoveAssignable}\iref{utility.req.cpp17.moveassignable} requirements.

\pnum
\effects
Expand Down Expand Up @@ -8566,8 +8566,8 @@
\tcode{RandomAccessIterator} meets
the \oldconcept{ValueSwappable} requirements\iref{swappable.requirements} and
the type of \tcode{*first} meets
the \oldconcept{MoveConst\-ruct\-ible} (\tref{cpp17.moveconstructible}) and
\oldconcept{Move\-Assign\-able} (\tref{cpp17.moveassignable}) requirements.
the \oldconcept{MoveConst\-ruct\-ible}\iref{utility.req.cpp17.moveconstructible} and
\oldconcept{Move\-Assign\-able}\iref{utility.req.cpp17.moveassignable} requirements.

\pnum
\effects
Expand Down Expand Up @@ -8726,7 +8726,7 @@
\pnum
\expects
For the first form, \tcode{T} meets the
\oldconcept{LessThanComparable} requirements (\tref{cpp17.lessthancomparable}).
\oldconcept{LessThanComparable} requirements\iref{utility.req.cpp17.lessthancomparable}.

\pnum
\returns
Expand Down Expand Up @@ -8768,7 +8768,7 @@
For the overloads in namespace \tcode{std},
\tcode{T} meets the \oldconcept{\-Copy\-Constructible} requirements.
For the first form, \tcode{T} meets the \oldconcept{LessThanComparable}
requirements (\tref{cpp17.lessthancomparable}).
requirements\iref{utility.req.cpp17.lessthancomparable}.

\pnum
\returns
Expand Down Expand Up @@ -8804,7 +8804,7 @@
\pnum
\expects
For the first form, \tcode{T} meets the
\oldconcept{LessThanComparable} requirements (\tref{cpp17.lessthancomparable}).
\oldconcept{LessThanComparable} requirements\iref{utility.req.cpp17.lessthancomparable}.

\pnum
\returns
Expand Down Expand Up @@ -8846,7 +8846,7 @@
For the overloads in namespace \tcode{std},
\tcode{T} meets the \oldconcept{\-Copy\-Constructible} requirements.
For the first form, \tcode{T} meets the \oldconcept{LessThanComparable}
requirements (\tref{cpp17.lessthancomparable}).
requirements\iref{utility.req.cpp17.lessthancomparable}.

\pnum
\returns
Expand Down Expand Up @@ -8884,7 +8884,7 @@
\pnum
\expects
For the first form, \tcode{T} meets the
\oldconcept{LessThanComparable} requirements (\tref{cpp17.lessthancomparable}).
\oldconcept{LessThanComparable} requirements\iref{utility.req.cpp17.lessthancomparable}.

\pnum
\returns
Expand Down Expand Up @@ -8927,7 +8927,7 @@
For the overloads in namespace \tcode{std},
\tcode{T} meets the \oldconcept{\-Copy\-Constructible} requirements.
For the first form, type \tcode{T} meets the \oldconcept{LessThanComparable}
requirements (\tref{cpp17.lessthancomparable}).
requirements\iref{utility.req.cpp17.lessthancomparable}.

\pnum
\returns
Expand Down Expand Up @@ -9119,7 +9119,7 @@
\tcode{bool(invoke(comp, invoke(proj, hi), invoke(proj, lo)))} is \tcode{false}.
For the first form, type \tcode{T}
meets the \oldconcept{LessThan\-Comparable}
requirements (\tref{cpp17.lessthancomparable}).
requirements\iref{utility.req.cpp17.lessthancomparable}.

\pnum
\returns
Expand Down Expand Up @@ -9672,8 +9672,8 @@
\pnum
\expects
\tcode{T} meets
the \oldconcept{CopyConstructible} (\tref{cpp17.copyconstructible})
and \oldconcept{CopyAssignable} (\tref{cpp17.copyassignable}) requirements.
the \oldconcept{CopyConstructible}\iref{utility.req.cpp17.copyconstructible}
and \oldconcept{CopyAssignable}\iref{utility.req.cpp17.copyassignable} requirements.
In the range \crange{first}{last},
\tcode{binary_op} neither modifies elements
nor invalidates iterators or subranges.
Expand Down Expand Up @@ -9795,7 +9795,7 @@
\expects
\begin{itemize}
\item
\tcode{T} meets the \oldconcept{MoveConstructible} (\tref{cpp17.moveconstructible}) requirements.
\tcode{T} meets the \oldconcept{MoveConstructible}\iref{utility.req.cpp17.moveconstructible} requirements.
\item
\tcode{binary_op} neither invalidates iterators or subranges,
nor modifies elements in the range \crange{first}{last}.
Expand Down Expand Up @@ -9839,8 +9839,8 @@
\pnum
\expects
\tcode{T} meets
the \oldconcept{CopyConstructible} (\tref{cpp17.copyconstructible})
and \oldconcept{CopyAssignable} (\tref{cpp17.copyassignable}) requirements.
the \oldconcept{CopyConstructible}\iref{utility.req.cpp17.copyconstructible}
and \oldconcept{CopyAssignable}\iref{utility.req.cpp17.copyassignable} requirements.
In the ranges \crange{first1}{last1} and
\crange{first2}{first2 + (last1 - first1)}
\tcode{binary_op1} and \tcode{binary_op2}
Expand Down Expand Up @@ -9935,7 +9935,7 @@
\expects
\begin{itemize}
\item
\tcode{T} meets the \oldconcept{MoveConstructible} (\tref{cpp17.moveconstructible}) requirements.
\tcode{T} meets the \oldconcept{MoveConstructible}\iref{utility.req.cpp17.moveconstructible} requirements.
\item
Neither \tcode{binary_op1} nor \tcode{binary_op2}
invalidates subranges, nor modifies elements in the ranges
Expand Down Expand Up @@ -9985,7 +9985,7 @@
\expects
\begin{itemize}
\item
\tcode{T} meets the \oldconcept{MoveConstructible} (\tref{cpp17.moveconstructible}) requirements.
\tcode{T} meets the \oldconcept{MoveConstructible}\iref{utility.req.cpp17.moveconstructible} requirements.
\item
Neither \tcode{unary_op} nor \tcode{binary_op} invalidates subranges,
nor modifies elements in the range \crange{first}{last}.
Expand Down Expand Up @@ -10134,7 +10134,7 @@
\expects
\begin{itemize}
\item
\tcode{T} meets the \oldconcept{MoveConstructible} (\tref{cpp17.moveconstructible}) requirements.
\tcode{T} meets the \oldconcept{MoveConstructible}\iref{utility.req.cpp17.moveconstructible} requirements.
\item
\tcode{binary_op} neither invalidates iterators or subranges,
nor modifies elements in
Expand Down Expand Up @@ -10255,7 +10255,7 @@
\begin{itemize}
\item
If \tcode{init} is provided,
\tcode{T} meets the \oldconcept{MoveConstructible} (\tref{cpp17.moveconstructible}) requirements;
\tcode{T} meets the \oldconcept{MoveConstructible}\iref{utility.req.cpp17.moveconstructible} requirements;
otherwise, \tcode{U}
meets the \oldconcept{MoveConstructible} requirements.
\item
Expand Down Expand Up @@ -10334,7 +10334,7 @@
\expects
\begin{itemize}
\item
\tcode{T} meets the \oldconcept{MoveConstructible} (\tref{cpp17.moveconstructible}) requirements.
\tcode{T} meets the \oldconcept{MoveConstructible}\iref{utility.req.cpp17.moveconstructible} requirements.
\item
Neither \tcode{unary_op} nor \tcode{binary_op}
invalidates iterators or subranges, nor modifies elements in
Expand Down Expand Up @@ -10433,7 +10433,7 @@
\begin{itemize}
\item
If \tcode{init} is provided, \tcode{T} meets the
\oldconcept{MoveConstructible} (\tref{cpp17.moveconstructible}) requirements;
\oldconcept{MoveConstructible}\iref{utility.req.cpp17.moveconstructible} requirements;
otherwise, \tcode{U} meets the
\oldconcept{MoveConstructible} requirements.
\item
Expand Down Expand Up @@ -10534,7 +10534,7 @@
\begin{itemize}
\item
For the overloads with no \tcode{ExecutionPolicy},
\tcode{T} meets the \oldconcept{MoveAssignable} (\tref{cpp17.moveassignable})
\tcode{T} meets the \oldconcept{MoveAssignable}\iref{utility.req.cpp17.moveassignable}
requirements.
\item
For all overloads, in the ranges \crange{first}{last}
Expand Down
2 changes: 1 addition & 1 deletion source/concepts.tex
Original file line number Diff line number Diff line change
Expand Up @@ -754,7 +754,7 @@
\begin{itemdescr}
\pnum
\begin{note}
Unlike the \oldconcept{Destructible} requirements~(\tref{cpp17.destructible}), this
Unlike the \oldconcept{Destructible} requirements\iref{utility.req.cpp17.destructible}, this
concept forbids destructors that are potentially throwing, even if a particular
invocation of the destructor does not actually throw.
\end{note}
Expand Down
8 changes: 4 additions & 4 deletions source/future.tex
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@
\begin{itemdescr}
\pnum
\expects
\tcode{T} meets the \oldconcept{EqualityComparable} requirements (\tref{cpp17.equalitycomparable}).
\tcode{T} meets the \oldconcept{EqualityComparable} requirements\iref{cpp17.equalitycomparable}.

\pnum
\returns
Expand All @@ -307,7 +307,7 @@
\begin{itemdescr}
\pnum
\expects
\tcode{T} meets the \oldconcept{LessThanComparable} requirements (\tref{cpp17.lessthancomparable}).
\tcode{T} meets the \oldconcept{LessThanComparable} requirements \iref{cpp17.lessthancomparable}.

\pnum
\returns
Expand All @@ -322,7 +322,7 @@
\begin{itemdescr}
\pnum
\expects
\tcode{T} meets the \oldconcept{LessThanComparable} requirements (\tref{cpp17.lessthancomparable}).
\tcode{T} meets the \oldconcept{LessThanComparable} requirements \iref{cpp17.lessthancomparable}.

\pnum
\returns
Expand All @@ -337,7 +337,7 @@
\begin{itemdescr}
\pnum
\expects
\tcode{T} meets the \oldconcept{LessThanComparable} requirements (\tref{cpp17.lessthancomparable}).
\tcode{T} meets the \oldconcept{LessThanComparable} requirements\iref{cpp17.lessthancomparable}.

\pnum
\returns
Expand Down
Loading
Loading