Skip to content

Commit f2e173a

Browse files
committed
FIXUP (lib) misc fixes
1 parent 442b3b0 commit f2e173a

File tree

1 file changed

+8
-10
lines changed

1 file changed

+8
-10
lines changed

source/meta.tex

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4242,7 +4242,7 @@
42424242
\begin{itemdescr}
42434243
\pnum
42444244
Given a program point $P$,
4245-
let \tcode{\exposid{eval-point}(P)} be the following program point:
4245+
let \tcode{\exposid{eval-point}($P$)} be the following program point:
42464246
\begin{itemize}
42474247
\item
42484248
If a potentially-evaluated subexpression\iref{intro.execution}
@@ -4567,7 +4567,7 @@
45674567
\pnum
45684568
\returns
45694569
\tcode{true} if \tcode{is_accessible($R$, ctx)} is \tcode{false}
4570-
for any $R$ in \tcode{bases_of(\brk{}r, access_context\brk{}::unchecked())}.
4570+
for any $R$ in \tcode{bases_of(\brk{}r, access_context::\brk{}unchecked())}.
45714571
Otherwise, \tcode{false}.
45724572
\end{itemdescr}
45734573

@@ -5102,15 +5102,12 @@
51025102
\effects
51035103
Equivalent to:
51045104
\begin{codeblock}
5105-
%FIXME: this is inconsistent with reflect_constant,
5106-
%which uses if constexpr,
5107-
%and presumably, we could do the same here, with the same semantics.
5108-
if (is_reference_type(^^T)) {
5105+
if constexpr (is_reference_type(^^T)) {
51095106
return @\exposid{extract-ref}@<T>(r);
51105107
} else if constexpr (is_nonstatic_data_member(r) || is_function(r)) {
5111-
return @\exposid{extract-member-or-function}@<T>(r);
5108+
return @\exposid{extract-member-or-function}@<U>(r);
51125109
} else {
5113-
return @\exposid{extract-value}@<T>(constant_of(r));
5110+
return @\exposid{extract-value}@<U>(constant_of(r));
51145111
}
51155112
\end{codeblock}
51165113
\end{itemdescr}
@@ -5219,7 +5216,7 @@
52195216
\indexlibraryglobal{reflect_constant}%
52205217
\begin{itemdecl}
52215218
template<class T>
5222-
consteval info reflect_constant(T expr); // \expos
5219+
consteval info reflect_constant(T expr);
52235220
\end{itemdecl}
52245221

52255222
\begin{itemdescr}
@@ -5271,7 +5268,8 @@
52715268
static_assert(r2 == template_arguments_of(^^A<N{42}>)[0]);
52725269

52735270
constexpr info r3 = reflect_constant(K{nullptr}); // OK
5274-
constexpr info r4 = reflect_constant(K{"ebab"}); // error: constituent pointer points to string literal
5271+
constexpr info r4 = reflect_constant(K{"ebab"}); // error: constituent pointer
5272+
// points to string literal
52755273
\end{codeblock}
52765274
\end{example}
52775275
\end{itemdescr}

0 commit comments

Comments
 (0)