diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/typeck2.c | 7 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/init/complex1.C | 7 |
4 files changed, 21 insertions, 4 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index d401f88..3dc8225 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2006-06-12 Roger Sayle <roger@eyesopen.com> + + PR c++/21210 + * typeck2.c (build_functional_cast): Use cp_convert to construct + non-aggregate initializers instead of the user-level build_c_cast. + 2006-06-07 Volker Reichelt <reichelt@igpm.rwth-aachen.de> PR c++/27601 diff --git a/gcc/cp/typeck2.c b/gcc/cp/typeck2.c index 97d5eaa..f4de802 100644 --- a/gcc/cp/typeck2.c +++ b/gcc/cp/typeck2.c @@ -1299,12 +1299,11 @@ build_functional_cast (tree exp, tree parms) if (! IS_AGGR_TYPE (type)) { - /* This must build a C cast. */ if (parms == NULL_TREE) - parms = integer_zero_node; - else - parms = build_x_compound_expr_from_list (parms, "functional cast"); + return cp_convert (type, integer_zero_node); + /* This must build a C cast. */ + parms = build_x_compound_expr_from_list (parms, "functional cast"); return build_c_cast (type, parms); } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index a4fbcd4..8e5d2c0 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2006-06-12 Roger Sayle <roger@eyesopen.com> + + PR c++/21210 + * g++.dg/init/complex1.C: New test case. + 2006-06-11 Eric Christopher <echristo@apple.com> PR middle-end/27948 diff --git a/gcc/testsuite/g++.dg/init/complex1.C b/gcc/testsuite/g++.dg/init/complex1.C new file mode 100644 index 0000000..3f88fd9 --- /dev/null +++ b/gcc/testsuite/g++.dg/init/complex1.C @@ -0,0 +1,7 @@ +/* PR c++/21210 */ +/* { dg-do compile } */ +/* { dg-options "-O2" } */ + +typedef float __complex__ fcomplex; +fcomplex cplx = fcomplex(); + |