diff options
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/iresolve.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index b1bec37..6e588c6 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,5 +1,11 @@ 2009-12-10 Daniel Franke <franke.daniel@gmail.com> + PR fortran/40287 + * iresolve.c (resolve_mask_arg): Disabled warning on conversion + to LOGICAL(1). + +2009-12-10 Daniel Franke <franke.daniel@gmail.com> + PR fortran/41369 * parse.c (match_deferred_characteristics): Removed check for empty types in function return values. diff --git a/gcc/fortran/iresolve.c b/gcc/fortran/iresolve.c index 7e8bdfb..1f8f9bc 100644 --- a/gcc/fortran/iresolve.c +++ b/gcc/fortran/iresolve.c @@ -106,7 +106,7 @@ resolve_mask_arg (gfc_expr *mask) { ts.type = BT_LOGICAL; ts.kind = 1; - gfc_convert_type (mask, &ts, 2); + gfc_convert_type_warn (mask, &ts, 2, 0); } } } |