* decl.c: Revert unwanted commit.

From-SVN: r187886

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 14a6a40d6cee3d1fc0a176a1179177229216a558..d883da6b6406a84fc85990ef784f5ea63995cd92 100644 (file)
--- 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);