aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran/resolve.c
diff options
context:
space:
mode:
authorDaniel Franke <franke.daniel@gmail.com>2009-12-11 16:08:39 -0500
committerDaniel Franke <dfranke@gcc.gnu.org>2009-12-11 16:08:39 -0500
commitdcea1b2f86047a9b234fb742bdb3ce268262dfa7 (patch)
tree3c1409b090284617f01f8d1a0ed5716730972e99 /gcc/fortran/resolve.c
parent77cb940117db0b1873ccb4587b74499a0c1c4b73 (diff)
downloadgcc-dcea1b2f86047a9b234fb742bdb3ce268262dfa7.zip
gcc-dcea1b2f86047a9b234fb742bdb3ce268262dfa7.tar.gz
gcc-dcea1b2f86047a9b234fb742bdb3ce268262dfa7.tar.bz2
re PR fortran/40290 (Spurious warning on REAL*COMPLEX with -Wconversion)
2009-12-11 Daniel Franke <franke.daniel@gmail.com> PR fortran/40290 * expr.c (gfc_type_convert_binary): Added warn-on-conversion flag, passed on to gfc_convert_type_warn() instead of gfc_convert_type(); enabled warnings on all callers but ... * arith.c (eval_intrinsic): Disabled warnings on implicit type conversion. * gfortran.h gfc_type_convert_binary): Adjusted prototype. From-SVN: r155179
Diffstat (limited to 'gcc/fortran/resolve.c')
-rw-r--r--gcc/fortran/resolve.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index 8d2be53..00bd441 100644
--- a/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@ -3320,7 +3320,7 @@ resolve_operator (gfc_expr *e)
case INTRINSIC_POWER:
if (gfc_numeric_ts (&op1->ts) && gfc_numeric_ts (&op2->ts))
{
- gfc_type_convert_binary (e);
+ gfc_type_convert_binary (e, 1);
break;
}
@@ -3407,7 +3407,7 @@ resolve_operator (gfc_expr *e)
if (gfc_numeric_ts (&op1->ts) && gfc_numeric_ts (&op2->ts))
{
- gfc_type_convert_binary (e);
+ gfc_type_convert_binary (e, 1);
e->ts.type = BT_LOGICAL;
e->ts.kind = gfc_default_logical_kind;