diff options
| author | Jerry DeLisle <jvdelisle@gcc.gnu.org> | 2018-09-02 15:55:51 +0000 |
|---|---|---|
| committer | Jerry DeLisle <jvdelisle@gcc.gnu.org> | 2018-09-02 15:55:51 +0000 |
| commit | 636b78f0a3e9b530d71086c28acd98bbb7c87fbf (patch) | |
| tree | 48f239556d6ffc5ff4162f548060204cff26ade5 | |
| parent | b5764229c1ea7ef49d480eca3c13ee460da45a56 (diff) | |
| download | gcc-636b78f0a3e9b530d71086c28acd98bbb7c87fbf.zip gcc-636b78f0a3e9b530d71086c28acd98bbb7c87fbf.tar.gz gcc-636b78f0a3e9b530d71086c28acd98bbb7c87fbf.tar.bz2 | |
io.h: Change declaration of vlist type to gfc_full_array_i4 to eliminate warning for...
2018-09-01 Jerry DeLisle <jvdelisle@gcc.gnu.org>
* io/io.h: Change declaration of vlist type to
gfc_full_array_i4 to eliminate warning for mismatched type.
* io/format.c ((parse_format_list): Use gfc_full_array_i4.
* io/io.h: Use gfc_full_array_i4.
From-SVN: r264043
| -rw-r--r-- | libgfortran/ChangeLog | 7 | ||||
| -rw-r--r-- | libgfortran/io/format.c | 2 | ||||
| -rw-r--r-- | libgfortran/io/format.h | 2 | ||||
| -rw-r--r-- | libgfortran/io/io.h | 3 |
4 files changed, 11 insertions, 3 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 76228e2..ca5e7b9 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,10 @@ +2018-09-01 Jerry DeLisle <jvdelisle@gcc.gnu.org> + + * io/io.h: Change declaration of vlist type to + gfc_full_array_i4 to eliminate warning for mismatched type. + * io/format.c ((parse_format_list): Use gfc_full_array_i4. + * io/io.h: Use gfc_full_array_i4. + 2018-08-25 Thomas Koenig <tkoenig@gcc.gnu.org> PR libfortran/86704 diff --git a/libgfortran/io/format.c b/libgfortran/io/format.c index b4920aa..f5d3158 100644 --- a/libgfortran/io/format.c +++ b/libgfortran/io/format.c @@ -1058,7 +1058,7 @@ parse_format_list (st_parameter_dt *dtp, bool *seen_dd) { /* We have parsed the complete vlist so initialize the array descriptor and save it in the format node. */ - gfc_array_i4 *vp = tail->u.udf.vlist; + gfc_full_array_i4 *vp = tail->u.udf.vlist; GFC_DESCRIPTOR_DATA(vp) = xmalloc (i * sizeof(GFC_INTEGER_4)); GFC_DIMENSION_SET(vp->dim[0],1, i, 1); memcpy (GFC_DESCRIPTOR_DATA(vp), temp, i * sizeof(GFC_INTEGER_4)); diff --git a/libgfortran/io/format.h b/libgfortran/io/format.h index ad7e1c1..19882bc 100644 --- a/libgfortran/io/format.h +++ b/libgfortran/io/format.h @@ -78,7 +78,7 @@ struct fnode { char *string; int string_len; - gfc_array_i4 *vlist; + gfc_full_array_i4 *vlist; } udf; /* User Defined Format. */ diff --git a/libgfortran/io/io.h b/libgfortran/io/io.h index d312131..902eb41 100644 --- a/libgfortran/io/io.h +++ b/libgfortran/io/io.h @@ -100,7 +100,8 @@ array_loop_spec; /* Subroutine formatted_dtio (struct, unit, iotype, v_list, iostat, iomsg, (_iotype), (_iomsg)) */ -typedef void (*formatted_dtio)(void *, GFC_INTEGER_4 *, char *, gfc_array_i4 *, +typedef void (*formatted_dtio)(void *, GFC_INTEGER_4 *, char *, + gfc_full_array_i4 *, GFC_INTEGER_4 *, char *, gfc_charlen_type, gfc_charlen_type); |