D1 build fix.

The workaround could later be merged to D1 if the same problem
starts to appear there as well.
This commit is contained in:
David Nadlinger 2012-12-31 06:26:08 +01:00
parent dc7e328356
commit 08708917bc

View file

@ -967,11 +967,13 @@ TemplateInstance* DtoIsTemplateInstance(Dsymbol* s, bool checkLiteralOwner)
if (!s) return NULL; if (!s) return NULL;
if (s->isTemplateInstance() && !s->isTemplateMixin()) if (s->isTemplateInstance() && !s->isTemplateMixin())
return s->isTemplateInstance(); return s->isTemplateInstance();
#if DMDV2
if (FuncLiteralDeclaration* fld = s->isFuncLiteralDeclaration()) if (FuncLiteralDeclaration* fld = s->isFuncLiteralDeclaration())
{ {
if (checkLiteralOwner && fld->owningTemplate) if (checkLiteralOwner && fld->owningTemplate)
return fld->owningTemplate; return fld->owningTemplate;
} }
#endif
if (s->parent) if (s->parent)
return DtoIsTemplateInstance(s->parent, checkLiteralOwner); return DtoIsTemplateInstance(s->parent, checkLiteralOwner);
return NULL; return NULL;