diff options
| author | Thomas Koenig <tkoenig@gcc.gnu.org> | 2017-11-23 17:52:05 +0000 |
|---|---|---|
| committer | Thomas Koenig <tkoenig@gcc.gnu.org> | 2017-11-23 17:52:05 +0000 |
| commit | 207180e159492bd884a37b071bc69a011072e403 (patch) | |
| tree | 471e3b631f690e75c8b679e22c87cf25b1edd220 /libgfortran/m4 | |
| parent | 3d4b2e49158f7d803a49e23f3268aaaca283c471 (diff) | |
| download | gcc-207180e159492bd884a37b071bc69a011072e403.zip gcc-207180e159492bd884a37b071bc69a011072e403.tar.gz gcc-207180e159492bd884a37b071bc69a011072e403.tar.bz2 | |
re PR fortran/36313 ([F03] {MIN,MAX}{LOC,VAL} should accept character arguments)
2017-11-23 Thomas Koenig <tkoenig@gcc.gnu.org>
PR fortran/36313
* m4/maxloc2s.m4: Replace int for character length by
gfc_charlen_type.
* m4/minloc2s.m4: Likewise.
* generated./maxloc2_16_s1.c: Regenerated.
* generated./maxloc2_16_s4.c: Regenerated.
* generated./maxloc2_4_s1.c: Regenerated.
* generated./maxloc2_4_s4.c: Regenerated.
* generated./maxloc2_8_s1.c: Regenerated.
* generated./maxloc2_8_s4.c: Regenerated.
* generated./minloc2_16_s1.c: Regenerated.
* generated./minloc2_16_s4.c: Regenerated.
* generated./minloc2_4_s1.c: Regenerated.
* generated./minloc2_4_s4.c: Regenerated.
* generated./minloc2_8_s1.c: Regenerated.
* generated./minloc2_8_s4.c: Regenerated.
From-SVN: r255109
Diffstat (limited to 'libgfortran/m4')
| -rw-r--r-- | libgfortran/m4/maxloc2s.m4 | 5 | ||||
| -rw-r--r-- | libgfortran/m4/minloc2s.m4 | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/libgfortran/m4/maxloc2s.m4 b/libgfortran/m4/maxloc2s.m4 index 9b2ed74..8cfca6a 100644 --- a/libgfortran/m4/maxloc2s.m4 +++ b/libgfortran/m4/maxloc2s.m4 @@ -31,7 +31,7 @@ include(iparm.m4)dnl `#if defined (HAVE_'atype_name`) && defined (HAVE_'rtype_name`) static inline int -compare_fcn (const 'atype_name` *a, const 'atype_name` *b, int n) +compare_fcn (const 'atype_name` *a, const 'atype_name` *b, gfc_charlen_type n) { if (sizeof ('atype_name`) == 1) return memcmp (a, b, n); @@ -39,7 +39,8 @@ compare_fcn (const 'atype_name` *a, const 'atype_name` *b, int n) return memcmp_char4 (a, b, n); } -extern 'rtype_name` 'name`'rtype_qual`_'atype_code` ('atype` * const restrict, int); +extern 'rtype_name` 'name`'rtype_qual`_'atype_code` ('atype` * const restrict, + gfc_charlen_type); export_proto('name`'rtype_qual`_'atype_code`); 'rtype_name` diff --git a/libgfortran/m4/minloc2s.m4 b/libgfortran/m4/minloc2s.m4 index 38073ce..8e99ed3 100644 --- a/libgfortran/m4/minloc2s.m4 +++ b/libgfortran/m4/minloc2s.m4 @@ -31,7 +31,7 @@ include(iparm.m4)dnl `#if defined (HAVE_'atype_name`) && defined (HAVE_'rtype_name`) static inline int -compare_fcn (const 'atype_name` *a, const 'atype_name` *b, int n) +compare_fcn (const 'atype_name` *a, const 'atype_name` *b, gfc_charlen_type n) { if (sizeof ('atype_name`) == 1) return memcmp (a, b, n); @@ -39,7 +39,7 @@ compare_fcn (const 'atype_name` *a, const 'atype_name` *b, int n) return memcmp_char4 (a, b, n); } -extern 'rtype_name` 'name`'rtype_qual`_'atype_code` ('atype` * const restrict, int); +extern 'rtype_name` 'name`'rtype_qual`_'atype_code` ('atype` * const restrict, gfc_charlen_type); export_proto('name`'rtype_qual`_'atype_code`); 'rtype_name` |