Remove a hunk duplicated during a merge.
gcc/cp/ChangeLog: * parser.c (cp_parser_check_class_key): Remove a duplicate hunk of code.
This commit is contained in:
parent
b73547e40e
commit
fb77bf1c86
|
@ -3,6 +3,7 @@
|
|||
PR c++/93804
|
||||
* parser.c (cp_parser_check_class_key): Avoid issuing -Wredundant-tags
|
||||
in shared C/C++ code in headers.
|
||||
Remove a duplicate hunk of code.
|
||||
|
||||
2020-02-24 Marek Polacek <polacek@redhat.com>
|
||||
|
||||
|
|
|
@ -31021,13 +31021,6 @@ cp_parser_check_class_key (cp_parser *parser, location_t key_loc,
|
|||
&& class_key != union_type)
|
||||
return;
|
||||
|
||||
/* Only consider the true class-keys below and ignore typename_type,
|
||||
etc. that are not C++ class-keys. */
|
||||
if (class_key != class_type
|
||||
&& class_key != record_type
|
||||
&& class_key != union_type)
|
||||
return;
|
||||
|
||||
tree type_decl = TYPE_MAIN_DECL (type);
|
||||
tree name = DECL_NAME (type_decl);
|
||||
/* Look up the NAME to see if it unambiguously refers to the TYPE
|
||||
|
|
Loading…
Reference in New Issue