From 0896bdf5f6cf577def21fe00d660049ac96a528f Mon Sep 17 00:00:00 2001 From: dominiq Date: Mon, 3 Jul 2017 17:56:08 +0000 Subject: 2017-07-03 Dominique d'Humieres 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@249933 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/fortran/symbol.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gcc/fortran/symbol.c') diff --git a/gcc/fortran/symbol.c b/gcc/fortran/symbol.c index ec43e635bf3..3bc2b34768f 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); } -- cgit v1.2.1