diff --git a/source/utilities.tex b/source/utilities.tex index 7cc1fc33df..61770f8f9c 100644 --- a/source/utilities.tex +++ b/source/utilities.tex @@ -12312,16 +12312,16 @@ \pnum In the \tcode{construct} member functions, -\textit{OUTERMOST(x)} is \tcode{x} if \tcode{x} does not have an -\tcode{outer_allocator()} member function and \\ -\textit{OUTERMOST(x.outer_allocator())} +\tcode{\textit{OUTERMOST}(x)} is \tcode{x} if \tcode{x} does not have an +\tcode{outer_allocator()} member function and +\tcode{\textit{OUTERMOST}(x.outer_allocator())} otherwise; -\textit{OUTERMOST_ALLOC_TRAITS(x)} is \\ +\tcode{\textit{OUTERMOST_ALLOC_TRAITS}(x)} is \\ \tcode{allocator_traits}. -\begin{note} \textit{OUTERMOST}(x) and \\ -\textit{OUTERMOST_ALLOC_TRAITS}(x) are recursive operations. It +\begin{note} \tcode{\textit{OUTERMOST}(x)} and +\tcode{\textit{OUTERMOST_ALLOC_TRAITS}(x)} are recursive operations. It is incumbent upon the definition of \tcode{outer_allocator()} to ensure that the -recursion terminates. It will terminate for all instantiations of \\ +recursion terminates. It will terminate for all instantiations of \tcode{scoped_allocator_adaptor}. \end{note} \indexlibrarymember{inner_allocator}{scoped_allocator_adaptor}% @@ -12410,18 +12410,18 @@ \begin{itemize} \item If \tcode{uses_allocator_v} is \tcode{false} and\\ \tcode{is_constructible_v} is \tcode{true}, calls\\ -\textit{OUTERMOST_ALLOC_TRAITS}(\tcode{*this})\tcode{::construct(\\ +\tcode{\textit{OUTERMOST_ALLOC_TRAITS}(*this)::construct(\\ \textit{OUTERMOST}(*this), p, std::forward(args)...)}. \item Otherwise, if \tcode{uses_allocator_v} is \tcode{true} and \tcode{is_construc\-tible_v} is \tcode{true}, calls -\textit{OUTERMOST_ALLOC_TRAITS}(\tcode{*this})\tcode{::construct(\textit{OUTERMOST}(*this), +\tcode{\textit{OUTERMOST_ALLOC_TRAITS}(*this)::construct(\textit{OUTERMOST}(*this), p, allocator_arg,\\inner_allocator(), std::forward(args)...)}. \item Otherwise, if \tcode{uses_allocator_v} is \tcode{true} and \tcode{is_construct\-ible_v} is \tcode{true}, calls -\textit{OUTERMOST_ALLOC_TRAITS}(*this):: -\tcode{construct(\textit{OUTERMOST}(*this), p, std::forward(args)...,\\inner_allocator())}. +\tcode{\textit{OUTERMOST_ALLOC_TRAITS}(*this):: +construct(\textit{OUTERMOST}(*this), p, std::forward(args)...,\\inner_allocator())}. \item Otherwise, the program is ill-formed. \begin{note} An error will result if \tcode{uses_allocator} evaluates to \tcode{true} but the specific constructor does not take an