procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove a hunk duplicated during a merge.

Browse source 
gcc/cp/ChangeLog:
	* parser.c (cp_parser_check_class_key): Remove a duplicate hunk
	of code.
This commit is contained in:
Martin Sebor 2020-02-24 10:18:11 -07:00
parent b73547e40e
commit fb77bf1c86
2 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gcc/cp/ChangeLog
View file

@ -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>

7
gcc/cp/parser.c
View file

@ -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