Skip to content

Commit

Permalink
[expr, temp.arg.nontype] Use 'pointer to' instead of 'address of' (#6174
Browse files Browse the repository at this point in the history
)

Specifically, in:
 * [expr.prim.lambda.closure]p8, p11
 * [expr.const]p13.3
 * [temp.arg.nontype]p3
  • Loading branch information
lprv authored Oct 16, 2024
1 parent 939e18a commit 8003b62
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
16 changes: 8 additions & 8 deletions source/expressions.tex
Original file line number Diff line number Diff line change
Expand Up @@ -2137,9 +2137,9 @@
has a non-throwing exception specification.
If the function call operator is a static member function,
then the value returned by this conversion function is
the address of the function call operator.
a pointer to the function call operator.
Otherwise, the value returned by this conversion function
is the address of a function \tcode{F} that, when invoked,
is a pointer to a function \tcode{F} that, when invoked,
has the same effect as invoking the closure type's function call operator
on a default-constructed instance of the closure type.
\tcode{F} is a constexpr function
Expand Down Expand Up @@ -2214,10 +2214,10 @@
If the function call operator template is a static member function template,
then the value returned by
any given specialization of this conversion function template is
the address of the corresponding function call operator template specialization.
a pointer to the corresponding function call operator template specialization.
Otherwise,
the value returned by any given specialization of this conversion function
template is the address of a function \tcode{F} that, when invoked, has the same
template is a pointer to a function \tcode{F} that, when invoked, has the same
effect as invoking the generic lambda's corresponding function call operator
template specialization on a default-constructed instance of the closure type.
\tcode{F} is a constexpr function
Expand Down Expand Up @@ -7986,10 +7986,10 @@
it does not have an indeterminate or erroneous value\iref{basic.indet},

\item
if the value is of pointer type, it contains
the address of an object with static storage duration,
the address past the end of such an object\iref{expr.add},
the address of a non-immediate function,
if the value is of pointer type, it is
a pointer to an object with static storage duration,
a pointer past the end of such an object\iref{expr.add},
a pointer to a non-immediate function,
or a null pointer value,

\item
Expand Down
4 changes: 2 additions & 2 deletions source/templates.tex
Original file line number Diff line number Diff line change
Expand Up @@ -1200,8 +1200,8 @@
For a non-type \grammarterm{template-parameter} of reference or pointer type,
or for each non-static data member of reference or pointer type
in a non-type \grammarterm{template-parameter} of class type or subobject thereof,
the reference or pointer value shall not refer to
or be the address of (respectively):
the reference or pointer value shall not refer
or point to (respectively):
\begin{itemize}
\item a temporary object\iref{class.temporary},
\item a string literal object\iref{lex.string},
Expand Down

0 comments on commit 8003b62

Please sign in to comment.