From b661c7b96fe0674925d8ca6621ccb5d014950c00 Mon Sep 17 00:00:00 2001 From: Krystian Stasiowski Date: Wed, 29 Apr 2020 05:01:25 -0400 Subject: [PATCH 1/2] [conv.integral] Exclude boolean conversions from integral conversions --- source/expressions.tex | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/source/expressions.tex b/source/expressions.tex index d44a832ce4..19d1b2cfc4 100644 --- a/source/expressions.tex +++ b/source/expressions.tex @@ -928,8 +928,7 @@ \pnum \indextext{conversion!bool@\tcode{bool}}% -If the destination type is \keyword{bool}, see~\ref{conv.bool}. If the -source type is \keyword{bool}, the value \keyword{false} is converted to +If the source type is \keyword{bool}, the value \keyword{false} is converted to zero and the value \keyword{true} is converted to one. \pnum @@ -940,8 +939,8 @@ where $N$ is the width of the destination type. \pnum -The conversions allowed as integral promotions are excluded from the set -of integral conversions. +The conversions performed by integral promotions and boolean conversions are +excluded from the set of integral conversions. \rSec2[conv.double]{Floating-point conversions} From 74b7a356260ef9a6b8920fc380fc75e82b027de9 Mon Sep 17 00:00:00 2001 From: Krystian Stasiowski Date: Wed, 29 Apr 2020 05:06:08 -0400 Subject: [PATCH 2/2] [conv.double] Floating-point promotion is a single conversion --- source/expressions.tex | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/expressions.tex b/source/expressions.tex index 19d1b2cfc4..96cb2fee16 100644 --- a/source/expressions.tex +++ b/source/expressions.tex @@ -939,7 +939,7 @@ where $N$ is the width of the destination type. \pnum -The conversions performed by integral promotions and boolean conversions are +The conversions allowed as integral promotions and boolean conversions are excluded from the set of integral conversions. \rSec2[conv.double]{Floating-point conversions} @@ -961,7 +961,7 @@ Otherwise, the behavior is undefined. \pnum -The conversions allowed as floating-point promotions are excluded from +Floating-point promotion is excluded from the set of floating-point conversions. \rSec2[conv.fpint]{Floating-integral conversions}