Merged DMD commit c415c01dcd76a8ede43220d14e075109bf24c81a:

bugzilla 3276 Recursion broken by alias template parameter
This commit is contained in:
David Nadlinger
2011-04-22 18:47:33 +02:00
parent f12d7471a3
commit b2ad2172f9

View File

@@ -3875,11 +3875,7 @@ TemplateDeclaration *TemplateInstance::findTemplateDeclaration(Scope *sc)
if (s->parent &&
(ti = s->parent->isTemplateInstance()) != NULL)
{
if (
(ti->name == id ||
ti->toAlias()->ident == id)
&&
ti->tempdecl)
if (ti->tempdecl && ti->tempdecl->ident == id)
{
/* This is so that one can refer to the enclosing
* template, even if it has the same name as a member