From 0bfdc5feca1e4a216d212dad2ef108eee637a949 Mon Sep 17 00:00:00 2001 From: Eelis van der Weegen Date: Sun, 28 Jul 2024 13:48:14 +0200 Subject: [PATCH] Avoid `for\-ward`. Because the 'for' gets highlighted as a keyword. --- source/algorithms.tex | 2 +- source/containers.tex | 16 ++++++++-------- source/ranges.tex | 4 ++-- source/threads.tex | 4 ++-- source/utilities.tex | 10 +++++----- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/source/algorithms.tex b/source/algorithms.tex index df366e8ca4..4be10e3e3c 100644 --- a/source/algorithms.tex +++ b/source/algorithms.tex @@ -11714,7 +11714,7 @@ \pnum \remarks The effects of \tcode{generate_random(r, g)} shall be equivalent to -\tcode{ranges::generate(std::for\-ward(r), ref(g))}. +\tcode{ranges::generate(std::forward(r), ref(g))}. \begin{note} This implies that \tcode{g.generate_random(a)} fills \tcode{a} with the same values as produced by invocation of \tcode{g()}. diff --git a/source/containers.tex b/source/containers.tex index 186c304ec4..b5a0114254 100644 --- a/source/containers.tex +++ b/source/containers.tex @@ -10763,7 +10763,7 @@ \pnum \expects \tcode{value_type} is \oldconcept{EmplaceConstructible} into \tcode{map} -from \tcode{piecewise_construct}, \tcode{for\-ward_as_tuple(k)}, +from \tcode{piecewise_construct}, \tcode{forward_as_tuple(k)}, \tcode{forward_as_tuple(std::forward(args)...)}. \pnum @@ -10801,7 +10801,7 @@ \pnum \expects \tcode{value_type} is \oldconcept{EmplaceConstructible} into \tcode{map} -from \tcode{piecewise_construct}, \tcode{for\-ward_as_tuple(std::move(k))}, +from \tcode{piecewise_construct}, \tcode{forward_as_tuple(std::move(k))}, \tcode{forward_as_tuple(std::forward(args)...)}. \pnum @@ -10898,7 +10898,7 @@ \effects If the map already contains an element \tcode{e} whose key is equivalent to \tcode{k}, -assigns \tcode{std::for\-ward(obj)} to \tcode{e.second}. +assigns \tcode{std::forward(obj)} to \tcode{e.second}. Otherwise inserts an object of type \tcode{value_type} constructed with \tcode{k}, \tcode{std::forward(obj)}. @@ -10932,13 +10932,13 @@ \pnum \expects \tcode{value_type} is \oldconcept{EmplaceConstructible} into \tcode{map} -from \tcode{std::move(k)}, \tcode{std::for\-ward(obj)}. +from \tcode{std::move(k)}, \tcode{std::forward(obj)}. \pnum \effects If the map already contains an element \tcode{e} whose key is equivalent to \tcode{k}, -assigns \tcode{std::for\-ward(obj)} to \tcode{e.second}. +assigns \tcode{std::forward(obj)} to \tcode{e.second}. Otherwise inserts an object of type \tcode{value_type} constructed with \tcode{std::\brk{}move(k)}, \tcode{std::forward(obj)}. @@ -12881,13 +12881,13 @@ \pnum \expects \tcode{value_type} is \oldconcept{EmplaceConstructible} into \tcode{unordered_map} -from \tcode{k}, \tcode{std::for\-ward(obj)}. +from \tcode{k}, \tcode{std::forward(obj)}. \pnum \effects If the map already contains an element \tcode{e} whose key is equivalent to \tcode{k}, -assigns \tcode{std::for\-ward(obj)} to \tcode{e.second}. +assigns \tcode{std::forward(obj)} to \tcode{e.second}. Otherwise inserts an object of type \tcode{value_type} constructed with \tcode{k}, \tcode{std::forward(obj)}. @@ -12927,7 +12927,7 @@ \effects If the map already contains an element \tcode{e} whose key is equivalent to \tcode{k}, -assigns \tcode{std::for\-ward(obj)} to \tcode{e.second}. +assigns \tcode{std::forward(obj)} to \tcode{e.second}. Otherwise inserts an object of type \tcode{value_type} constructed with \tcode{std::\brk{}move(k)}, \tcode{std::forward(obj)}. diff --git a/source/ranges.tex b/source/ranges.tex index 810db9dcee..cad70c3978 100644 --- a/source/ranges.tex +++ b/source/ranges.tex @@ -6649,7 +6649,7 @@ then \tcode{iterator_concept} denotes \tcode{bidirectio\-nal_iterator_tag}. \item Otherwise, if \exposid{ref-is-glvalue} is \tcode{true} and \exposid{Base} and \tcode{range_reference_t<\exposid{Base}>} - each model \libconceptx{for\-ward_range}{forward_range}, then \tcode{iterator_concept} denotes + each model \libconceptx{forward_range}{forward_range}, then \tcode{iterator_concept} denotes \tcode{forward_iterator_tag}. \item Otherwise, \tcode{iterator_concept} denotes \tcode{input_iterator_tag}. \end{itemize} @@ -11271,7 +11271,7 @@ \item Otherwise, if \tcode{\exposconcept{all-forward}} is modeled, -then \tcode{iterator_concept} denotes \tcode{for\-ward_iterator_tag}. +then \tcode{iterator_concept} denotes \tcode{forward_iterator_tag}. \item Otherwise, \tcode{iterator_concept} denotes \tcode{input_iterator_tag}. \end{itemize} diff --git a/source/threads.tex b/source/threads.tex index e7cab4222a..a02c820440 100644 --- a/source/threads.tex +++ b/source/threads.tex @@ -11636,7 +11636,7 @@ \begin{itemize} \item If \tcode{launch::async} is set in \tcode{policy}, calls -\tcode{invoke(auto(std::forward(f)), auto(std::for\-ward(args))...)}\iref{func.invoke,thread.thread.constr} +\tcode{invoke(auto(std::forward(f)), auto(std::forward(args))...)}\iref{func.invoke,thread.thread.constr} as if in a new thread of execution represented by a \tcode{thread} object with the values produced by \tcode{auto} being materialized\iref{conv.rval} in the thread that called \tcode{async}. @@ -11654,7 +11654,7 @@ \item If \tcode{launch::deferred} is set in \tcode{policy}, stores \tcode{auto(std::forward(f))} and -\tcode{auto(std::for\-ward(args))...} +\tcode{auto(std::forward(args))...} in the shared state. These copies of \tcode{f} and \tcode{args} constitute a \defnadj{deferred}{function}. Invocation of the deferred function evaluates \tcode{invoke(std::move(g), std::move(xyz))} where \tcode{g} is the stored value of diff --git a/source/utilities.tex b/source/utilities.tex index cdc4353df5..a7f337779a 100644 --- a/source/utilities.tex +++ b/source/utilities.tex @@ -6810,7 +6810,7 @@ \effects Calls \tcode{reset()}. Then direct-non-list-initializes the contained value of type \tcode{VT} -with \tcode{std::for\-ward(args)...}. +with \tcode{std::forward(args)...}. \pnum \ensures @@ -9687,7 +9687,7 @@ If \tcode{has_value()} is \tcode{true}, \tcode{expected()}; otherwise, an \tcode{expected} object whose \exposid{has_val} member is \tcode{false} and \exposid{unex} member is direct-non-list-initialized with -\tcode{invoke(std::for\-ward(f), error())}. +\tcode{invoke(std::forward(f), error())}. \end{itemdescr} \indexlibrarymember{transform_error}{expected}% @@ -9715,7 +9715,7 @@ If \tcode{has_value()} is \tcode{true}, \tcode{expected()}; otherwise, an \tcode{expected} object whose \exposid{has_val} member is \tcode{false} and \exposid{unex} member is direct-non-list-initialized with -\tcode{invoke(std::for\-ward(f), std::move(error()))}. +\tcode{invoke(std::forward(f), std::move(error()))}. \end{itemdescr} \rSec3[expected.void.eq]{Equality operators} @@ -13766,7 +13766,7 @@ \ensures \tcode{*this} has a target object of type \tcode{VT} direct-non-list-initialized with -\tcode{ilist, std::for\-ward(args)...}. +\tcode{ilist, std::forward(args)...}. \pnum \throws @@ -14191,7 +14191,7 @@ \ensures \tcode{*this} has a target object of type \tcode{VT} direct-non-list-initialized with -\tcode{ilist, std::for\-ward(args)...}. +\tcode{ilist, std::forward(args)...}. \pnum \throws