From: Uros Bizjak <uros@gcc.gnu.org>
Date: Fri, 25 May 2012 15:09:49 +0000 (+0200)
Subject: * decl.c: Revert unwanted commit.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=305c089a9f8347470aa79f7dabed0252c9f83cfa;p=gcc.git

* decl.c: Revert unwanted commit.

From-SVN: r187886
---

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 14a6a40d6ce..d883da6b640 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);