OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR c++/38278 (C++ namespace collision)

Browse Source 
PR c++/38278
        * parser.c (cp_parser_class_name): Only call
        maybe_note_name_used_in_class if we actually found a class name.

From-SVN: r142263
This commit is contained in:
Jason Merrill 2008-11-28 16:23:38 -05:00 committed by Jason Merrill
parent fdbeaf4cbe
commit b5a029b139
4 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/cp/ChangeLog
View File

@ -1,3 +1,9 @@
2008-11-28 Jason Merrill <jason@redhat.com>
PR c++/38278
* parser.c (cp_parser_class_name): Only call
maybe_note_name_used_in_class if we actually found a class name.
2008-11-25 Jason Merrill <jason@redhat.com>
PR c++/28743

7
gcc/cp/parser.c
View File

@ -14686,6 +14686,7 @@ cp_parser_class_name (cp_parser *parser,
tree scope;
bool typename_p;
cp_token *token;
tree identifier = NULL_TREE;
/* All class-names start with an identifier. */
token = cp_lexer_peek_token (parser->lexer);
@ -14711,7 +14712,6 @@ cp_parser_class_name (cp_parser *parser,
&& !cp_parser_nth_token_starts_template_argument_list_p (parser, 2))
{
cp_token *identifier_token;
tree identifier;
bool ambiguous_p;
/* Look for the identifier. */
@ -14767,9 +14767,6 @@ cp_parser_class_name (cp_parser *parser,
}
return error_mark_node;
}
else if (decl != error_mark_node
&& !parser->scope)
maybe_note_name_used_in_class (identifier, decl);
}
}
else
@ -14819,6 +14816,8 @@ cp_parser_class_name (cp_parser *parser,
if (decl == error_mark_node)
cp_parser_error (parser, "expected class-name");
else if (identifier && !parser->scope)
maybe_note_name_used_in_class (identifier, decl);
return decl;
}

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2008-11-28 Jason Merrill <jason@redhat.com>
PR c++/38278
* g++.dg/lookup/name-clash8.C: New test.
2008-11-28 H.J. Lu <hongjiu.lu@intel.com>
PR middle-end/37843

8
gcc/testsuite/g++.dg/lookup/name-clash8.C Normal file
View File

@ -0,0 +1,8 @@
// PR c++/38278
struct foo { };
void bar();
struct baz {
static foo (bar)();
};