aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@gcc.gnu.org>2019-11-08 17:48:41 +0100
committerJakub Jelinek <jakub@gcc.gnu.org>2019-11-08 17:48:41 +0100
commit77b29023e12eb3e906026380549d57dfcc44b433 (patch)
tree130f172f3ae826f81de2de28759b5418d32afecb /gcc/fortran
parentd308ca27c71e43625b378dc6c2774105867d4fa7 (diff)
downloadgcc-77b29023e12eb3e906026380549d57dfcc44b433.zip
gcc-77b29023e12eb3e906026380549d57dfcc44b433.tar.gz
gcc-77b29023e12eb3e906026380549d57dfcc44b433.tar.bz2
* arith.c (character2representation): Change i type to size_t.
From-SVN: r277978
Diffstat (limited to 'gcc/fortran')
-rw-r--r--gcc/fortran/ChangeLog15
-rw-r--r--gcc/fortran/arith.c3
2 files changed, 11 insertions, 7 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 18e4c02..bf1f8cf 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,11 +1,16 @@
+2019-11-08 Jakub Jelinek <jakub@redhat.com>
+
+ * arith.c (character2representation): Change i type to size_t.
+
2019-11-08 Mark Eggleston <mark.eggleston@codethink.com>
- Jim MacArthur <jim.macarthur@codethink.co.uk>
+ Jim MacArthur <jim.macarthur@codethink.co.uk>
* arith.c (hollerith2representation): Use OPT_Wcharacter_truncation in
- call to gfc_warning. Add character2representation, gfc_character2int,
- gfc_character2real, gfc_character2complex and gfc_character2logical.
- * arith.h: Add prototypes for gfc_character2int, gfc_character2real,
- gfc_character2complex and gfc_character2logical.
+ call to gfc_warning.
+ (character2representation, gfc_character2int, gfc_character2real,
+ gfc_character2complex and gfc_character2logical): New.
+ * arith.h (gfc_character2int, gfc_character2real, gfc_character2complex,
+ gfc_character2logical): Declare.
* expr.c (gfc_check_assign): Return true if left hand side is numeric
or logical and the right hand side is character and of kind=1.
* gfortran.texi: Add -fdec-char-conversions.
diff --git a/gcc/fortran/arith.c b/gcc/fortran/arith.c
index 10b3e5c..a40163e 100644
--- a/gcc/fortran/arith.c
+++ b/gcc/fortran/arith.c
@@ -2534,8 +2534,7 @@ hollerith2representation (gfc_expr *result, gfc_expr *src)
static void
character2representation (gfc_expr *result, gfc_expr *src)
{
- size_t src_len, result_len;
- int i;
+ size_t src_len, result_len, i;
src_len = src->value.character.length;
gfc_target_expr_size (result, &result_len);