diff options
| author | ghazi <ghazi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-07-19 16:22:12 +0000 |
|---|---|---|
| committer | ghazi <ghazi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-07-19 16:22:12 +0000 |
| commit | dcb1b019e865f2ed8c7161b54dcf438477ab6e6b (patch) | |
| tree | eed351bb3b2763a12eff13217ad87938370c269c /gcc/fortran/openmp.c | |
| parent | 41694d7cb8dc338c3a33248b1429ae94648aa3ab (diff) | |
| download | gcc-dcb1b019e865f2ed8c7161b54dcf438477ab6e6b.tar.gz | |
* 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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@137981 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/fortran/openmp.c')
| -rw-r--r-- | gcc/fortran/openmp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gcc/fortran/openmp.c b/gcc/fortran/openmp.c index 28f1cc24dfd..9ac9a4aec91 100644 --- a/gcc/fortran/openmp.c +++ b/gcc/fortran/openmp.c @@ -1093,7 +1093,7 @@ resolve_omp_atomic (gfc_code *code) if (expr2->expr_type == EXPR_OP) { gfc_expr *v = NULL, *e, *c; - gfc_intrinsic_op op = expr2->value.op.operator; + gfc_intrinsic_op op = expr2->value.op.op; gfc_intrinsic_op alt_op = INTRINSIC_NONE; switch (op) @@ -1156,8 +1156,8 @@ resolve_omp_atomic (gfc_code *code) else if ((c = is_conversion (e, true)) != NULL) q = &e->value.function.actual->expr; else if (e->expr_type != EXPR_OP - || (e->value.op.operator != op - && e->value.op.operator != alt_op) + || (e->value.op.op != op + && e->value.op.op != alt_op) || e->rank != 0) break; else @@ -1176,7 +1176,7 @@ resolve_omp_atomic (gfc_code *code) if (p != NULL) { e = *p; - switch (e->value.op.operator) + switch (e->value.op.op) { case INTRINSIC_MINUS: case INTRINSIC_DIVIDE: |