re PR fortran/79843 (diagnostics: missing word in fortran/symbol.c, conflict_std)
authorDominique d'Humieres <dominiq@lps.ens.fr>
Mon, 3 Jul 2017 17:56:08 +0000 (19:56 +0200)
committerDominique d'Humieres <dominiq@gcc.gnu.org>
Mon, 3 Jul 2017 17:56:08 +0000 (19:56 +0200)
commit73977c4787a221078c07ec2960153d6eb4d713b3
treec2e57d34544f0e337dc5275cd517fb33019553c4
parent4ab42f4628a252095797dc8a29ddb327c40e8577
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
gcc/fortran/ChangeLog
gcc/fortran/symbol.c
gcc/testsuite/ChangeLog
gcc/testsuite/gfortran.dg/namelist_3.f90
gcc/testsuite/gfortran.dg/pointer_intent_2.f90