Skip to content

Three editorial fixes re "X means that Y" #5936

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Three editorial fixes re "X means that Y" #5936

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3e1f185
[util.smartptr.shared.const] Italicize defn of "enables shared_from_t…
Quuxplusone Nov 6, 2022
7df5b7c
[optional.general] De-italicize "contains a value"
Quuxplusone Nov 6, 2022
3bf2c87
[container.alloc.reqmts] Grammatify uses of "means that"
Quuxplusone Nov 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions source/containers.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -883,7 +883,7 @@
\item
\tcode{T} is \defnx{\oldconcept{DefaultInsertable} into \tcode{X}}
{\oldconceptname{DefaultInsertable} into X@\oldconcept{DefaultInsertable} into \tcode{X}}
means that the following expression is well-formed:
if the following expression is well-formed:
\begin{codeblock}
allocator_traits<A>::construct(m, p)
\end{codeblock}
Expand All @@ -900,7 +900,7 @@
\item
\tcode{T} is \defnx{\oldconcept{MoveInsertable} into \tcode{X}}
{\oldconceptname{MoveInsertable} into X@\oldconcept{MoveInsertable} into \tcode{X}}
means that the following expression
if the following expression
is well-formed:
\begin{codeblock}
allocator_traits<A>::construct(m, p, rv)
Expand All @@ -914,7 +914,7 @@
\item
\tcode{T} is \defnx{\oldconcept{CopyInsertable} into \tcode{X}}
{\oldconceptname{CopyInsertable} into X@\oldconcept{CopyInsertable} into \tcode{X}}
means that, in addition to \tcode{T} being \oldconcept{MoveInsertable} into
if, in addition to \tcode{T} being \oldconcept{MoveInsertable} into
\tcode{X}, the following expression is well-formed:
\begin{codeblock}
allocator_traits<A>::construct(m, p, v)
Expand All @@ -927,7 +927,7 @@
\defnx{\oldconcept{EmplaceConstructible} into \tcode{X} from \tcode{args}}
{\oldconceptname{EmplaceConstructible} into X from args@\oldconcept{EmplaceConstructible} into \tcode{X} from \tcode{args}},
for zero
or more arguments \tcode{args}, means that the following expression is well-formed:
or more arguments \tcode{args}, if the following expression is well-formed:
\begin{codeblock}
allocator_traits<A>::construct(m, p, args)
\end{codeblock}
Expand All @@ -936,7 +936,7 @@
\tcode{T} is
\defnx{\oldconcept{Erasable} from \tcode{X}}
{\oldconceptname{Erasable} from X@\oldconcept{Erasable} from \tcode{X}}
means that the following expression is well-formed:
if the following expression is well-formed:
\begin{codeblock}
allocator_traits<A>::destroy(m, p)
\end{codeblock}
Expand Down
2 changes: 1 addition & 1 deletion source/memory.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3225,7 +3225,7 @@

\pnum
In the constructor definitions below,
enables \tcode{shared_from_this} with \tcode{p},
\defnx{enables \tcode{shared_from_this} with \tcode{p}}{enables \tcode{shared_from_this}},
for a pointer \tcode{p} of type \tcode{Y*},
means that if \tcode{Y} has an unambiguous and accessible base class
that is a specialization of \tcode{enable_shared_from_this}\iref{util.smartptr.enab},
Expand Down
2 changes: 1 addition & 1 deletion source/utilities.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3300,7 +3300,7 @@

\pnum
Any instance of \tcode{optional<T>} at any given time either contains a value or does not contain a value.
When an instance of \tcode{optional<T>} \defnx{contains a value}{contains a value!\idxcode{optional}},
When an instance of \tcode{optional<T>} contains a value,
it means that an object of type \tcode{T}, referred to as the optional object's \defnx{contained value}{contained value!\idxcode{optional}},
is allocated within the storage of the optional object.
Implementations are not permitted to use additional storage, such as dynamic memory, to allocate its contained value.
Expand Down