From fb77bf1c86e6ea237250e43b877c15ac190d1a65 Mon Sep 17 00:00:00 2001 From: Martin Sebor Date: Mon, 24 Feb 2020 10:18:11 -0700 Subject: [PATCH] Remove a hunk duplicated during a merge. gcc/cp/ChangeLog: * parser.c (cp_parser_check_class_key): Remove a duplicate hunk of code. --- gcc/cp/ChangeLog | 1 + gcc/cp/parser.c | 7 ------- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 9c212d9..0cc971d 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -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 diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 8e52fef..ca85d89 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -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 -- 2.7.4