Skip to content

Commit 2a1d53b

Browse files
jensmaurertkoeppe
authored andcommitted
[lib] Use table references for CamelCase requirements.
1 parent e023fd1 commit 2a1d53b

File tree

5 files changed

+25
-19
lines changed

5 files changed

+25
-19
lines changed

source/iostreams.tex

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

1042010420
\pnum
10421-
\tcode{Allocator} shall satisfy the allocator requirements\iref{allocator.requirements}.
10421+
\tcode{Allocator} shall satisfy the \tcode{Allocator} requirements
10422+
(\tref{utilities.allocator.requirements}).
1042210423

1042310424
\pnum
1042410425
\begin{example}
@@ -10761,7 +10762,7 @@
1076110762

1076210763
\pnum
1076310764
Template parameters named \tcode{Allocator} shall satisfy the
10764-
Allocator requirements\iref{allocator.requirements}.
10765+
\tcode{Allocator} requirements (\tref{utilities.allocator.requirements}).
1076510766

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

source/lib-intro.tex

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1759,8 +1759,8 @@
17591759

17601760
\begin{itemize}
17611761
\item it is a function object type\iref{function.objects},
1762-
\item it satisfies the requirements of \tcode{CopyConstructible} and
1763-
\tcode{Destructible}\iref{utility.arg.requirements}, and
1762+
\item it satisfies the requirements of \tcode{CopyConstructible} (\tref{copyconstructible}) and
1763+
\tcode{Destructible} (\tref{destructible}), and
17641764
\item the expressions shown in \tref{hash}
17651765
are valid and have the indicated semantics.
17661766
\end{itemize}
@@ -2085,10 +2085,10 @@
20852085

20862086
\pnum
20872087
An allocator type \tcode{X} shall satisfy the requirements of
2088-
\tcode{CopyConstructible}\iref{utility.arg.requirements}.
2088+
\tcode{CopyConstructible} (\tref{copyconstructible}).
20892089
The \tcode{X::pointer}, \tcode{X::const_pointer}, \tcode{X::void_pointer}, and
20902090
\tcode{X::const_void_pointer} types shall satisfy the requirements of
2091-
\tcode{NullablePointer}\iref{nullablepointer.requirements}.
2091+
\tcode{NullablePointer} (\tref{nullablepointer}).
20922092
No constructor,
20932093
comparison function, copy operation, move operation, or swap operation on
20942094
these pointer types shall exit via an exception. \tcode{X::pointer} and \tcode{X::const_pointer} shall also

source/support.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3390,7 +3390,7 @@
33903390

33913391
\pnum
33923392
\tcode{exception_ptr} shall satisfy the requirements of
3393-
\tcode{NullablePointer}\iref{nullablepointer.requirements}.
3393+
\tcode{NullablePointer} (\tref{nullablepointer}).
33943394

33953395
\pnum
33963396
Two non-null values of type \tcode{exception_ptr} are equivalent and compare equal if and

source/threads.tex

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3934,7 +3934,8 @@
39343934

39353935
\begin{itemdescr}
39363936
\pnum
3937-
\requires \tcode{Alloc} shall be an Allocator\iref{allocator.requirements}.
3937+
\requires \tcode{Alloc} shall satisfy the \tcode{Allocator}
3938+
requirements (\tref{utilities.allocator.requirements}).
39383939
\end{itemdescr}
39393940

39403941

source/utilities.tex

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1391,8 +1391,8 @@
13911391

13921392
\begin{itemdescr}
13931393
\pnum
1394-
\requires \tcode{Alloc} shall satisfy the requirements for an
1395-
\tcode{Allocator}\iref{allocator.requirements}.
1394+
\requires \tcode{Alloc} shall satisfy the
1395+
\tcode{Allocator} requirements (\tref{utilities.allocator.requirements}).
13961396

13971397
\pnum
13981398
\effects Equivalent to the preceding constructors except that each element is constructed with
@@ -2054,7 +2054,8 @@
20542054

20552055
\begin{itemdescr}
20562056
\pnum
2057-
\requires \tcode{Alloc} shall be an \tcode{Allocator}\iref{allocator.requirements}.
2057+
\requires \tcode{Alloc} shall satisfy the \tcode{Allocator}
2058+
requirements (\tref{utilities.allocator.requirements}).
20582059

20592060
\pnum
20602061
\begin{note} Specialization of this trait informs other library components that
@@ -7103,7 +7104,7 @@
71037104
disambiguate constructor and function overloading. Specifically, several types (see
71047105
\tcode{tuple}~\ref{tuple}) have constructors with \tcode{allocator_arg_t} as the first
71057106
argument, immediately followed by an argument of a type that satisfies the
7106-
\tcode{Allocator} requirements\iref{allocator.requirements}.
7107+
\tcode{Allocator} requirements (\tref{utilities.allocator.requirements}).
71077108

71087109
\rSec2[allocator.uses]{\tcode{uses_allocator}}
71097110

@@ -8120,10 +8121,10 @@
81208121
D>::pointer} shall be a synonym for \tcode{remove_reference_t<D>::pointer}. Otherwise
81218122
\tcode{unique_ptr<T, D>::pointer} shall be a synonym for \tcode{element_type*}. The type \tcode{unique_ptr<T,
81228123
D>::pointer} shall
8123-
satisfy the requirements of \tcode{NullablePointer}\iref{nullablepointer.requirements}.
8124+
satisfy the requirements of \tcode{NullablePointer} (\tref{nullablepointer}).
81248125

81258126
\pnum
8126-
\begin{example} Given an allocator type \tcode{X}\iref{allocator.requirements} and
8127+
\begin{example} Given an allocator type \tcode{X} (\tref{utilities.allocator.requirements}) and
81278128
letting \tcode{A} be a synonym for \tcode{allocator_traits<X>}, the types \tcode{A::pointer},
81288129
\tcode{A::const_pointer}, \tcode{A::void_pointer}, and \tcode{A::const_void_pointer}
81298130
may be used as \tcode{unique_ptr<T, D>::pointer}. \end{example}
@@ -9253,7 +9254,8 @@
92539254
initialized with \tcode{std::move(d)} shall not throw exceptions.
92549255
The expression \tcode{d(p)}
92559256
shall have well-defined behavior and shall not throw exceptions.
9256-
\tcode{A} shall be an allocator\iref{allocator.requirements}.
9257+
\tcode{A} shall satisfy the \tcode{Allocator} requirements
9258+
(\tref{utilities.allocator.requirements}).
92579259

92589260
\pnum\effects Constructs a \tcode{shared_ptr} object that owns the
92599261
object \tcode{p} and the deleter \tcode{d}.
@@ -9653,7 +9655,8 @@
96539655

96549656
\begin{itemdescr}
96559657
\pnum
9656-
\requires \tcode{A} shall be an allocator\iref{allocator.requirements}.
9658+
\requires \tcode{A} shall satisfy the \tcode{Allocator}
9659+
requirements (\tref{utilities.allocator.requirements}).
96579660

96589661
\pnum
96599662
\effects Allocates memory for an object of type \tcode{T}
@@ -11304,7 +11307,7 @@
1130411307

1130511308
\pnum
1130611309
A specialization of class template \tcode{pmr::polymorphic_allocator}
11307-
conforms to the \tcode{Allocator} requirements\iref{allocator.requirements}.
11310+
satisfies the \tcode{Allocator} requirements (\tref{utilities.allocator.requirements}).
1130811311
Constructed with different memory resources,
1130911312
different instances of the same specialization of \tcode{pmr::polymorphic_allocator}
1131011313
can exhibit entirely different allocation behavior.
@@ -14935,7 +14938,8 @@
1493514938
of templates specified in this subclause
1493614939
\ref{func.search} shall satisfy the same requirements and semantics as
1493714940
specified in \ref{algorithms.general}.
14938-
Template parameters named \tcode{Hash} shall satisfy the requirements as specified in \ref{hash.requirements}.
14941+
Template parameters named \tcode{Hash} shall satisfy the \tcode{Hash}
14942+
requirements (\tref{hash}).
1493914943

1494014944
\pnum
1494114945
The Boyer-Moore searcher implements the Boyer-Moore search algorithm.
@@ -15233,7 +15237,7 @@
1523315237
\pnum
1523415238
An enabled specialization \tcode{hash<Key>} will:
1523515239
\begin{itemize}
15236-
\item satisfy the \tcode{Hash} requirements\iref{hash.requirements},
15240+
\item satisfy the \tcode{Hash} requirements (\tref{hash}),
1523715241
with \tcode{Key} as the function
1523815242
call argument type, the \tcode{Default\-Constructible} requirements (\tref{defaultconstructible}),
1523915243
the \tcode{CopyAssignable} requirements (\tref{copyassignable}),

0 commit comments

Comments
 (0)