diff options
| author | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-06-27 19:19:18 +0000 |
|---|---|---|
| committer | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-06-27 19:19:18 +0000 |
| commit | aa2f35a5b2da6b87ac830c6a520b994e11538d44 (patch) | |
| tree | 08122aded3c3507e845d04fc40532dd8e0a2adcb /gcc/cp/decl.c | |
| parent | bb2431ccd16b2baab15aa4a39e77526a0e8666fe (diff) | |
| download | gcc-aa2f35a5b2da6b87ac830c6a520b994e11538d44.tar.gz | |
* parser.c (cp_parser_check_for_invalid_template_id): tag_type parm.
(cp_parser_simple_type_specifier, cp_parser_class_head): Adjust.
(cp_parser_elaborated_type_specifier): Adjust.
* decl.c (duplicate_decls): Return error_mark_node on template
mismatch.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@189025 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp/decl.c')
| -rw-r--r-- | gcc/cp/decl.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 1346f924c2b..ab560199ced 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -1463,6 +1463,7 @@ duplicate_decls (tree newdecl, tree olddecl, bool newdecl_is_friend) { error ("declaration of template %q#D", newdecl); error ("conflicts with previous declaration %q+#D", olddecl); + return error_mark_node; } else if (TREE_CODE (DECL_TEMPLATE_RESULT (olddecl)) == FUNCTION_DECL && TREE_CODE (DECL_TEMPLATE_RESULT (newdecl)) == FUNCTION_DECL |