Skip to content

Commit 46f9f21

Browse files
committed
FIXUP: Fix indexes, formatting, and obvious wording overlooks.
1 parent 37da798 commit 46f9f21

File tree

1 file changed

+9
-12
lines changed

1 file changed

+9
-12
lines changed

source/utilities.tex

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@
215215
};
216216
template<size_t I> constexpr in_place_index_t<I> in_place_index{};
217217

218-
// nontype argument tag%
218+
// \tcode{nontype} argument tag%
219219
\indexlibraryglobal{nontype_t}%
220220
\indexlibraryglobal{nontype}
221221
template<auto V>
@@ -13443,7 +13443,6 @@
1344313443
\returns
1344413444
\tcode{true} if \tcode{f} has no target object, otherwise \tcode{false}.
1344513445
\end{itemdescr}
13446-
\indextext{function object!wrapper|)}
1344713446

1344813447
\rSec3[func.wrap.ref]{Non-owning wrapper}
1344913448

@@ -13461,7 +13460,7 @@
1346113460

1346213461
\rSec4[func.wrap.ref.class]{Class template \tcode{function_ref}}
1346313462

13464-
\indexlibraryglobal{move_only_function}%
13463+
\indexlibraryglobal{function_ref}%
1346513464
\begin{codeblock}
1346613465
namespace std {
1346713466
template<class... S> class function_ref; // \notdef
@@ -13483,7 +13482,7 @@
1348313482
template<class T> function_ref& operator=(T) = delete;
1348413483

1348513484
// \ref{func.wrap.ref.inv}, invocation
13486-
R operator()(ArgTypes...) const noexcept(noex);
13485+
R operator()(ArgTypes...) const noexcept(@\placeholder{noex}@);
1348713486

1348813487
private:
1348913488
template<class... T>
@@ -13494,9 +13493,9 @@
1349413493
template<class F>
1349513494
function_ref(F*) -> function_ref<F>;
1349613495
template<auto f>
13497-
function_ref(nontype_t<f>) -> function_ref<see below>;
13496+
function_ref(nontype_t<f>) -> function_ref<@\seebelow@>;
1349813497
template<auto f>
13499-
function_ref(nontype_t<f>, auto) -> function_ref<see below>;
13498+
function_ref(nontype_t<f>, auto) -> function_ref<@\seebelow@>;
1350013499
}
1350113500
\end{codeblock}
1350213501

@@ -13513,11 +13512,11 @@
1351313512
models \libconcept{copyable} and
1351413513
is capable of storing a pointer to object value or a pointer to function value.
1351513514
The type of \exposid{thunk-ptr} is
13516-
\tcode{R(*)(BoundEntityType, Args\&\&...) noexcept(noex)}.
13515+
\tcode{R(*)(BoundEntityType, Args\&\&...) noexcept(\placeholder{noex})}.
1351713516

1351813517
\pnum
1351913518
Each specialization of \tcode{function_ref} is
13520-
a trivially copyable type \ref{basic.types} that models \libconcept{copyable}.
13519+
a trivially copyable type\iref{basic.types} that models \libconcept{copyable}.
1352113520

1352213521
\pnum
1352313522
Within this subclause,
@@ -13623,7 +13622,7 @@
1362313622
\pnum
1362413623
\effects
1362513624
Initializes
13626-
\exposid{bound-entity} with a pointer to unspecified object or
13625+
\exposid{bound-entity} with a pointer to an unspecified object or
1362713626
null pointer value, and
1362813627
\exposid{thunk-ptr} with the address of a function \tcode{\placeholder{thunk}}
1362913628
such that
@@ -13732,7 +13731,6 @@
1373213731

1373313732
\rSec4[func.wrap.ref.deduct]{Deduction guides}
1373413733

13735-
\indexlibrarymember{operator()}{function_ref}%
1373613734
\begin{itemdecl}
1373713735
template<class F>
1373813736
function_ref(F*) -> function_ref<F>;
@@ -13744,7 +13742,6 @@
1374413742
\tcode{is_function_v<F>} is \tcode{true}.
1374513743
\end{itemdescr}
1374613744

13747-
\indexlibrarymember{operator()}{function_ref}%
1374813745
\begin{itemdecl}
1374913746
template<auto f>
1375013747
function_ref(nontype_t<f>) -> function_ref<@\seebelow@>;
@@ -13763,7 +13760,6 @@
1376313760
The deduced type is \tcode{function_ref<F>}.
1376413761
\end{itemdescr}
1376513762

13766-
\indexlibrarymember{operator()}{function_ref}%
1376713763
\begin{itemdecl}
1376813764
template<auto f, class T>
1376913765
function_ref(nontype_t<f>, T&&) -> function_ref<@\seebelow@>;
@@ -13797,6 +13793,7 @@
1379713793
\remarks
1379813794
The deduced type is \tcode{function_ref<R(A...) noexcept(E)>}.
1379913795
\end{itemdescr}
13796+
\indextext{function object!wrapper|)}
1380013797

1380113798
\rSec2[func.search]{Searchers}
1380213799

0 commit comments

Comments
 (0)