diff options
| author | Dodji Seketeli <dodji@redhat.com> | 2009-01-05 22:41:37 +0000 |
|---|---|---|
| committer | Dodji Seketeli <dodji@gcc.gnu.org> | 2009-01-05 23:41:37 +0100 |
| commit | 6f9b088b5ad5ee9b271f3a1f02a66a51bc79cd43 (patch) | |
| tree | fc78ffeccd5255b98105727c44ec3be2fd10e80c /gcc | |
| parent | 5641785fdca4ec156a81efc80c979287f6eac30b (diff) | |
| download | gcc-6f9b088b5ad5ee9b271f3a1f02a66a51bc79cd43.zip gcc-6f9b088b5ad5ee9b271f3a1f02a66a51bc79cd43.tar.gz gcc-6f9b088b5ad5ee9b271f3a1f02a66a51bc79cd43.tar.bz2 | |
re PR c++/38472 (Wrong result type of ternary operator)
gcc/cp/ChangeLog:
2009-01-05 Dodji Seketeli <dodji@redhat.com>
PR c++/38472
* typeck.c (type_after_usual_arithmetic_conversions): Fix a typo.
Promotion should be done only for integral or enumeration types.
gcc/testsuite/ChangeLog:
2009-01-05 Dodji Seketeli <dodji@redhat.com>
PR c++/38472
* g++.dg/conversion/usual-arith-conv.C: New test.
From-SVN: r143101
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/typeck.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 |
3 files changed, 11 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 7c5ae83..cc4fce1 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2009-01-05 Dodji Seketeli <dodji@redhat.com> + + PR c++/38472 + * typeck.c (type_after_usual_arithmetic_conversions): Fix a typo. + 2009-01-05 Jason Merrill <jason@redhat.com> PR c++/38701 diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index ed01c51..4be7a25 100644 --- a/gcc/cp/typeck.c +++ b/gcc/cp/typeck.c @@ -403,7 +403,7 @@ type_after_usual_arithmetic_conversions (tree t1, tree t2) /* Perform the integral promotions. We do not promote real types here. */ if (INTEGRAL_OR_ENUMERATION_TYPE_P (t1) - && INTEGRAL_OR_ENUMERATION_TYPE_P (t1)) + && INTEGRAL_OR_ENUMERATION_TYPE_P (t2)) { t1 = type_promotes_to (t1); t2 = type_promotes_to (t2); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 46d2881..f401ff5 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2009-01-05 Dodji Seketeli <dodji@redhat.com> + + PR c++/38472 + * g++.dg/conversion/usual-arith-conv.C: New test. + 2009-01-05 Andrew Pinski <andrew_pinski@playstation.sony.com> PR c/34911 |