diff options
| author | Kaveh R. Ghazi <ghazi@caip.rutgers.edu> | 2008-07-19 16:22:12 +0000 |
|---|---|---|
| committer | Kaveh Ghazi <ghazi@gcc.gnu.org> | 2008-07-19 16:22:12 +0000 |
| commit | a1ee985fa319b7a55e52ddd62f266e42ef9ae067 (patch) | |
| tree | eed351bb3b2763a12eff13217ad87938370c269c /gcc/fortran/decl.c | |
| parent | 9aa433c2945d1f8d62961452bcd4e07f509815a8 (diff) | |
| download | gcc-a1ee985fa319b7a55e52ddd62f266e42ef9ae067.zip gcc-a1ee985fa319b7a55e52ddd62f266e42ef9ae067.tar.gz gcc-a1ee985fa319b7a55e52ddd62f266e42ef9ae067.tar.bz2 | |
gfortran.h (operator): Remove macro.
* gfortran.h (operator): Remove macro.
(gfc_namespace, gfc_expr): Avoid C++ keywords.
* arith.c (eval_intrinsic, eval_intrinsic_f2, eval_intrinsic_f3):
Likewise.
* decl.c (access_attr_decl): Likewise.
* dependency.c (gfc_dep_compare_expr): Likewise.
* dump-parse-tree.c (show_expr, show_uop, show_namespace):
Likewise.
* expr.c (gfc_copy_expr, gfc_type_convert_binary,
simplify_intrinsic_op, check_intrinsic_op): Likewise.
* interface.c (fold_unary, gfc_match_generic_spec,
gfc_match_interface, gfc_match_end_interface,
check_operator_interface, check_uop_interfaces,
gfc_check_interfaces, gfc_extend_expr, gfc_extend_assign,
gfc_add_interface, gfc_current_interface_head,
gfc_set_current_interface_head): Likewise.
* iresolve.c (gfc_resolve_dot_product, gfc_resolve_matmul):
Likewise.
* matchexp.c (gfc_get_parentheses, build_node): Likewise.
* module.c (gfc_use_rename, gfc_match_use, find_use_name_n,
number_use_names, mio_expr, load_operator_interfaces, read_module,
write_operator, write_module): Likewise.
* openmp.c (resolve_omp_atomic): Likewise.
* resolve.c (resolve_operator, gfc_resolve_character_operator,
gfc_resolve_uops): Likewise.
* symbol.c (free_uop_tree, gfc_free_namespace): Likewise.
* trans-expr.c (gfc_conv_expr_op): Likewise.
* trans-openmp.c (gfc_trans_omp_atomic): Likewise.
From-SVN: r137981
Diffstat (limited to 'gcc/fortran/decl.c')
| -rw-r--r-- | gcc/fortran/decl.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c index d23a329..9fd54c5 100644 --- a/gcc/fortran/decl.c +++ b/gcc/fortran/decl.c @@ -5630,7 +5630,7 @@ access_attr_decl (gfc_statement st) interface_type type; gfc_user_op *uop; gfc_symbol *sym; - gfc_intrinsic_op operator; + gfc_intrinsic_op op; match m; if (gfc_match (" ::") == MATCH_NO && gfc_match_space () == MATCH_NO) @@ -5638,7 +5638,7 @@ access_attr_decl (gfc_statement st) for (;;) { - m = gfc_match_generic_spec (&type, name, &operator); + m = gfc_match_generic_spec (&type, name, &op); if (m == MATCH_NO) goto syntax; if (m == MATCH_ERROR) @@ -5662,15 +5662,15 @@ access_attr_decl (gfc_statement st) break; case INTERFACE_INTRINSIC_OP: - if (gfc_current_ns->operator_access[operator] == ACCESS_UNKNOWN) + if (gfc_current_ns->operator_access[op] == ACCESS_UNKNOWN) { - gfc_current_ns->operator_access[operator] = + gfc_current_ns->operator_access[op] = (st == ST_PUBLIC) ? ACCESS_PUBLIC : ACCESS_PRIVATE; } else { gfc_error ("Access specification of the %s operator at %C has " - "already been specified", gfc_op2string (operator)); + "already been specified", gfc_op2string (op)); goto done; } |