diff --git a/source/algorithms.tex b/source/algorithms.tex index 74ac223b21..41958a5c11 100644 --- a/source/algorithms.tex +++ b/source/algorithms.tex @@ -13562,7 +13562,7 @@ make use of the following exposition-only function templates: \begin{codeblock} template - constexpr void* @\placeholdernc{voidify}@(T& obj) noexcept { + constexpr void* @\exposid{voidify}@(T& obj) noexcept { return addressof(obj); } @@ -13758,7 +13758,7 @@ Equivalent to: \begin{codeblock} for (; first != last; ++first) - ::new (@\placeholdernc{voidify}@(*first)) iterator_traits::value_type; + ::new (@\exposid{voidify}@(*first)) iterator_traits::value_type; \end{codeblock} \end{itemdescr} @@ -13780,7 +13780,7 @@ Equivalent to: \begin{codeblock} for (; first != last; ++first) - ::new (@\placeholdernc{voidify}@(*first)) remove_reference_t>; + ::new (@\exposid{voidify}@(*first)) remove_reference_t>; return first; \end{codeblock} \end{itemdescr} @@ -13798,7 +13798,7 @@ Equivalent to: \begin{codeblock} for (; n > 0; (void)++first, --n) - ::new (@\placeholdernc{voidify}@(*first)) iterator_traits::value_type; + ::new (@\exposid{voidify}@(*first)) iterator_traits::value_type; return first; \end{codeblock} \end{itemdescr} @@ -13837,7 +13837,7 @@ Equivalent to: \begin{codeblock} for (; first != last; ++first) - ::new (@\placeholdernc{voidify}@(*first)) iterator_traits::value_type(); + ::new (@\exposid{voidify}@(*first)) iterator_traits::value_type(); \end{codeblock} \end{itemdescr} @@ -13859,7 +13859,7 @@ Equivalent to: \begin{codeblock} for (; first != last; ++first) - ::new (@\placeholdernc{voidify}@(*first)) remove_reference_t>(); + ::new (@\exposid{voidify}@(*first)) remove_reference_t>(); return first; \end{codeblock} \end{itemdescr} @@ -13877,7 +13877,7 @@ Equivalent to: \begin{codeblock} for (; n > 0; (void)++first, --n) - ::new (@\placeholdernc{voidify}@(*first)) iterator_traits::value_type(); + ::new (@\exposid{voidify}@(*first)) iterator_traits::value_type(); return first; \end{codeblock} \end{itemdescr} @@ -13920,7 +13920,7 @@ Equivalent to: \begin{codeblock} for (; first != last; ++result, (void)++first) - ::new (@\placeholdernc{voidify}@(*result)) iterator_traits::value_type(*first); + ::new (@\exposid{voidify}@(*result)) iterator_traits::value_type(*first); \end{codeblock} \pnum @@ -13953,7 +13953,7 @@ Equivalent to: \begin{codeblock} for (; ifirst != ilast && ofirst != olast; ++ofirst, (void)++ifirst) - ::new (@\placeholdernc{voidify}@(*ofirst)) remove_reference_t>(*ifirst); + ::new (@\exposid{voidify}@(*ofirst)) remove_reference_t>(*ifirst); return {std::move(ifirst), ofirst}; \end{codeblock} \end{itemdescr} @@ -13975,7 +13975,7 @@ Equivalent to: \begin{codeblock} for (; n > 0; ++result, (void)++first, --n) - ::new (@\placeholdernc{voidify}@(*result)) iterator_traits::value_type(*first); + ::new (@\exposid{voidify}@(*result)) iterator_traits::value_type(*first); \end{codeblock} \pnum @@ -14028,7 +14028,7 @@ Equivalent to: \begin{codeblock} for (; first != last; (void)++result, ++first) - ::new (@\placeholdernc{voidify}@(*result)) + ::new (@\exposid{voidify}@(*result)) iterator_traits::value_type(@\exposid{deref-move}@(first)); return result; \end{codeblock} @@ -14059,7 +14059,7 @@ Equivalent to: \begin{codeblock} for (; ifirst != ilast && ofirst != olast; ++ofirst, (void)++ifirst) - ::new (@\placeholder{voidify}@(*ofirst)) + ::new (@\exposid{voidify}@(*ofirst)) remove_reference_t>(ranges::iter_move(ifirst)); return {std::move(ifirst), ofirst}; \end{codeblock} @@ -14088,7 +14088,7 @@ Equivalent to: \begin{codeblock} for (; n > 0; ++result, (void)++first, --n) - ::new (@\placeholdernc{voidify}@(*result)) + ::new (@\exposid{voidify}@(*result)) iterator_traits::value_type(@\exposid{deref-move}@(first)); return {first, result}; \end{codeblock} @@ -14141,7 +14141,7 @@ Equivalent to: \begin{codeblock} for (; first != last; ++first) - ::new (@\placeholdernc{voidify}@(*first)) iterator_traits::value_type(x); + ::new (@\exposid{voidify}@(*first)) iterator_traits::value_type(x); \end{codeblock} \end{itemdescr} @@ -14163,7 +14163,7 @@ Equivalent to: \begin{codeblock} for (; first != last; ++first) - ::new (@\placeholdernc{voidify}@(*first)) remove_reference_t>(x); + ::new (@\exposid{voidify}@(*first)) remove_reference_t>(x); return first; \end{codeblock} \end{itemdescr} @@ -14181,7 +14181,7 @@ Equivalent to: \begin{codeblock} for (; n--; ++first) - ::new (@\placeholdernc{voidify}@(*first)) iterator_traits::value_type(x); + ::new (@\exposid{voidify}@(*first)) iterator_traits::value_type(x); return first; \end{codeblock} \end{itemdescr} @@ -14233,9 +14233,9 @@ Equivalent to: \begin{codeblock} if constexpr (is_array_v) - return ::new (@\placeholdernc{voidify}@(*location)) T[1](); + return ::new (@\exposid{voidify}@(*location)) T[1](); else - return ::new (@\placeholdernc{voidify}@(*location)) T(std::forward(args)...); + return ::new (@\exposid{voidify}@(*location)) T(std::forward(args)...); \end{codeblock} \end{itemdescr} diff --git a/source/exec.tex b/source/exec.tex index 561e33c769..907928acc3 100644 --- a/source/exec.tex +++ b/source/exec.tex @@ -5119,7 +5119,7 @@ explicit op_state(pair parts, Rcvr& r) : @\exposid{assoc}@(std::move(parts.first)) { if (@\exposid{assoc}@) { - ::new (@\placeholdernc{voidify}@(@\exposid{op}@)) op_t(connect(std::move(*parts.second), std::move(r))); + ::new (@\exposid{voidify}@(@\exposid{op}@)) op_t(connect(std::move(*parts.second), std::move(r))); } else { @\exposid{rcvr}@ = addressof(r); }