aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran/openmp.c
diff options
context:
space:
mode:
authorJan Hubicka <hubicka@ucw.cz>2014-09-22 21:41:02 +0200
committerJan Hubicka <hubicka@gcc.gnu.org>2014-09-22 19:41:02 +0000
commit46842bfe9c5fb7f609917cad8d3ec8cc5ff30bea (patch)
tree81a83ef7308d61e0af0e1f1e3ed2c94921012d73 /gcc/fortran/openmp.c
parent114783066e5d1046dfe83bb987008f4c2729e8f6 (diff)
downloadgcc-46842bfe9c5fb7f609917cad8d3ec8cc5ff30bea.zip
gcc-46842bfe9c5fb7f609917cad8d3ec8cc5ff30bea.tar.gz
gcc-46842bfe9c5fb7f609917cad8d3ec8cc5ff30bea.tar.bz2
tree-ssa-ccp.c (prop_value_d): Rename to ...
* tree-ssa-ccp.c (prop_value_d): Rename to ... (ccp_prop_value_t): ... this one to avoid ODR violation; update uses. * ipa-prop.c (struct type_change_info): Rename to ... (prop_type_change_info): ... this; update uses. * ggc-page.c (globals): Rename to ... (static struct ggc_globals): ... this; update uses. * tree-ssa-loop-im.c (mem_ref): Rename to ... (im_mem_ref): ... this; update uses. * ggc-common.c (loc_descriptor): Rename to ... (ggc_loc_descriptor): ... this; update uses. * lra-eliminations.c (elim_table): Rename to ... (lra_elim_table): ... this; update uses. * bitmap.c (output_info): Rename to ... (bitmap_output_info): ... this; update uses. * gcse.c (expr): Rename to ... (gcse_expr) ... this; update uses. (occr): Rename to ... (gcse_occr): .. this; update uses. * tree-ssa-copy.c (prop_value_d): Rename to ... (prop_value_t): ... this. * predict.c (block_info_def): Rename to ... (block_info): ... this; update uses. (edge_info_def): Rename to ... (edge_info): ... this; update uses. * profile.c (bb_info): Rename to ... (bb_profile_info): ... this; update uses. * alloc-pool.c (output_info): Rename to ... (pool_output_info): ... this; update uses. * ipa-cp.c (topo_info): Rename to .. (ipa_topo_info): ... this; update uses. * tree-nrv.c (nrv_data): Rename to ... (nrv_data_t): ... this; update uses. * ipa-split.c (bb_info): Rename to ... (split_bb_info): ... this one. * profile.h (edge_info): Rename to ... (edge_profile_info): ... this one; update uses. * dse.c (bb_info): Rename to ... (dse_bb_info): ... this one; update uses. * cprop.c (occr): Rename to ... (cprop_occr): ... this one; update uses. (expr): Rename to ... (cprop_expr): ... this one; update uses. From-SVN: r215481
Diffstat (limited to 'gcc/fortran/openmp.c')
-rw-r--r--gcc/fortran/openmp.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/gcc/fortran/openmp.c b/gcc/fortran/openmp.c
index 217fce7..3ee0f92 100644
--- a/gcc/fortran/openmp.c
+++ b/gcc/fortran/openmp.c
@@ -3015,12 +3015,12 @@ resolve_omp_atomic (gfc_code *code)
}
-struct omp_context
+struct fortran_omp_context
{
gfc_code *code;
hash_set<gfc_symbol *> *sharing_clauses;
hash_set<gfc_symbol *> *private_iterators;
- struct omp_context *previous;
+ struct fortran_omp_context *previous;
} *omp_current_ctx;
static gfc_code *omp_current_do_code;
static int omp_current_do_collapse;
@@ -3056,7 +3056,7 @@ gfc_resolve_omp_do_blocks (gfc_code *code, gfc_namespace *ns)
void
gfc_resolve_omp_parallel_blocks (gfc_code *code, gfc_namespace *ns)
{
- struct omp_context ctx;
+ struct fortran_omp_context ctx;
gfc_omp_clauses *omp_clauses = code->ext.omp_clauses;
gfc_omp_namelist *n;
int list;
@@ -3126,7 +3126,7 @@ gfc_omp_save_and_clear_state (struct gfc_omp_saved_state *state)
void
gfc_omp_restore_state (struct gfc_omp_saved_state *state)
{
- omp_current_ctx = (struct omp_context *) state->ptrs[0];
+ omp_current_ctx = (struct fortran_omp_context *) state->ptrs[0];
omp_current_do_code = (gfc_code *) state->ptrs[1];
omp_current_do_collapse = state->ints[0];
}