Merge pull request #3923 from yebblies/shadowded

[DDMD] Fix shadowing in deduceType
dlang · Aug 30, 2014 · 3f86b5d · 3f86b5d
2 parents 959e792 + 0131d93
commit 3f86b5d
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/template.c b/src/template.c
@@ -4244,13 +4244,13 @@ MATCH deduceType(RootObject *o, Scope *sc, Type *tparam, TemplateParameters *par
                 match1 = MATCHexact;
                 for (size_t j = 0; j < xt->argexps.dim; j++)
                 {
-                    Expression *e = xt->argexps[j];
-                    if (e == emptyArrayElement)
+                    Expression *ex = xt->argexps[j];
+                    if (ex == emptyArrayElement)
                         continue;
                     Type *pt = tt->addMod(xt->tparams[j]->mod);
                     if (wm && *wm)
                         pt = pt->substWildTo(*wm);
-                    MATCH m = e->implicitConvTo(pt);
+                    MATCH m = ex->implicitConvTo(pt);
                     if (match1 > m)
                         match1 = m;
                     if (match1 <= MATCHnomatch)