aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran/symbol.c
diff options
context:
space:
mode:
Diffstat (limited to 'gcc/fortran/symbol.c')
-rw-r--r--gcc/fortran/symbol.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/gcc/fortran/symbol.c b/gcc/fortran/symbol.c
index 12c5749..a1aaae8 100644
--- a/gcc/fortran/symbol.c
+++ b/gcc/fortran/symbol.c
@@ -288,7 +288,8 @@ check_conflict (symbol_attribute * attr, const char * name, locus * where)
{
a1 = pointer;
a2 = intent;
- goto conflict;
+ standard = GFC_STD_F2003;
+ goto conflict_std;
}
/* Check for attributes not allowed in a BLOCK DATA. */
@@ -571,14 +572,14 @@ conflict:
conflict_std:
if (name == NULL)
{
- return gfc_notify_std (standard, "In the selected standard, %s attribute "
+ return gfc_notify_std (standard, "Fortran 2003: %s attribute "
"conflicts with %s attribute at %L", a1, a2,
where);
}
else
{
- return gfc_notify_std (standard, "In the selected standard, %s attribute "
- "conflicts with %s attribute in '%s' at %L",
+ return gfc_notify_std (standard, "Fortran 2003: %s attribute "
+ "with %s attribute in '%s' at %L",
a1, a2, name, where);
}
}