From f51d8522f761fab8df285b2fa3aa8c6a931509c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20Schl=C3=BCter?= Date: Mon, 14 Jun 2004 21:25:33 +0200 Subject: [PATCH] Fix ChangeLog, fix parentheses from previous patch to trans-intrinsic.c From-SVN: r83128 --- gcc/fortran/ChangeLog | 2 +- gcc/fortran/trans-intrinsic.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 04e529005f1..57a9164b2d0 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,4 +1,4 @@ -2004-05-31 Tobias Schlueter +2004-06-14 Tobias Schlueter PR fortran/15211 * trans-intrinsic.c (gfc_conv_intrinsic_len): Deal with arrays diff --git a/gcc/fortran/trans-intrinsic.c b/gcc/fortran/trans-intrinsic.c index 67b6cc46dad..0c12353f240 100644 --- a/gcc/fortran/trans-intrinsic.c +++ b/gcc/fortran/trans-intrinsic.c @@ -1874,8 +1874,9 @@ gfc_conv_intrinsic_len (gfc_se * se, gfc_expr * expr) break; default: - if (arg->expr_type == EXPR_VARIABLE && arg->ref == NULL - || (arg->ref->next == NULL && arg->ref->type == REF_ARRAY)) + if (arg->expr_type == EXPR_VARIABLE + && (arg->ref == NULL || (arg->ref->next == NULL + && arg->ref->type == REF_ARRAY))) { /* This doesn't catch all cases. See http://gcc.gnu.org/ml/fortran/2004-06/msg00165.html