From d98922cc8333f3cf283cf73dbbe4b90659d3243f Mon Sep 17 00:00:00 2001 From: Johannes Laire Date: Fri, 9 Dec 2016 03:53:01 +0200 Subject: [PATCH 1/2] [allocator] Format "OUTERMOST" in monospace --- source/utilities.tex | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/source/utilities.tex b/source/utilities.tex index 7cc1fc33df..e00d1d41e8 100644 --- a/source/utilities.tex +++ b/source/utilities.tex @@ -12312,14 +12312,14 @@ \pnum In the \tcode{construct} member functions, -\textit{OUTERMOST(x)} is \tcode{x} if \tcode{x} does not have an +\tcode{\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.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 \\ \tcode{scoped_allocator_adaptor}. \end{note} @@ -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 From 5288b10320f6162c87f29b0114b0d8c0efa8ee45 Mon Sep 17 00:00:00 2001 From: Johannes Laire Date: Fri, 9 Dec 2016 04:03:39 +0200 Subject: [PATCH 2/2] [allocator] Remove bad linebreaks --- source/utilities.tex | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/utilities.tex b/source/utilities.tex index e00d1d41e8..61770f8f9c 100644 --- a/source/utilities.tex +++ b/source/utilities.tex @@ -12313,15 +12313,15 @@ \pnum In the \tcode{construct} member functions, \tcode{\textit{OUTERMOST}(x)} is \tcode{x} if \tcode{x} does not have an -\tcode{outer_allocator()} member function and \\ +\tcode{outer_allocator()} member function and \tcode{\textit{OUTERMOST}(x.outer_allocator())} otherwise; \tcode{\textit{OUTERMOST_ALLOC_TRAITS}(x)} is \\ \tcode{allocator_traits}. -\begin{note} \tcode{\textit{OUTERMOST}(x)} and \\ +\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}%