diff options
| author | Tobias Schlüter <tobias.schlueter@physik.uni-muenchen.de> | 2004-06-14 21:25:33 +0200 |
|---|---|---|
| committer | Tobias Schlüter <tobi@gcc.gnu.org> | 2004-06-14 21:25:33 +0200 |
| commit | f51d8522f761fab8df285b2fa3aa8c6a931509c3 (patch) | |
| tree | a717646cc98b7d11b0cc78edb87de03a959b1f24 | |
| parent | 7031baf4de70d1f280df2c3837861ca042ae79b8 (diff) | |
| download | gcc-f51d8522f761fab8df285b2fa3aa8c6a931509c3.zip gcc-f51d8522f761fab8df285b2fa3aa8c6a931509c3.tar.gz gcc-f51d8522f761fab8df285b2fa3aa8c6a931509c3.tar.bz2 | |
Fix ChangeLog, fix parentheses from previous patch to trans-intrinsic.c
From-SVN: r83128
| -rw-r--r-- | gcc/fortran/ChangeLog | 2 | ||||
| -rw-r--r-- | gcc/fortran/trans-intrinsic.c | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 04e5290..57a9164 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,4 +1,4 @@ -2004-05-31 Tobias Schlueter <tobias.schlueter@physik.uni-muenchen.de> +2004-06-14 Tobias Schlueter <tobias.schlueter@physik.uni-muenchen.de> 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 67b6cc4..0c12353 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 |