diff options
| author | Dominique d'Humieres <dominiq@lps.ens.fr> | 2017-07-03 19:56:08 +0200 |
|---|---|---|
| committer | Dominique d'Humieres <dominiq@gcc.gnu.org> | 2017-07-03 19:56:08 +0200 |
| commit | 73977c4787a221078c07ec2960153d6eb4d713b3 (patch) | |
| tree | c2e57d34544f0e337dc5275cd517fb33019553c4 /gcc/fortran/symbol.c | |
| parent | 4ab42f4628a252095797dc8a29ddb327c40e8577 (diff) | |
| download | gcc-73977c4787a221078c07ec2960153d6eb4d713b3.zip gcc-73977c4787a221078c07ec2960153d6eb4d713b3.tar.gz gcc-73977c4787a221078c07ec2960153d6eb4d713b3.tar.bz2 | |
re PR fortran/79843 (diagnostics: missing word in fortran/symbol.c, conflict_std)
2017-07-03 Dominique d'Humieres <dominiq@lps.ens.fr>
PR fortran/79843
* symbol.c (check_conflict): Add missing "conflicts".
PR testsuite/79843
* gfortran.dg/namelist_3.f90: Adjust the dg-error string.
* gfortran.dg/pointer_intent_2.f90: Likewise.
From-SVN: r249933
Diffstat (limited to 'gcc/fortran/symbol.c')
| -rw-r--r-- | gcc/fortran/symbol.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gcc/fortran/symbol.c b/gcc/fortran/symbol.c index ec43e63..3bc2b34 100644 --- a/gcc/fortran/symbol.c +++ b/gcc/fortran/symbol.c @@ -845,13 +845,13 @@ conflict: conflict_std: if (name == NULL) { - return gfc_notify_std (standard, "%s attribute " + return gfc_notify_std (standard, "%s attribute conflicts " "with %s attribute at %L", a1, a2, where); } else { - return gfc_notify_std (standard, "%s attribute " + return gfc_notify_std (standard, "%s attribute conflicts " "with %s attribute in %qs at %L", a1, a2, name, where); } |