Skip to content

Commit

Permalink
[strings], [unord.req.general], [stringbuf.members]: Fix xrefs to [co…
Browse files Browse the repository at this point in the history
…ntainer.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 #6184
  • Loading branch information
jwakely authored and tkoeppe committed May 17, 2023
1 parent 3ec6173 commit 4fac9f9
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 15 deletions.
6 changes: 3 additions & 3 deletions source/containers.tex
Original file line number Diff line number Diff line change
Expand Up @@ -2705,7 +2705,7 @@
\pnum
A type \tcode{X} meets the \defnadj{associative}{container} requirements
if \tcode{X} meets all the requirements of an allocator-aware
container\iref{container.requirements.general} and
container\iref{container.reqmts} and
the following types, statements, and expressions are well-formed and
have the specified semantics,
except that for
Expand Down Expand Up @@ -4204,7 +4204,7 @@
A type \tcode{X} meets
the \defnadj{unordered associative}{container} requirements
if \tcode{X} meets all the requirements of
an allocator-aware container\iref{container.requirements.general} and
an allocator-aware container\iref{container.reqmts} and
the following types, statements, and expressions are well-formed and
have the specified semantics,
except that for \tcode{unordered_map} and \tcode{unordered_multimap},
Expand Down Expand Up @@ -4675,7 +4675,7 @@
\begin{itemdescr}
\pnum
\effects
In addition to the container requirements\iref{container.requirements.general},
In addition to the container requirements\iref{container.reqmts},
copies the hash function, predicate, and maximum load factor.

\pnum
Expand Down
2 changes: 1 addition & 1 deletion source/iostreams.tex
Original file line number Diff line number Diff line change
Expand Up @@ -8333,7 +8333,7 @@
\pnum
\constraints
\tcode{SAlloc} is a type that
qualifies as an allocator\iref{container.requirements.general}.
qualifies as an allocator\iref{container.reqmts}.

\pnum
\effects
Expand Down
23 changes: 12 additions & 11 deletions source/strings.tex
Original file line number Diff line number Diff line change
Expand Up @@ -2374,15 +2374,15 @@
\tcode{basic_string<charT, traits, Allocator>} uses an object of type
\tcode{Allocator} to allocate and free storage for the contained \tcode{charT}
objects as needed. The \tcode{Allocator} object used is
obtained as described in \ref{container.requirements.general}.
obtained as described in \ref{container.reqmts}.
In every specialization \tcode{basic_string<charT, traits, Allocator>},
the type \tcode{traits} shall meet
the character traits requirements\iref{char.traits}.
\begin{note}
Every specialization \tcode{basic_string<charT, traits, Allocator>} is
an allocator-aware container,
but does not use the allocator's \tcode{construct} and \tcode{destroy}
member functions\iref{container.requirements.general}.
member functions\iref{container.requirements.pre}.
\end{note}
\begin{note}
The program is ill-formed if \tcode{traits::char_type}
Expand Down Expand Up @@ -2569,7 +2569,8 @@
\pnum
\constraints
\tcode{Allocator} is a type
that qualifies as an allocator\iref{container.requirements.general}.

that qualifies as an allocator\iref{container.reqmts}.
\begin{note}
This affects class template argument deduction.
\end{note}
Expand All @@ -2588,7 +2589,7 @@
\pnum
\constraints
\tcode{Allocator} is a type
that qualifies as an allocator\iref{container.requirements.general}.
that qualifies as an allocator\iref{container.reqmts}.
\begin{note}
This affects class template argument deduction.
\end{note}
Expand All @@ -2608,7 +2609,7 @@
\pnum
\constraints
\tcode{InputIterator} is a type that qualifies as an input
iterator\iref{container.requirements.general}.
iterator\iref{container.reqmts}.

\pnum
\effects
Expand Down Expand Up @@ -2672,7 +2673,7 @@
\pnum
\constraints
\tcode{InputIterator} is a type that qualifies as an input iterator,
and \tcode{Allocator} is a type that qualifies as an allocator\iref{container.requirements.general}.
and \tcode{Allocator} is a type that qualifies as an allocator\iref{container.reqmts}.
\end{itemdescr}

\begin{itemdecl}
Expand All @@ -2695,7 +2696,7 @@
\pnum
\constraints
\tcode{Allocator} is a type that qualifies as
an allocator\iref{container.requirements.general}.
an allocator\iref{container.reqmts}.
\end{itemdescr}

\indexlibrarymember{operator=}{basic_string}%
Expand Down Expand Up @@ -3377,7 +3378,7 @@
\pnum
\constraints
\tcode{InputIterator} is a type that qualifies as an input
iterator\iref{container.requirements.general}.
iterator\iref{container.reqmts}.

\pnum
\effects
Expand Down Expand Up @@ -3582,7 +3583,7 @@
\pnum
\constraints
\tcode{InputIterator} is a type that qualifies as an input
iterator\iref{container.requirements.general}.
iterator\iref{container.reqmts}.

\pnum
\effects
Expand Down Expand Up @@ -3800,7 +3801,7 @@
\pnum
\constraints
\tcode{InputIterator} is a type that qualifies as an input
iterator\iref{container.requirements.general}.
iterator\iref{container.reqmts}.

\pnum
\expects
Expand Down Expand Up @@ -4198,7 +4199,7 @@
\pnum
\constraints
\tcode{InputIterator} is a type that qualifies as an input
iterator\iref{container.requirements.general}.
iterator\iref{container.reqmts}.

\pnum
\effects
Expand Down

0 comments on commit 4fac9f9

Please sign in to comment.