Skip to content

Commit 3934ec8

Browse files
committed
Fixup: overloading
1 parent fa6b952 commit 3934ec8

File tree

1 file changed

+16
-8
lines changed

1 file changed

+16
-8
lines changed

source/overloading.tex

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -268,9 +268,13 @@
268268
Each such case also defines sets of \defnadj{permissible}{types}
269269
for explicit and non-explicit conversion functions;
270270
each (non-template) conversion function
271-
that is a non-hidden member of \tcode{S},
272-
yields a permissible type, and,
273-
for the former set, is non-explicit is also a candidate function.
271+
that
272+
\begin{itemize}
273+
\item is a non-hidden member of \tcode{S},
274+
\item yields a permissible type, and,
275+
\item for the former set, is non-explicit
276+
\end{itemize}
277+
is also a candidate function.
274278
If initializing an object, for any permissible type \cv{} \tcode{U}, any
275279
\cvqual{cv2} \tcode{U}, \cvqual{cv2} \tcode{U\&}, or \cvqual{cv2} \tcode{U\&\&}
276280
is also a permissible type.
@@ -452,14 +456,13 @@
452456
\grammarterm{expression-list}
453457
in the call augmented by the addition of an implied object
454458
argument as in a qualified function call.
455-
If the current class is, or is derived, from \tcode{T} and the keyword
459+
If the current class is, or is derived from, \tcode{T}, and the keyword
456460
\tcode{this}\iref{expr.prim.this} refers to it,
457461
then the implied object argument is \tcode{(*this)}.
458462
Otherwise,
459463
a contrived object of type
460464
\tcode{T}
461-
becomes the implied object
462-
argument.
465+
becomes the implied object argument
463466
\begin{footnote}
464467
An implied object argument is contrived to
465468
correspond to the implicit object
@@ -1029,11 +1032,16 @@
10291032
the candidate functions are selected as follows:
10301033
\begin{itemize}
10311034
\item
1032-
Let $R$ be a set of types including ``lvalue reference to \cvqual{cv2} \tcode{T2}''
1035+
Let $R$ be a set of types including
1036+
\begin{itemize}
1037+
\item
1038+
``lvalue reference to \cvqual{cv2} \tcode{T2}''
10331039
(when initializing an lvalue reference or an rvalue reference to function) and
1040+
\item
10341041
``\cvqual{cv2} \tcode{T2}''
1035-
or ``rvalue reference to \cvqual{cv2} \tcode{T2}'' (when initializing an
1042+
and ``rvalue reference to \cvqual{cv2} \tcode{T2}'' (when initializing an
10361043
rvalue reference or an lvalue reference to function)
1044+
\end{itemize}
10371045
for any \tcode{T2}.
10381046
The permissible types for non-explicit conversion functions are
10391047
the members of $R$

0 commit comments

Comments
 (0)