Skip to content

Commit 4fac9f9

Browse files
jwakelytkoeppe
authored andcommitted
[strings], [unord.req.general], [stringbuf.members]: Fix xrefs to [container.requirements.general]
All the references for "qualifies as an input iterator" and "qualifies as an allocator" are supposed to be to [container.reqmts] p69 which begins: > The behavior of certain container member functions and deduction > guides depends on whether types qualify as input iterators or > allocators. The reference in [string.require] for obtaining an allocator should be to [container.reqmts] p64. The reference in [string.require] Note 2 should be to [container.requirements.pre] p3. Fixes cplusplus#6184
1 parent 3ec6173 commit 4fac9f9

File tree

3 files changed

+16
-15
lines changed

3 files changed

+16
-15
lines changed

source/containers.tex

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2705,7 +2705,7 @@
27052705
\pnum
27062706
A type \tcode{X} meets the \defnadj{associative}{container} requirements
27072707
if \tcode{X} meets all the requirements of an allocator-aware
2708-
container\iref{container.requirements.general} and
2708+
container\iref{container.reqmts} and
27092709
the following types, statements, and expressions are well-formed and
27102710
have the specified semantics,
27112711
except that for
@@ -4204,7 +4204,7 @@
42044204
A type \tcode{X} meets
42054205
the \defnadj{unordered associative}{container} requirements
42064206
if \tcode{X} meets all the requirements of
4207-
an allocator-aware container\iref{container.requirements.general} and
4207+
an allocator-aware container\iref{container.reqmts} and
42084208
the following types, statements, and expressions are well-formed and
42094209
have the specified semantics,
42104210
except that for \tcode{unordered_map} and \tcode{unordered_multimap},
@@ -4675,7 +4675,7 @@
46754675
\begin{itemdescr}
46764676
\pnum
46774677
\effects
4678-
In addition to the container requirements\iref{container.requirements.general},
4678+
In addition to the container requirements\iref{container.reqmts},
46794679
copies the hash function, predicate, and maximum load factor.
46804680

46814681
\pnum

source/iostreams.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8333,7 +8333,7 @@
83338333
\pnum
83348334
\constraints
83358335
\tcode{SAlloc} is a type that
8336-
qualifies as an allocator\iref{container.requirements.general}.
8336+
qualifies as an allocator\iref{container.reqmts}.
83378337

83388338
\pnum
83398339
\effects

source/strings.tex

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2374,15 +2374,15 @@
23742374
\tcode{basic_string<charT, traits, Allocator>} uses an object of type
23752375
\tcode{Allocator} to allocate and free storage for the contained \tcode{charT}
23762376
objects as needed. The \tcode{Allocator} object used is
2377-
obtained as described in \ref{container.requirements.general}.
2377+
obtained as described in \ref{container.reqmts}.
23782378
In every specialization \tcode{basic_string<charT, traits, Allocator>},
23792379
the type \tcode{traits} shall meet
23802380
the character traits requirements\iref{char.traits}.
23812381
\begin{note}
23822382
Every specialization \tcode{basic_string<charT, traits, Allocator>} is
23832383
an allocator-aware container,
23842384
but does not use the allocator's \tcode{construct} and \tcode{destroy}
2385-
member functions\iref{container.requirements.general}.
2385+
member functions\iref{container.requirements.pre}.
23862386
\end{note}
23872387
\begin{note}
23882388
The program is ill-formed if \tcode{traits::char_type}
@@ -2569,7 +2569,8 @@
25692569
\pnum
25702570
\constraints
25712571
\tcode{Allocator} is a type
2572-
that qualifies as an allocator\iref{container.requirements.general}.
2572+
2573+
that qualifies as an allocator\iref{container.reqmts}.
25732574
\begin{note}
25742575
This affects class template argument deduction.
25752576
\end{note}
@@ -2588,7 +2589,7 @@
25882589
\pnum
25892590
\constraints
25902591
\tcode{Allocator} is a type
2591-
that qualifies as an allocator\iref{container.requirements.general}.
2592+
that qualifies as an allocator\iref{container.reqmts}.
25922593
\begin{note}
25932594
This affects class template argument deduction.
25942595
\end{note}
@@ -2608,7 +2609,7 @@
26082609
\pnum
26092610
\constraints
26102611
\tcode{InputIterator} is a type that qualifies as an input
2611-
iterator\iref{container.requirements.general}.
2612+
iterator\iref{container.reqmts}.
26122613

26132614
\pnum
26142615
\effects
@@ -2672,7 +2673,7 @@
26722673
\pnum
26732674
\constraints
26742675
\tcode{InputIterator} is a type that qualifies as an input iterator,
2675-
and \tcode{Allocator} is a type that qualifies as an allocator\iref{container.requirements.general}.
2676+
and \tcode{Allocator} is a type that qualifies as an allocator\iref{container.reqmts}.
26762677
\end{itemdescr}
26772678

26782679
\begin{itemdecl}
@@ -2695,7 +2696,7 @@
26952696
\pnum
26962697
\constraints
26972698
\tcode{Allocator} is a type that qualifies as
2698-
an allocator\iref{container.requirements.general}.
2699+
an allocator\iref{container.reqmts}.
26992700
\end{itemdescr}
27002701

27012702
\indexlibrarymember{operator=}{basic_string}%
@@ -3377,7 +3378,7 @@
33773378
\pnum
33783379
\constraints
33793380
\tcode{InputIterator} is a type that qualifies as an input
3380-
iterator\iref{container.requirements.general}.
3381+
iterator\iref{container.reqmts}.
33813382

33823383
\pnum
33833384
\effects
@@ -3582,7 +3583,7 @@
35823583
\pnum
35833584
\constraints
35843585
\tcode{InputIterator} is a type that qualifies as an input
3585-
iterator\iref{container.requirements.general}.
3586+
iterator\iref{container.reqmts}.
35863587

35873588
\pnum
35883589
\effects
@@ -3800,7 +3801,7 @@
38003801
\pnum
38013802
\constraints
38023803
\tcode{InputIterator} is a type that qualifies as an input
3803-
iterator\iref{container.requirements.general}.
3804+
iterator\iref{container.reqmts}.
38043805

38053806
\pnum
38063807
\expects
@@ -4198,7 +4199,7 @@
41984199
\pnum
41994200
\constraints
42004201
\tcode{InputIterator} is a type that qualifies as an input
4201-
iterator\iref{container.requirements.general}.
4202+
iterator\iref{container.reqmts}.
42024203

42034204
\pnum
42044205
\effects

0 commit comments

Comments
 (0)