diff options
| author | Jason Merrill <jason@redhat.com> | 2011-07-07 17:53:58 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2011-07-07 17:53:58 -0400 |
| commit | 0771d9d750576cd36a710a1a99cdd4163efa0164 (patch) | |
| tree | 225d7cd1863805212f54357b70b2849d0160340a /gcc/cp/name-lookup.c | |
| parent | ceeb79a48e25f19f6242e1ac281883a07dd1d2f1 (diff) | |
| download | gcc-0771d9d750576cd36a710a1a99cdd4163efa0164.zip gcc-0771d9d750576cd36a710a1a99cdd4163efa0164.tar.gz gcc-0771d9d750576cd36a710a1a99cdd4163efa0164.tar.bz2 | |
re PR c++/49663 ([C++0x] ICE in lookup_base)
PR c++/49663
* pt.c (push_deduction_access_scope): Preserve
processing_template_decl across push_to_top_level.
And revert:
* class.c (pushclass): Accept NULL argument.
(popclass): Deal with popping null class.
* pt.c (push_access_scope, pop_access_scope): Use them rather than
push_to_top_level/pop_from_top_level.
* name-lookup.c (lookup_name_real_1): Check current_class_type.
From-SVN: r176013
Diffstat (limited to 'gcc/cp/name-lookup.c')
| -rw-r--r-- | gcc/cp/name-lookup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c index 615e177..06726da 100644 --- a/gcc/cp/name-lookup.c +++ b/gcc/cp/name-lookup.c @@ -4473,7 +4473,7 @@ lookup_name_real_1 (tree name, int prefer_type, int nonclass, bool block_p, /* Conversion operators are handled specially because ordinary unqualified name lookup will not find template conversion operators. */ - if (IDENTIFIER_TYPENAME_P (name) && current_class_type) + if (IDENTIFIER_TYPENAME_P (name)) { struct cp_binding_level *level; |