diff options
| author | Uros Bizjak <uros@gcc.gnu.org> | 2012-05-25 17:09:49 +0200 |
|---|---|---|
| committer | Uros Bizjak <uros@gcc.gnu.org> | 2012-05-25 17:09:49 +0200 |
| commit | 305c089a9f8347470aa79f7dabed0252c9f83cfa (patch) | |
| tree | ac70acdfd10dc3fb772ba2dd1d15232711113da5 /gcc | |
| parent | a295fa90c3b5f2cb0ecc1c15cc44cdf40bf405b7 (diff) | |
| download | gcc-305c089a9f8347470aa79f7dabed0252c9f83cfa.zip gcc-305c089a9f8347470aa79f7dabed0252c9f83cfa.tar.gz gcc-305c089a9f8347470aa79f7dabed0252c9f83cfa.tar.bz2 | |
* decl.c: Revert unwanted commit.
From-SVN: r187886
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/decl.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 14a6a40..d883da6 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); |