aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran/resolve.c
diff options
context:
space:
mode:
authorDaniel Franke <franke.daniel@gmail.com>2007-05-29 17:10:48 -0400
committerDaniel Franke <dfranke@gcc.gnu.org>2007-05-29 17:10:48 -0400
commitcd5ecab6a73af62791d39b85db942600ccc37dad (patch)
treea073a1400b9461ba32692af86f7f2c527a3cad86 /gcc/fortran/resolve.c
parentb7616c4045535a8eb987dfc0f2fed84c3efbc675 (diff)
downloadgcc-cd5ecab6a73af62791d39b85db942600ccc37dad.zip
gcc-cd5ecab6a73af62791d39b85db942600ccc37dad.tar.gz
gcc-cd5ecab6a73af62791d39b85db942600ccc37dad.tar.bz2
gfortran.h: Renamed 'enum gfc_generic_isym_id' to 'enum gfc_isym_id'...
2007-05-29 Daniel Franke <franke.daniel@gmail.com> * gfortran.h: Renamed 'enum gfc_generic_isym_id' to 'enum gfc_isym_id', added missing GFC_ISYM_* enumerators, ordered alphabetically. (struct gfc_intrinsic_sym): Renamed 'generic_id' to 'id'. (gfc_find_subroutine): New prototype. * intrinsic.c (add_sym, add_sym_*): Added argument 'id' and changed all callers. (find_subroutine): Renamed to 'gfc_find_subroutine', removed static. * dependency.c: Changed usage of isym->generic_id to isym->id. * openmp.c: Likewise. * resolve.c: Likewise. * trans-array.c: Likewise. * trans-expr.c: Likewise. * trans-intrinsic.c: Likewise. * trans-openmp.c: Likewise. From-SVN: r125168
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 6142081..8a9f167 100644
--- a/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@ -1179,7 +1179,7 @@ resolve_elemental_actual (gfc_expr *expr, gfc_code *c)
&& formal_optional
&& arg->expr->rank
&& (set_by_optional || arg->expr->rank != rank)
- && !(isym && isym->generic_id == GFC_ISYM_CONVERSION))
+ && !(isym && isym->id == GFC_ISYM_CONVERSION))
{
gfc_warning ("'%s' at %L is an array and OPTIONAL; IF IT IS "
"MISSING, it cannot be the actual argument of an "
@@ -1653,7 +1653,7 @@ resolve_function (gfc_expr *expr)
t = FAILURE;
}
-#define GENERIC_ID expr->value.function.isym->generic_id
+#define GENERIC_ID expr->value.function.isym->id
else if (expr->value.function.actual != NULL
&& expr->value.function.isym != NULL
&& GENERIC_ID != GFC_ISYM_LBOUND