Skip to content

Commit a689a53

Browse files
jensmaurerzygoloid
authored andcommitted
[over.built] Avoid confusing term 'promoted arithmetic type'.
1 parent 051e701 commit a689a53

File tree

1 file changed

+11
-23
lines changed

1 file changed

+11
-23
lines changed

source/overloading.tex

Lines changed: 11 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3915,11 +3915,8 @@
39153915
\tcode{long}
39163916
but excluding e.g.
39173917
\tcode{char}).
3918-
Similarly, the term
3919-
\defn{promoted arithmetic type}
3920-
refers to floating-point types plus promoted integral types.
39213918
\begin{note}
3922-
In all cases where a promoted integral type or promoted arithmetic type is
3919+
In all cases where a promoted integral type is
39233920
required, an operand of enumeration type will be acceptable by way of the
39243921
integral promotions.
39253922
\end{note}
@@ -3993,8 +3990,7 @@
39933990
\end{codeblock}
39943991

39953992
\pnum
3996-
For every promoted arithmetic type
3997-
\tcode{\placeholder{T}},
3993+
For every floating-point or promoted integral type \tcode{\placeholder{T}},
39983994
there exist candidate operator functions of the form
39993995
\begin{codeblock}
40003996
@\placeholder{T}@ operator+(@\placeholder{T}@);
@@ -4032,10 +4028,9 @@
40324028
determination of the operator's result type.
40334029

40344030
\pnum
4035-
For every pair of promoted arithmetic types
4036-
\tcode{\placeholder{L}}
4037-
and
4038-
\tcode{\placeholder{R}},
4031+
For every pair of types \tcode{\placeholder{L}} and \tcode{\placeholder{R}},
4032+
where \tcode{\placeholder{L}} and \tcode{\placeholder{R}} are each
4033+
floating-point or promoted integral types,
40394034
there exist candidate operator functions of the form
40404035
\begin{codeblock}
40414036
@\placeholder{LR}@ operator*(@\placeholder{L}@, @\placeholder{R}@);
@@ -4140,15 +4135,9 @@
41404135

41414136
\pnum
41424137
For every triple
4143-
(\tcode{\placeholder{L}},
4144-
\cvqual{vq},
4145-
\tcode{\placeholder{R}}),
4146-
where
4147-
\tcode{\placeholder{L}}
4148-
is an arithmetic type,
4149-
and
4150-
\tcode{\placeholder{R}}
4151-
is a promoted arithmetic type,
4138+
(\tcode{\placeholder{L}}, \cvqual{vq}, \tcode{\placeholder{R}}),
4139+
where \tcode{\placeholder{L}} is an arithmetic type,
4140+
and \tcode{\placeholder{R}} is a floating-point or promoted integral type,
41524141
there exist candidate operator functions of the form
41534142
\begin{codeblock}
41544143
@\cvqual{vq} \placeholder{L}@& operator=(@\cvqual{vq} \placeholder{L}@&, @\placeholder{R}@);
@@ -4220,10 +4209,9 @@
42204209
\end{codeblock}
42214210

42224211
\pnum
4223-
For every pair of promoted arithmetic types
4224-
\tcode{\placeholder{L}}
4225-
and
4226-
\tcode{\placeholder{R}},
4212+
For every pair of types \tcode{\placeholder{L}} and \tcode{\placeholder{R}},
4213+
where \tcode{\placeholder{L}} and \tcode{\placeholder{R}} are each
4214+
floating-point or promoted integral types,
42274215
there exist candidate operator functions of the form
42284216
\begin{codeblock}
42294217
@\placeholder{LR}@ operator?:(bool, @\placeholder{L}@, @\placeholder{R}@);

0 commit comments

Comments
 (0)