Skip to content

Commit

Permalink
Library-wide: Use "meet" for non-concept type requirements
Browse files Browse the repository at this point in the history
...instead of "satisfy".

Partially addresses #1263.
  • Loading branch information
CaseyCarter committed Jun 14, 2019
1 parent b50067f commit 4cfa525
Show file tree
Hide file tree
Showing 14 changed files with 228 additions and 228 deletions.
50 changes: 25 additions & 25 deletions source/algorithms.tex
Original file line number Diff line number Diff line change
Expand Up @@ -72,43 +72,43 @@
\tcode{InputIterator},
\tcode{InputIterator1}, or
\tcode{Input\-Iterator2},
the template argument shall satisfy the
the template argument shall meet the
\oldconcept{InputIterator} requirements\iref{input.iterators}.
\item
If an algorithm's template parameter is named
\tcode{OutputIterator},
\tcode{OutputIterator1}, or
\tcode{Output\-Iterator2},
the template argument shall satisfy the
the template argument shall meet the
\oldconcept{OutputIterator} requirements\iref{output.iterators}.
\item
If an algorithm's template parameter is named
\tcode{ForwardIterator},
\tcode{ForwardIterator1}, or
\tcode{Forward\-Iterator2},
the template argument shall satisfy the
the template argument shall meet the
\oldconcept{ForwardIterator} requirements\iref{forward.iterators}.
\item
If an algorithm's template parameter is named
\tcode{BidirectionalIterator},
\tcode{Bidirectional\-Iterator1}, or
\tcode{BidirectionalIterator2},
the template argument shall satisfy the
the template argument shall meet the
\oldconcept{BidirectionalIterator} requirements\iref{bidirectional.iterators}.
\item
If an algorithm's template parameter is named
\tcode{RandomAccessIterator},
\tcode{Random\-AccessIterator1}, or
\tcode{RandomAccessIterator2},
the template argument shall satisfy the
the template argument shall meet the
\oldconcept{RandomAccessIterator} requirements\iref{random.access.iterators}.
\end{itemize}

\pnum
If an algorithm's \effects element specifies
that a value pointed to by any iterator passed as an argument is modified,
then that algorithm has an additional type requirement:
The type of that argument shall satisfy
The type of that argument shall meet
the requirements of a mutable iterator\iref{iterator.requirements}.
\begin{note}
This requirement does not affect arguments that are named
Expand Down Expand Up @@ -3000,7 +3000,7 @@
\begin{itemdescr}
\pnum
\requires
\tcode{Function} shall satisfy
\tcode{Function} shall meet
the \oldconcept{MoveConstructible} requirements (\tref{cpp17.moveconstructible}).
\begin{note}
\tcode{Function} need not meet the requirements of
Expand All @@ -3013,7 +3013,7 @@
every iterator in the range \range{first}{last},
starting from \tcode{first} and proceeding to \tcode{last - 1}.
\begin{note}
If the type of \tcode{first} satisfies the requirements of a mutable iterator,
If the type of \tcode{first} meets the requirements of a mutable iterator,
\tcode{f} may apply non-constant functions through the dereferenced iterator.
\end{note}

Expand Down Expand Up @@ -3041,14 +3041,14 @@
\begin{itemdescr}
\pnum
\requires
\tcode{Function} shall satisfy the \oldconcept{CopyConstructible} requirements.
\tcode{Function} shall meet the \oldconcept{CopyConstructible} requirements.

\pnum
\effects
Applies \tcode{f} to the result of dereferencing
every iterator in the range \range{first}{last}.
\begin{note}
If the type of \tcode{first} satisfies the requirements of a mutable iterator,
If the type of \tcode{first} meets the requirements of a mutable iterator,
\tcode{f} may apply non-constant functions through the dereferenced iterator.
\end{note}

Expand Down Expand Up @@ -3121,7 +3121,7 @@
\begin{itemdescr}
\pnum
\requires
\tcode{Function} shall satisfy the \oldconcept{MoveConstructible} requirements
\tcode{Function} shall meet the \oldconcept{MoveConstructible} requirements
\begin{note}
\tcode{Function} need not meet
the requirements of \oldconcept{CopyConstructible}.
Expand All @@ -3136,7 +3136,7 @@
Applies \tcode{f} to the result of dereferencing
every iterator in the range \range{first}{first + n} in order.
\begin{note}
If the type of \tcode{first} satisfies the requirements of a mutable iterator,
If the type of \tcode{first} meets the requirements of a mutable iterator,
\tcode{f} may apply non-constant functions through the dereferenced iterator.
\end{note}

Expand All @@ -3159,7 +3159,7 @@
\begin{itemdescr}
\pnum
\requires
\tcode{Function} shall satisfy the \oldconcept{CopyConstructible} requirements.
\tcode{Function} shall meet the \oldconcept{CopyConstructible} requirements.

\pnum
\requires
Expand All @@ -3170,7 +3170,7 @@
Applies \tcode{f} to the result of dereferencing
every iterator in the range \range{first}{first + n}.
\begin{note}
If the type of \tcode{first} satisfies the requirements of a mutable iterator,
If the type of \tcode{first} meets the requirements of a mutable iterator,
\tcode{f} may apply non-constant functions through the dereferenced iterator.
\end{note}

Expand Down Expand Up @@ -5534,23 +5534,23 @@
\requires
\begin{itemize}
\item
\tcode{PopulationIterator} shall satisfy
\tcode{PopulationIterator} shall meet
the \oldconcept{InputIterator} requirements\iref{input.iterators}.
\item
\tcode{SampleIterator} shall satisfy
\tcode{SampleIterator} shall meet
the \oldconcept{OutputIterator} requirements\iref{output.iterators}.
\item
\tcode{SampleIterator} shall satisfy
\tcode{SampleIterator} shall meet
the \oldconcept{RandomAccessIterator} requirements\iref{random.access.iterators}
unless \tcode{Pop\-ulat\-ion\-Iter\-ator} satisfies
unless \tcode{Pop\-ulat\-ion\-Iter\-ator} meets
the \oldconcept{ForwardIterator} requirements\iref{forward.iterators}.
\item
\tcode{PopulationIterator}'s value type shall be
writable\iref{iterator.requirements.general} to \tcode{out}.
\item
\tcode{Distance} shall be an integer type.
\item
\tcode{remove_reference_t<UniformRandomBitGenerator>} shall satisfy
\tcode{remove_reference_t<UniformRandomBitGenerator>} shall meet
the requirements of a uniform random bit generator type\iref{rand.req.urng}.
\item
\tcode{out} shall not be in the range \range{first}{last}.
Expand Down Expand Up @@ -5578,7 +5578,7 @@
\remarks
\begin{itemize}
\item
Stable if and only if \tcode{PopulationIterator} satisfies
Stable if and only if \tcode{PopulationIterator} meets
the \oldconcept{ForwardIterator} requirements.
\item
To the extent that the implementation of this function makes use
Expand Down Expand Up @@ -5657,7 +5657,7 @@
\begin{itemdescr}
\pnum
\requires
The type of \tcode{*first} shall satisfy
The type of \tcode{*first} shall meet
the \oldconcept{MoveAssignable} requirements.

\pnum
Expand Down Expand Up @@ -5696,7 +5696,7 @@
\begin{itemdescr}
\pnum
\requires
The type of \tcode{*first} shall satisfy
The type of \tcode{*first} shall meet
the \oldconcept{MoveAssignable} requirements.
\tcode{ForwardIterator} shall meet
the \oldconcept{BidirectionalIterator} requirements\iref{bidirectional.iterators} or
Expand All @@ -5708,7 +5708,7 @@
Otherwise, moves the element
from position \tcode{first + i} into \tcode{position first + n + i}
for each non-negative integer \tcode{i < (last - first) - n}.
In the first overload case, if \tcode{ForwardIterator} satisfies
In the first overload case, if \tcode{ForwardIterator} meets
the \oldconcept{BidirectionalIterator} requirements,
does so in order starting
from \tcode{i = (last - first) - n - 1} and proceeding to \tcode{i = 0}.
Expand Down Expand Up @@ -8803,7 +8803,7 @@
\begin{itemdescr}
\pnum
\requires
\tcode{T} shall satisfy
\tcode{T} shall meet
the \oldconcept{CopyConstructible} (\tref{cpp17.copyconstructible})
and \oldconcept{CopyAssignable} (\tref{cpp17.copyassignable}) requirements.
In the range \crange{first}{last},
Expand Down Expand Up @@ -8954,7 +8954,7 @@
\begin{itemdescr}
\pnum
\requires
\tcode{T} shall satisfy
\tcode{T} shall meet
the \oldconcept{CopyConstructible} (\tref{cpp17.copyconstructible})
and \oldconcept{CopyAssignable} (\tref{cpp17.copyassignable}) requirements.
In the ranges \crange{first1}{last1} and
Expand Down

0 comments on commit 4cfa525

Please sign in to comment.