fix static if mistakes

dlang · May 7, 2016 · 69a3d9e · 69a3d9e
1 parent 286e709
commit 69a3d9e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/std/traits.d b/std/traits.d
@@ -4253,15 +4253,18 @@ package template isBlitAssignable(T)
                 static if (i == 0)
                 {
                 }
-                else if (T.tupleof[i].offsetof == offset)
-                {
-                    if (assignable)
-                        continue;
-                }
                 else
                 {
-                    if (!assignable)
-                        return false;
+                    if (T.tupleof[i].offsetof == offset)
+                    {
+                        if (assignable)
+                            continue;
+                    }
+                    else
+                    {
+                        if (!assignable)
+                            return false;
+                    }
                 }
                 assignable = isBlitAssignable!(typeof(T.tupleof[i]));
                 offset = T.tupleof[i].offsetof;

diff --git a/std/variant.d b/std/variant.d
@@ -2195,7 +2195,7 @@ private auto visitImpl(bool Strict, VariantType, Handler...)(VariantType variant
                             result.exceptionFuncIdx = dgidx;
                         }
                     }
-                    else if (is(Unqual!(Params[0]) == T))
+                    else static if (is(Unqual!(Params[0]) == T))
                     {
                         if (added)
                             assert(false, "duplicate overload specified for type '" ~ T.stringof ~ "'");