procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

c-typeck.c (build_conditional_expr): Handle complex data types.

Browse source 
2000-06-06  Gabriel Dos Reis  <gdr@codesourcery.com>

        * c-typeck.c (build_conditional_expr): Handle complex data types.

From-SVN: r34422
This commit is contained in:
Gabriel Dos Reis 2000-06-06 06:55:35 +00:00 • committed by Gabriel Dos Reis
parent 258a120bab
commit f519a4527d
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gcc/ChangeLog
View file

@ -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...

6
gcc/c-typeck.c
View file

@ -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);