diff options
author | H.J. Lu <hjl.tools@gmail.com> | 2012-04-03 11:15:51 -0700 |
---|---|---|
committer | H.J. Lu <hjl.tools@gmail.com> | 2012-04-03 11:15:51 -0700 |
commit | c924cab2fd8932bdfb107c4ca7d26128ba56f19e (patch) | |
tree | 0eea6430e211564fc331f66625373ec761837982 /gcc/fortran/match.c | |
parent | 4c15f6d5728cb694d7d954b2c20409fdc0400b9e (diff) | |
parent | 3cef948a814542119083003a3c35a24e036230b6 (diff) | |
download | gcc-hjl/x32/addr32.tar.gz |
Merge remote-tracking branch 'origin/master' into hjl/x32/addr32hjl/x32/addr32
Diffstat (limited to 'gcc/fortran/match.c')
-rw-r--r-- | gcc/fortran/match.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gcc/fortran/match.c b/gcc/fortran/match.c index 14381608c90..15edfc36db1 100644 --- a/gcc/fortran/match.c +++ b/gcc/fortran/match.c @@ -3572,8 +3572,8 @@ gfc_match_allocate (void) || sym->ns->proc_name->attr.proc_pointer); if (b1 && b2 && !b3) { - gfc_error ("Allocate-object at %L is not a nonprocedure pointer " - "or an allocatable variable", &tail->expr->where); + gfc_error ("Allocate-object at %L is neither a nonprocedure pointer " + "nor an allocatable variable", &tail->expr->where); goto cleanup; } @@ -3904,7 +3904,7 @@ gfc_match_deallocate (void) if (b1 && b2) { gfc_error ("Allocate-object at %C is not a nonprocedure pointer " - "or an allocatable variable"); + "nor an allocatable variable"); goto cleanup; } |