From: Tobias Schlüter <tobias.schlueter@physik.uni-muenchen.de>
Date: Mon, 14 Jun 2004 19:25:33 +0000 (+0200)
Subject: Fix ChangeLog, fix parentheses from previous patch to trans-intrinsic.c
X-Git-Tag: releases/gcc-4.0.0~7673
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f51d8522f761fab8df285b2fa3aa8c6a931509c3;p=thirdparty%2Fgcc.git

Fix ChangeLog, fix parentheses from previous patch to trans-intrinsic.c

From-SVN: r83128
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 04e529005f14..57a9164b2d09 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 67b6cc46dad7..0c12353f240f 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