aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorUros Bizjak <uros@gcc.gnu.org>2011-07-09 19:35:44 +0200
committerUros Bizjak <uros@gcc.gnu.org>2011-07-09 19:35:44 +0200
commit4dc694b226b1d9372fc5e224495a5c303809387c (patch)
treef1fef9e6e62c7949b4096c1d2cbda936f72d7f58 /gcc
parent20888def1b70428012f4163348d294cdb94ca5f8 (diff)
downloadgcc-4dc694b226b1d9372fc5e224495a5c303809387c.zip
gcc-4dc694b226b1d9372fc5e224495a5c303809387c.tar.gz
gcc-4dc694b226b1d9372fc5e224495a5c303809387c.tar.bz2
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
Diffstat (limited to 'gcc')
-rw-r--r--gcc/fortran/ChangeLog8
-rw-r--r--gcc/fortran/expr.c2
-rw-r--r--gcc/fortran/gfortran.h2
3 files changed, 9 insertions, 3 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index fef1944..484315f 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2011-07-09 Uros Bizjak <ubizjak@gmail.com>
+
+ 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 <mikael.morin@sfr.fr>
PR fortran/49648
@@ -12,7 +18,7 @@
2011-07-06 Daniel Carrera <dcarrera@gmail.com>
* 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 6dcfda1..6db0836 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 2eb497a..328dfbe 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 *);