aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/fortran/ChangeLog5
-rw-r--r--gcc/fortran/resolve.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index a3b4442..2b81821 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,5 +1,10 @@
2015-09-21 Steven G. Kargl <kargl@gcc.gnu.org>
+ * resolve.c (nonscalar_typebound_assign): Fix typos in comment.
+
+
+2015-09-21 Steven G. Kargl <kargl@gcc.gnu.org>
+
PR fortran/67615
* resolve.c (gfc_resolve_code): Check for scalar expression in
arithmetic-if.
diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index da8aaa1..7363e06 100644
--- a/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@ -9844,8 +9844,8 @@ nonscalar_typebound_assign (gfc_symbol *derived, int depth)
"An intrinsic assignment where the variable is of derived type is
performed as if each component of the variable were assigned from the
corresponding component of expr using pointer assignment (7.2.2) for
- each pointer component, defined assignment for each nonpointer
- nonallocatable component of a type that has a type-bound defined
+ each pointer component, defined assignment for each nonpointer
+ nonallocatable component of a type that has a type-bound defined
assignment consistent with the component, intrinsic assignment for
each other nonpointer nonallocatable component, ..."