Skip to content

Commit ab95437

Browse files
committed
[expr], [temp.arg.nontype] Use 'pointer to' instead of 'address of'
Specifically, in: * [expr.prim.lambda.closure]/8, /11 * [expr.const]/13.3 * [temp.arg.nontype]/3
1 parent 4fac9f9 commit ab95437

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
@@ -2040,9 +2040,9 @@
20402040
has a non-throwing exception specification.
20412041
If the function call operator is a static member function,
20422042
then the value returned by this conversion function is
2043-
the address of the function call operator.
2043+
a pointer to the function call operator.
20442044
Otherwise, the value returned by this conversion function
2045-
is the address of a function \tcode{F} that, when invoked,
2045+
is a pointer to a function \tcode{F} that, when invoked,
20462046
has the same effect as invoking the closure type's function call operator
20472047
on a default-constructed instance of the closure type.
20482048
\tcode{F} is a constexpr function
@@ -2115,10 +2115,10 @@
21152115
If the function call operator template is a static member function template,
21162116
then the value returned by
21172117
any given specialization of this conversion function template is
2118-
the address of the corresponding function call operator template specialization.
2118+
a pointer to the corresponding function call operator template specialization.
21192119
Otherwise,
21202120
the value returned by any given specialization of this conversion function
2121-
template is the address of a function \tcode{F} that, when invoked, has the same
2121+
template is a pointer to a function \tcode{F} that, when invoked, has the same
21222122
effect as invoking the generic lambda's corresponding function call operator
21232123
template specialization on a default-constructed instance of the closure type.
21242124
\tcode{F} is a constexpr function
@@ -7777,10 +7777,10 @@
77777777
it does not have an indeterminate value\iref{basic.indet},
77787778

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

77867786
\item

source/templates.tex

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

0 commit comments

Comments
 (0)