From 305c089a9f8347470aa79f7dabed0252c9f83cfa Mon Sep 17 00:00:00 2001 From: Uros Bizjak Date: Fri, 25 May 2012 17:09:49 +0200 Subject: [PATCH] * decl.c: Revert unwanted commit. From-SVN: r187886 --- gcc/cp/decl.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 14a6a40d6cee..d883da6b6406 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -9803,8 +9803,7 @@ grokdeclarator (const cp_declarator *declarator, clones. */ DECL_ABSTRACT (decl) = 1; } - else if (current_class_type - && constructor_name_p (unqualified_id, current_class_type)) + else if (constructor_name_p (unqualified_id, current_class_type)) permerror (input_location, "ISO C++ forbids nested type %qD with same name " "as enclosing class", unqualified_id); -- 2.43.5