summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoruros <uros@138bc75d-0d04-0410-961f-82ee72b054a4>2012-05-25 15:09:49 +0000
committeruros <uros@138bc75d-0d04-0410-961f-82ee72b054a4>2012-05-25 15:09:49 +0000
commitbc2775f5a218366df69fe01eea36e6f24eb6041b (patch)
treeac70acdfd10dc3fb772ba2dd1d15232711113da5
parent4547680646c1b61f918fff01ab824f95569a99d5 (diff)
downloadgcc-bc2775f5a218366df69fe01eea36e6f24eb6041b.tar.gz
* decl.c: Revert unwanted commit.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@187886 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/cp/decl.c3
1 files changed, 1 insertions, 2 deletions
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);