diff options
| author | gdr <gdr@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-06-06 06:55:35 +0000 |
|---|---|---|
| committer | gdr <gdr@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-06-06 06:55:35 +0000 |
| commit | a5fd2a031ed5267f6b566db70f383402003e925d (patch) | |
| tree | 9898fac54975ec4c2b90ba66de289c3e8714fb21 | |
| parent | 16f017712ac996fe9aa5d7eb16a33d528cd899dc (diff) | |
| download | ppe42-gcc-a5fd2a031ed5267f6b566db70f383402003e925d.tar.gz ppe42-gcc-a5fd2a031ed5267f6b566db70f383402003e925d.zip | |
2000-06-06 Gabriel Dos Reis <gdr@codesourcery.com>
* c-typeck.c (build_conditional_expr): Handle complex data types.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@34422 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/c-typeck.c | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index bb74239d12a..10564342a66 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2000-06-06 Gabriel Dos Reis <gdr@codesourcery.com> + + * c-typeck.c (build_conditional_expr): Handle complex data types. + 2000-06-05 Jason Merrill <jason@casey.soma.redhat.com> * explow.c (maybe_set_unchanging): New function, broken out from... diff --git a/gcc/c-typeck.c b/gcc/c-typeck.c index f58845692ac..c4065b4c89e 100644 --- a/gcc/c-typeck.c +++ b/gcc/c-typeck.c @@ -3358,8 +3358,10 @@ build_conditional_expr (ifexp, op1, op2) else result_type = TYPE_MAIN_VARIANT (type1); } - else if ((code1 == INTEGER_TYPE || code1 == REAL_TYPE) - && (code2 == INTEGER_TYPE || code2 == REAL_TYPE)) + else if ((code1 == INTEGER_TYPE || code1 == REAL_TYPE + || code1 == COMPLEX_TYPE) + && (code2 == INTEGER_TYPE || code2 == REAL_TYPE + || code2 == COMPLEX_TYPE)) { result_type = common_type (type1, type2); |
