Skip to content

Commit dbeb68f

Browse files
jensmaurertkoeppe
authored andcommitted
[lib] Use "shall satisfy", not "shall meet", for requirements.
1 parent f50e985 commit dbeb68f

File tree

9 files changed

+61
-61
lines changed

9 files changed

+61
-61
lines changed

source/algorithms.tex

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1627,7 +1627,7 @@
16271627

16281628
\begin{itemdescr}
16291629
\pnum
1630-
\requires \tcode{Function} shall meet the requirements of
1630+
\requires \tcode{Function} shall satisfy the requirements of
16311631
\tcode{MoveConstructible} (Table~\ref{tab:moveconstructible}).
16321632
\begin{note} \tcode{Function} need not meet the requirements of
16331633
\tcode{CopyConstructible} (Table~\ref{tab:copyconstructible}). \end{note}
@@ -1672,7 +1672,7 @@
16721672
\begin{itemdescr}
16731673
\pnum
16741674
\requires
1675-
\tcode{Function} shall meet the requirements of \tcode{CopyConstructible}.
1675+
\tcode{Function} shall satisfy the requirements of \tcode{CopyConstructible}.
16761676

16771677
\pnum
16781678
\effects
@@ -1710,7 +1710,7 @@
17101710
\begin{itemdescr}
17111711
\pnum
17121712
\requires
1713-
\tcode{Function} shall meet the requirements of \tcode{MoveConstructible}
1713+
\tcode{Function} shall satisfy the requirements of \tcode{MoveConstructible}
17141714
\begin{note} \tcode{Function} need not meet the requirements of
17151715
\tcode{CopyConstructible}. \end{note}
17161716

@@ -1746,7 +1746,7 @@
17461746
\begin{itemdescr}
17471747
\pnum
17481748
\requires
1749-
\tcode{Function} shall meet the requirements of \tcode{CopyConstructible}.
1749+
\tcode{Function} shall satisfy the requirements of \tcode{CopyConstructible}.
17501750

17511751
\pnum
17521752
\requires
@@ -3450,7 +3450,7 @@
34503450
\tcode{Distance} shall be an integer type.
34513451
\item
34523452
\tcode{remove_reference_t<UniformRandomBitGenerator>}
3453-
shall meet the requirements of a uniform random bit generator type\iref{rand.req.urng}
3453+
shall satisfy the requirements of a uniform random bit generator type\iref{rand.req.urng}
34543454
whose return type is convertible to \tcode{Distance}.
34553455
\item
34563456
\tcode{out} shall not be in the range \range{first}{last}.
@@ -3504,7 +3504,7 @@
35043504
\tcode{ValueSwappable}\iref{swappable.requirements}.
35053505
The type
35063506
\tcode{remove_reference_t<UniformRandomBitGenerator>}
3507-
shall meet the requirements of a
3507+
shall satisfy the requirements of a
35083508
uniform random bit generator\iref{rand.req.urng} type whose return type is
35093509
convertible to
35103510
\tcode{iterator_traits<Random\-Access\-Itera\-tor>::difference_type}.

source/containers.tex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4197,7 +4197,7 @@
41974197
In this subclause,
41984198
arguments for a template parameter
41994199
named \tcode{Predicate} or \tcode{BinaryPredicate}
4200-
shall meet the corresponding requirements in \ref{algorithms.requirements}.
4200+
shall satisfy the corresponding requirements in \ref{algorithms.requirements}.
42014201
For \tcode{merge} and \tcode{sort},
42024202
the definitions and requirements in \ref{alg.sorting} apply.
42034203

@@ -4776,7 +4776,7 @@
47764776
In this subclause,
47774777
arguments for a template parameter
47784778
named \tcode{Predicate} or \tcode{BinaryPredicate}
4779-
shall meet the corresponding requirements in \ref{algorithms.requirements}.
4779+
shall satisfy the corresponding requirements in \ref{algorithms.requirements}.
47804780
For \tcode{merge} and \tcode{sort},
47814781
the definitions and requirements in \ref{alg.sorting} apply.
47824782

source/future.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3015,7 +3015,7 @@
30153015
described by the class \tcode{Tr}, to and from a byte stream buffer of type
30163016
\tcode{streambuf}. Conversion between a sequence of \tcode{Elem} values and
30173017
multibyte sequences is performed by an object of class
3018-
\tcode{Codecvt}, which shall meet the requirements
3018+
\tcode{Codecvt}, which shall satisfy the requirements
30193019
of the standard code-conversion facet \tcode{codecvt<Elem, char, mbstate_t>}.
30203020

30213021
\pnum

source/iostreams.tex

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10418,7 +10418,7 @@
1041810418
\end{codeblock}
1041910419

1042010420
\pnum
10421-
\tcode{Allocator} shall meet the allocator requirements\iref{allocator.requirements}.
10421+
\tcode{Allocator} shall satisfy the allocator requirements\iref{allocator.requirements}.
1042210422

1042310423
\pnum
1042410424
\begin{example}
@@ -10748,7 +10748,7 @@
1074810748
unless \tcode{EcharT} is one of the encoded character types.
1074910749

1075010750
\pnum
10751-
Template parameters named \tcode{InputIterator} shall meet the
10751+
Template parameters named \tcode{InputIterator} shall satisfy the
1075210752
input iterator requirements\iref{input.iterators} and shall
1075310753
have a value type that is one of the encoded character types.
1075410754

@@ -10760,7 +10760,7 @@
1076010760
they are not included as permitted types. \end{note}
1076110761

1076210762
\pnum
10763-
Template parameters named \tcode{Allocator} shall meet the
10763+
Template parameters named \tcode{Allocator} shall satisfy the
1076410764
Allocator requirements\iref{allocator.requirements}.
1076510765

1076610766
\rSec3[fs.req.namespace]{Namespaces and headers}

source/iterators.tex

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1262,12 +1262,12 @@
12621262
\pnum
12631263
The template parameter
12641264
\tcode{Iterator}
1265-
shall meet all the requirements of a Bidirectional Iterator\iref{bidirectional.iterators}.
1265+
shall satisfy all the requirements of a Bidirectional Iterator\iref{bidirectional.iterators}.
12661266

12671267
\pnum
12681268
Additionally,
12691269
\tcode{Iterator}
1270-
shall meet the requirements of a random access iterator\iref{random.access.iterators}
1270+
shall satisfy the requirements of a random access iterator\iref{random.access.iterators}
12711271
if any of the members
12721272
\tcode{operator+},
12731273
\tcode{operator-},
@@ -2148,10 +2148,10 @@
21482148
\rSec3[move.iter.requirements]{\tcode{move_iterator} requirements}
21492149

21502150
\pnum
2151-
The template parameter \tcode{Iterator} shall meet
2151+
The template parameter \tcode{Iterator} shall satisfy
21522152
the requirements of an input iterator\iref{input.iterators}.
21532153
Additionally, if any of the bidirectional or random access traversal
2154-
functions are instantiated, the template parameter shall meet the
2154+
functions are instantiated, the template parameter shall satisfy the
21552155
requirements for a Bidirectional Iterator\iref{bidirectional.iterators}
21562156
or a Random Access Iterator\iref{random.access.iterators}, respectively.
21572157

@@ -2549,7 +2549,7 @@
25492549
The behavior of a program that applies \tcode{operator++()} to an end-of-stream
25502550
iterator is undefined.
25512551
It is impossible to store things into istream iterators.
2552-
The type \tcode{T} shall meet the \tcode{DefaultConstructible},
2552+
The type \tcode{T} shall satisfy the \tcode{DefaultConstructible},
25532553
\tcode{CopyConstructible}, and \tcode{CopyAssignable} requirements.
25542554

25552555
\pnum

source/numerics.tex

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2054,7 +2054,7 @@
20542054
\end{libreqtab4d}
20552055

20562056
\pnum
2057-
\tcode{E} shall meet the requirements
2057+
\tcode{E} shall satisfy the requirements
20582058
of \tcode{CopyConstructible} (Table~\ref{tab:copyconstructible})
20592059
and \tcode{CopyAssignable} (Table~\ref{tab:copyassignable}) types.
20602060
These operations shall each be of complexity
@@ -4017,7 +4017,7 @@
40174017

40184018
\begin{itemdescr}
40194019
\pnum\requires \tcode{RandomAccessIterator}
4020-
shall meet the requirements of a mutable random access iterator\iref{random.access.iterators}.
4020+
shall satisfy the requirements of a mutable random access iterator\iref{random.access.iterators}.
40214021
Moreover,
40224022
\tcode{iterator_traits<RandomAccessIterator>::value_type}
40234023
shall denote an unsigned integer type
@@ -8790,7 +8790,7 @@
87908790
\begin{itemdescr}
87918791
\pnum
87928792
\requires
8793-
\tcode{T} shall meet the requirements of \tcode{CopyConstructible} (Table~\ref{tab:copyconstructible})
8793+
\tcode{T} shall satisfy the requirements of \tcode{CopyConstructible} (Table~\ref{tab:copyconstructible})
87948794
and \tcode{CopyAssignable} (Table~\ref{tab:copyassignable}) types.
87958795
In the range
87968796
\crange{first}{last},
@@ -8940,7 +8940,7 @@
89408940
\begin{itemdescr}
89418941
\pnum
89428942
\requires
8943-
\tcode{T} shall meet the requirements of \tcode{CopyConstructible} (Table~\ref{tab:copyconstructible})
8943+
\tcode{T} shall satisfy the requirements of \tcode{CopyConstructible} (Table~\ref{tab:copyconstructible})
89448944
and \tcode{CopyAssignable} (Table~\ref{tab:copyassignable}) types.
89458945
In the ranges
89468946
\crange{first1}{last1}

source/strings.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@
275275
\pnum
276276
\requires
277277
\tcode{state_type}
278-
shall meet the requirements of
278+
shall satisfy the requirements of
279279
\tcode{CopyAssignable} (Table~\ref{tab:copyassignable}),
280280
\tcode{CopyConstructible} (Table~\ref{tab:copyconstructible}), and
281281
\tcode{DefaultConstructible} (Table~\ref{tab:defaultconstructible}) types.

source/threads.tex

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132
\term{native resolution}.
133133

134134
\pnum
135-
Implementation-provided clocks that are used for these functions shall meet the
135+
Implementation-provided clocks that are used for these functions shall satisfy the
136136
\tcode{TrivialClock} requirements\iref{time.clock.req}.
137137

138138
\pnum
@@ -891,11 +891,11 @@
891891
The \defn{mutex types} are the standard library types \tcode{mutex},
892892
\tcode{recursive_mutex}, \tcode{timed_mutex}, \tcode{recursive_timed_mutex},
893893
\tcode{shared_mutex}, and \tcode{shared_timed_mutex}.
894-
They shall meet the requirements set out in this subclause. In this description, \tcode{m}
894+
They shall satisfy the requirements set out in this subclause. In this description, \tcode{m}
895895
denotes an object of a mutex type.
896896

897897
\pnum
898-
The mutex types shall meet the \tcode{Lockable} requirements\iref{thread.req.lockable.req}.
898+
The mutex types shall satisfy the \tcode{Lockable} requirements\iref{thread.req.lockable.req}.
899899

900900
\pnum
901901
The mutex types shall be \tcode{DefaultConstructible} and \tcode{Destructible}. If
@@ -1141,7 +1141,7 @@
11411141
instantiation of \tcode{time_point}\iref{time.point}.
11421142

11431143
\pnum
1144-
The timed mutex types shall meet the \tcode{TimedLockable}
1144+
The timed mutex types shall satisfy the \tcode{TimedLockable}
11451145
requirements\iref{thread.req.lockable.timed}.
11461146

11471147
\pnum
@@ -1330,9 +1330,9 @@
13301330

13311331
\pnum
13321332
The standard library types \tcode{shared_mutex} and \tcode{shared_timed_mutex}
1333-
are \defn{shared mutex types}. Shared mutex types shall meet the requirements of
1333+
are \defn{shared mutex types}. Shared mutex types shall satisfy the requirements of
13341334
mutex types\iref{thread.mutex.requirements.mutex}, and additionally
1335-
shall meet the requirements set out below. In this description,
1335+
shall satisfy the requirements set out below. In this description,
13361336
\tcode{m} denotes an object of a shared mutex type.
13371337

13381338
\pnum
@@ -1484,10 +1484,10 @@
14841484

14851485
\pnum
14861486
The standard library type \tcode{shared_timed_mutex} is a
1487-
\defn{shared timed mutex type}. Shared timed mutex types shall meet the requirements of
1487+
\defn{shared timed mutex type}. Shared timed mutex types shall satisfy the requirements of
14881488
timed mutex types\iref{thread.timedmutex.requirements},
14891489
shared mutex types\iref{thread.sharedmutex.requirements}, and additionally
1490-
shall meet the requirements set out below. In this description,
1490+
shall satisfy the requirements set out below. In this description,
14911491
\tcode{m} denotes an object of a shared timed mutex type,
14921492
\tcode{rel_type} denotes an object of an instantiation of
14931493
\tcode{duration}\iref{time.duration}, and
@@ -1681,7 +1681,7 @@
16811681
object throughout the \tcode{lock_guard} object's lifetime\iref{basic.life}.
16821682
The behavior of a program is undefined if the lockable object referenced by
16831683
\tcode{pm} does not exist for the entire lifetime of the \tcode{lock_guard}
1684-
object. The supplied \tcode{Mutex} type shall meet the \tcode{BasicLockable}
1684+
object. The supplied \tcode{Mutex} type shall satisfy the \tcode{BasicLockable}
16851685
requirements\iref{thread.req.lockable.basic}.
16861686

16871687
\indexlibrary{\idxcode{lock_guard}!constructor}%
@@ -1760,9 +1760,9 @@
17601760
object.
17611761
When \tcode{sizeof...(MutexTypes)} is \tcode{1},
17621762
the supplied \tcode{Mutex} type
1763-
shall meet the \tcode{BasicLockable} requirements\iref{thread.req.lockable.basic}.
1763+
shall satisfy the \tcode{BasicLockable} requirements\iref{thread.req.lockable.basic}.
17641764
Otherwise, each of the mutex types
1765-
shall meet the \tcode{Lockable} requirements\iref{thread.req.lockable.req}.
1765+
shall satisfy the \tcode{Lockable} requirements\iref{thread.req.lockable.req}.
17661766

17671767
\indexlibrary{\idxcode{scoped_lock}!constructor}%
17681768
\begin{itemdecl}
@@ -1875,7 +1875,7 @@
18751875
\tcode{pm} is not null and the lockable object pointed
18761876
to by \tcode{pm} does not exist for the entire remaining
18771877
lifetime\iref{basic.life} of the \tcode{unique_lock} object. The supplied
1878-
\tcode{Mutex} type shall meet the \tcode{BasicLockable}
1878+
\tcode{Mutex} type shall satisfy the \tcode{BasicLockable}
18791879
requirements\iref{thread.req.lockable.basic}.
18801880

18811881
\pnum
@@ -1938,7 +1938,7 @@
19381938
\begin{itemdescr}
19391939
\pnum
19401940
\requires
1941-
The supplied \tcode{Mutex} type shall meet the \tcode{Lockable}
1941+
The supplied \tcode{Mutex} type shall satisfy the \tcode{Lockable}
19421942
requirements\iref{thread.req.lockable.req}.
19431943
If \tcode{mutex_type} is not a recursive mutex the calling thread does not own the mutex.
19441944

@@ -1978,7 +1978,7 @@
19781978
\begin{itemdescr}
19791979
\pnum
19801980
\requires If \tcode{mutex_type} is not a recursive mutex the calling thread
1981-
does not own the mutex. The supplied \tcode{Mutex} type shall meet the
1981+
does not own the mutex. The supplied \tcode{Mutex} type shall satisfy the
19821982
\tcode{TimedLockable} requirements\iref{thread.req.lockable.timed}.
19831983

19841984
\pnum
@@ -1999,7 +1999,7 @@
19991999
\begin{itemdescr}
20002000
\pnum
20012001
\requires If \tcode{mutex_type} is not a recursive mutex the calling thread does not own the mutex.
2002-
The supplied \tcode{Mutex} type shall meet the \tcode{TimedLockable} requirements\iref{thread.req.lockable.timed}.
2002+
The supplied \tcode{Mutex} type shall satisfy the \tcode{TimedLockable} requirements\iref{thread.req.lockable.timed}.
20032003

20042004
\pnum
20052005
\effects Constructs an object of type \tcode{unique_lock} and calls \tcode{m.try_lock_for(rel_time)}.
@@ -2079,7 +2079,7 @@
20792079

20802080
\begin{itemdescr}
20812081
\pnum
2082-
\requires The supplied \tcode{Mutex} shall meet the \tcode{Lockable}
2082+
\requires The supplied \tcode{Mutex} shall satisfy the \tcode{Lockable}
20832083
requirements\iref{thread.req.lockable.req}.
20842084

20852085
\pnum
@@ -2113,7 +2113,7 @@
21132113

21142114
\begin{itemdescr}
21152115
\pnum
2116-
\requires The supplied \tcode{Mutex} type shall meet the \tcode{TimedLockable}
2116+
\requires The supplied \tcode{Mutex} type shall satisfy the \tcode{TimedLockable}
21172117
requirements\iref{thread.req.lockable.timed}.
21182118

21192119
\pnum
@@ -2147,7 +2147,7 @@
21472147

21482148
\begin{itemdescr}
21492149
\pnum
2150-
\requires The supplied \tcode{Mutex} type shall meet the \tcode{TimedLockable} requirements\iref{thread.req.lockable.timed}.
2150+
\requires The supplied \tcode{Mutex} type shall satisfy the \tcode{TimedLockable} requirements\iref{thread.req.lockable.timed}.
21512151

21522152
\pnum
21532153
\effects As if by \tcode{pm->try_lock_for(rel_time)}.
@@ -2316,7 +2316,7 @@
23162316
is undefined if the contained pointer \tcode{pm} is not null and the lockable
23172317
object pointed to by \tcode{pm} does not exist for the entire remaining
23182318
lifetime\iref{basic.life} of the \tcode{shared_lock} object. The supplied
2319-
\tcode{Mutex} type shall meet the shared mutex
2319+
\tcode{Mutex} type shall satisfy the shared mutex
23202320
requirements\iref{thread.sharedtimedmutex.requirements}.
23212321

23222322
\pnum
@@ -2695,7 +2695,7 @@
26952695

26962696
\begin{itemdescr}
26972697
\pnum
2698-
\requires Each template parameter type shall meet the \tcode{Lockable} requirements. \begin{note} The
2698+
\requires Each template parameter type shall satisfy the \tcode{Lockable} requirements. \begin{note} The
26992699
\tcode{unique_lock} class template meets these requirements when suitably instantiated.
27002700
\end{note}
27012701

@@ -2719,7 +2719,7 @@
27192719

27202720
\begin{itemdescr}
27212721
\pnum
2722-
\requires Each template parameter type shall meet the \tcode{Lockable} requirements,
2722+
\requires Each template parameter type shall satisfy the \tcode{Lockable} requirements,
27232723
\begin{note} The
27242724
\tcode{unique_lock} class template meets these requirements when suitably instantiated.
27252725
\end{note}
@@ -3325,7 +3325,7 @@
33253325
\rSec2[thread.condition.condvarany]{Class \tcode{condition_variable_any}}
33263326

33273327
\pnum
3328-
A \tcode{Lock} type shall meet the \tcode{BasicLockable}
3328+
A \tcode{Lock} type shall satisfy the \tcode{BasicLockable}
33293329
requirements\iref{thread.req.lockable.basic}. \begin{note} All of the standard
33303330
mutex types meet this requirement. If a \tcode{Lock} type other than one of the
33313331
standard mutex types or a \tcode{unique_lock} wrapper for a standard mutex type

0 commit comments

Comments
 (0)