From 4dc694b226b1d9372fc5e224495a5c303809387c Mon Sep 17 00:00:00 2001 From: Uros Bizjak Date: Sat, 9 Jul 2011 19:35:44 +0200 Subject: [PATCH] re PR fortran/48926 (gfortran.dg/coarray/image_index_1.f90 -fcoarray=single -O2 (test for excess errors)) PR fortran/48926 * expr.c (gfc_get_corank): Change return value to int. * gfortran.h (gfc_get_corank): Update function prototype. From-SVN: r176088 --- gcc/fortran/ChangeLog | 8 +++++++- gcc/fortran/expr.c | 2 +- gcc/fortran/gfortran.h | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index fef19449436..484315f9c99 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2011-07-09 Uros Bizjak + + PR fortran/48926 + * expr.c (gfc_get_corank): Change return value to int. + * gfortran.h (gfc_get_corank): Update function prototype. + 2011-07-07 Mikael Morin PR fortran/49648 @@ -12,7 +18,7 @@ 2011-07-06 Daniel Carrera * trans-array.c (gfc_array_allocate): Rename allocatable_array to - allocatable. Rename function gfc_allocate_array_with_status to + allocatable. Rename function gfc_allocate_array_with_status to gfc_allocate_allocatable_with_status. Update function call for gfc_allocate_with_status. * trans-opemp.c (gfc_omp_clause_default_ctor): Rename function diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c index 6dcfda1e53a..6db08366f7d 100644 --- a/gcc/fortran/expr.c +++ b/gcc/fortran/expr.c @@ -4143,7 +4143,7 @@ gfc_is_coindexed (gfc_expr *e) } -bool +int gfc_get_corank (gfc_expr *e) { int corank; diff --git a/gcc/fortran/gfortran.h b/gcc/fortran/gfortran.h index 2eb497a2062..328dfbea1b7 100644 --- a/gcc/fortran/gfortran.h +++ b/gcc/fortran/gfortran.h @@ -2734,7 +2734,7 @@ void gfc_expr_replace_comp (gfc_expr *, gfc_component *); bool gfc_is_proc_ptr_comp (gfc_expr *, gfc_component **); bool gfc_is_coindexed (gfc_expr *); -bool gfc_get_corank (gfc_expr *); +int gfc_get_corank (gfc_expr *); bool gfc_has_ultimate_allocatable (gfc_expr *); bool gfc_has_ultimate_pointer (gfc_expr *); -- 2.30.2