diff --git a/source/containers.tex b/source/containers.tex index 7a15185cc8..ba5f76b55b 100644 --- a/source/containers.tex +++ b/source/containers.tex @@ -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::construct(m, p) \end{codeblock} @@ -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::construct(m, p, rv) @@ -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::construct(m, p, v) @@ -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::construct(m, p, args) \end{codeblock} @@ -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::destroy(m, p) \end{codeblock} diff --git a/source/memory.tex b/source/memory.tex index 8419e02b91..f851fc8d84 100644 --- a/source/memory.tex +++ b/source/memory.tex @@ -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}, diff --git a/source/utilities.tex b/source/utilities.tex index 4214d84d06..9ce2e4da6a 100644 --- a/source/utilities.tex +++ b/source/utilities.tex @@ -3300,7 +3300,7 @@ \pnum Any instance of \tcode{optional} at any given time either contains a value or does not contain a value. -When an instance of \tcode{optional} \defnx{contains a value}{contains a value!\idxcode{optional}}, +When an instance of \tcode{optional} 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.