LWG2969 polymorphic_allocator::construct() shouldn't pass resource()

Author: Dawn Perchik

source/utilities.tex

@@ -11482,7 +11482,7 @@
 \pnum
 \requires
 Uses-allocator construction of \tcode{T}
-with allocator \tcode{resource()} (see~\ref{allocator.uses.construction})
+with allocator \tcode{*this} (see~\ref{allocator.uses.construction})
 and constructor arguments \tcode{std::forward<Args>(args)...} is well-formed.
 \begin{note}
 Uses-allocator construction is always well-formed
@@ -11492,7 +11492,7 @@
 \effects
 Construct a \tcode{T} object in the storage
 whose address is represented by \tcode{p}
-by uses-allocator construction with allocator \tcode{resource()}
+by uses-allocator construction with allocator \tcode{*this}
 and constructor arguments \tcode{std::forward<Args>(args)...}.
 
 \pnum
@@ -11522,60 +11522,60 @@
 constructing a \tcode{pair<T1, T2>} object
 in the storage whose address is represented by \tcode{p},
 as if by separate uses-allocator construction
-with allocator \tcode{resource()}\iref{allocator.uses.construction}
+with allocator \tcode{*this}\iref{allocator.uses.construction}
 of \tcode{p->first} using the elements of \tcode{x}
 and \tcode{p->second} using the elements of \tcode{y}.
 \end{note}
 \begin{itemize}
 \item
-If \tcode{uses_allocator_v<T1,memory_resource*>} is \tcode{false}
+If \tcode{uses_allocator_v<T1,polymorphic_allocator>} is \tcode{false}
 \\
 and
 \tcode{is_constructible_v<T1,Args1...>} is \tcode{true},
 \\
 then \tcode{xprime} is \tcode{x}.
 \item
-Otherwise, if \tcode{uses_allocator_v<T1,memory_resource*>} is \tcode{true}
+Otherwise, if \tcode{uses_allocator_v<T1,polymorphic_allocator>} is \tcode{true}
 \\
 and
-\tcode{is_constructible_v<T1,allocator_arg_t,memory_resource*,Args1...>} is \tcode{true},
+\tcode{is_constructible_v<T1,allocator_arg_t,polymorphic_allocator,Args1...>} is \tcode{true},
 \\
-then \tcode{xprime} is \tcode{tuple_cat(make_tuple(allocator_arg, resource()), std::move(x))}.
+then \tcode{xprime} is \tcode{tuple_cat(make_tuple(allocator_arg, *this), std::move(x))}.
 \item
-Otherwise, if \tcode{uses_allocator_v<T1,memory_resource*>} is \tcode{true}
+Otherwise, if \tcode{uses_allocator_v<T1,polymorphic_allocator>} is \tcode{true}
 \\
 and
-\tcode{is_constructible_v<T1,Args1...,memory_resource*>} is \tcode{true},
+\tcode{is_constructible_v<T1,Args1...,polymorphic_allocator>} is \tcode{true},
 \\
-then \tcode{xprime} is \tcode{tuple_cat(std::move(x), make_tuple(resource()))}.
+then \tcode{xprime} is \tcode{tuple_cat(std::move(x), make_tuple(*this))}.
 \item
 Otherwise the program is ill formed.
 \end{itemize}
 Let \tcode{yprime} be a tuple constructed from \tcode{y}
 according to the appropriate rule from the following list:
 \begin{itemize}
 \item
-If \tcode{uses_allocator_v<T2,memory_resource*>} is \tcode{false}
+If \tcode{uses_allocator_v<T2,polymorphic_allocator>} is \tcode{false}
 \\
 and
 \tcode{is_constructible_v<T2,Args2...>} is \tcode{true},
 \\
 then \tcode{yprime} is \tcode{y}.
 \item
-Otherwise, if \tcode{uses_allocator_v<T2,memory_resource*>} is \tcode{true}
+Otherwise, if \tcode{uses_allocator_v<T2,polymorphic_allocator>} is \tcode{true}
 \\
 and
-\tcode{is_constructible_v<T2,allocator_arg_t,memory_resource*,Args2...>} is \tcode{true},
+\tcode{is_constructible_v<T2,allocator_arg_t,polymorphic_allocator,Args2...>} is \tcode{true},
 \\
-then \tcode{yprime} is \tcode{tuple_cat(make_tuple(allocator_arg, resource()), std::move(y))}.
+then \tcode{yprime} is \tcode{tuple_cat(make_tuple(allocator_arg, *this), std::move(y))}.
 \item
-Otherwise, if \tcode{uses_allocator_v<T2,memory_resource*>} is \tcode{true}
+Otherwise, if \tcode{uses_allocator_v<T2,polymorphic_allocator>} is \tcode{true}
 \\
 and
-\tcode{is_constructible_v<T2,Args2...,memory_resource*>} is \tcode{true},
+\tcode{is_constructible_v<T2,Args2...,polymorphic_allocator>} is \tcode{true},
 \\
 then
-\tcode{yprime} is \tcode{tuple_cat(std::move(y), make_tuple(resource()))}.
+\tcode{yprime} is \tcode{tuple_cat(std::move(y), make_tuple(*this))}.
 \item
 Otherwise the program is ill formed.
 \end{itemize}