Skip to content

Commit 8003b62

Browse files
authored
[expr, temp.arg.nontype] Use 'pointer to' instead of 'address of' (#6174)
Specifically, in: * [expr.prim.lambda.closure]p8, p11 * [expr.const]p13.3 * [temp.arg.nontype]p3
1 parent 939e18a commit 8003b62

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

source/expressions.tex

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2137,9 +2137,9 @@
21372137
has a non-throwing exception specification.
21382138
If the function call operator is a static member function,
21392139
then the value returned by this conversion function is
2140-
the address of the function call operator.
2140+
a pointer to the function call operator.
21412141
Otherwise, the value returned by this conversion function
2142-
is the address of a function \tcode{F} that, when invoked,
2142+
is a pointer to a function \tcode{F} that, when invoked,
21432143
has the same effect as invoking the closure type's function call operator
21442144
on a default-constructed instance of the closure type.
21452145
\tcode{F} is a constexpr function
@@ -2214,10 +2214,10 @@
22142214
If the function call operator template is a static member function template,
22152215
then the value returned by
22162216
any given specialization of this conversion function template is
2217-
the address of the corresponding function call operator template specialization.
2217+
a pointer to the corresponding function call operator template specialization.
22182218
Otherwise,
22192219
the value returned by any given specialization of this conversion function
2220-
template is the address of a function \tcode{F} that, when invoked, has the same
2220+
template is a pointer to a function \tcode{F} that, when invoked, has the same
22212221
effect as invoking the generic lambda's corresponding function call operator
22222222
template specialization on a default-constructed instance of the closure type.
22232223
\tcode{F} is a constexpr function
@@ -7986,10 +7986,10 @@
79867986
it does not have an indeterminate or erroneous value\iref{basic.indet},
79877987

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

79957995
\item

source/templates.tex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1200,8 +1200,8 @@
12001200
For a non-type \grammarterm{template-parameter} of reference or pointer type,
12011201
or for each non-static data member of reference or pointer type
12021202
in a non-type \grammarterm{template-parameter} of class type or subobject thereof,
1203-
the reference or pointer value shall not refer to
1204-
or be the address of (respectively):
1203+
the reference or pointer value shall not refer
1204+
or point to (respectively):
12051205
\begin{itemize}
12061206
\item a temporary object\iref{class.temporary},
12071207
\item a string literal object\iref{lex.string},

0 commit comments

Comments
 (0)