aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp/parser.c
diff options
context:
space:
mode:
authorPaolo Carlini <paolo.carlini@oracle.com>2013-03-28 10:00:05 +0000
committerPaolo Carlini <paolo@gcc.gnu.org>2013-03-28 10:00:05 +0000
commit129677c1cf80e2fe333d21dbcfec8ca4e0a39d4e (patch)
tree25f7029eb5c55cf70bef65e257ea1c7614a325ec /gcc/cp/parser.c
parenta64b9c261d9d2c12b98bd14f5f1bf27e3bcb6bdd (diff)
downloadgcc-129677c1cf80e2fe333d21dbcfec8ca4e0a39d4e.zip
gcc-129677c1cf80e2fe333d21dbcfec8ca4e0a39d4e.tar.gz
gcc-129677c1cf80e2fe333d21dbcfec8ca4e0a39d4e.tar.bz2
call.c (joust): Don't call inform for a permerror returning false.
2013-03-28 Paolo Carlini <paolo.carlini@oracle.com> * call.c (joust): Don't call inform for a permerror returning false. * parser.c (cp_parser_check_class_key): Likewise. * pt.c (tsubst_copy_and_build): Likewise. From-SVN: r197190
Diffstat (limited to 'gcc/cp/parser.c')
-rw-r--r--gcc/cp/parser.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 9ba0998..5e2a4e0 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -23363,12 +23363,12 @@ cp_parser_check_class_key (enum tag_types class_key, tree type)
return;
if ((TREE_CODE (type) == UNION_TYPE) != (class_key == union_type))
{
- permerror (input_location, "%qs tag used in naming %q#T",
- class_key == union_type ? "union"
- : class_key == record_type ? "struct" : "class",
- type);
- inform (DECL_SOURCE_LOCATION (TYPE_NAME (type)),
- "%q#T was previously declared here", type);
+ if (permerror (input_location, "%qs tag used in naming %q#T",
+ class_key == union_type ? "union"
+ : class_key == record_type ? "struct" : "class",
+ type))
+ inform (DECL_SOURCE_LOCATION (TYPE_NAME (type)),
+ "%q#T was previously declared here", type);
}
}