From 5af48edec373988fa3feefdbcada976ae03790d0 Mon Sep 17 00:00:00 2001
From: Alexey Prokhin <alexey.prokhin@yandex.ru>
Date: Wed, 15 Feb 2012 12:29:10 +0400
Subject: [PATCH] Merged the final dmd 2.058

---
 dmd2/expression.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dmd2/expression.c b/dmd2/expression.c
index 58467841..e2daf426 100644
--- a/dmd2/expression.c
+++ b/dmd2/expression.c
@@ -2908,10 +2908,12 @@ Lagain:
     TemplateDeclaration *td = s->isTemplateDeclaration();
     if (td)
     {
+#if 0 // This was the fix for Bugzilla 6738, but it breaks 7498
         Dsymbol *p = td->toParent2();
         if (hasThis(sc) && p && p->isAggregateDeclaration())
             e = new DotTemplateExp(loc, new ThisExp(loc), td);
         else
+#endif
             e = new TemplateExp(loc, td);
         e = e->semantic(sc);
         return e;