From b2ad2172f98e6e7e979f99347031236a5e600e08 Mon Sep 17 00:00:00 2001 From: David Nadlinger Date: Fri, 22 Apr 2011 18:47:33 +0200 Subject: [PATCH] Merged DMD commit c415c01dcd76a8ede43220d14e075109bf24c81a: bugzilla 3276 Recursion broken by alias template parameter --- dmd/template.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dmd/template.c b/dmd/template.c index 62fc13aa..8457a1a5 100644 --- a/dmd/template.c +++ b/dmd/template.c @@ -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