Merge pull request #3030 from 9rnsr/fix14233

[REG2.067b2] Issue 14233 - Can't build Algebraic!(This[]) anymore
dlang · Mar 4, 2015 · 23702b2 · 23702b2
2 parents b345d95 + fcc1aab
commit 23702b2
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/std/variant.d b/std/variant.d
@@ -481,7 +481,7 @@ private:
             static if (!is(Unqual!(typeof((*zis)[0])) == void) && is(typeof((*zis)[0])) && is(typeof((*zis) ~= *zis)))
             {
                 // array type; parm is the element to append
-                auto arg = cast(VariantN*) parm;
+                auto arg = cast(Variant*) parm;
                 alias E = typeof((*zis)[0]);
                 if (arg[0].convertsTo!(E))
                 {
@@ -1107,7 +1107,7 @@ public:
     ///ditto
     VariantN opCatAssign(T)(T rhs)
     {
-        auto toAppend = VariantN(rhs);
+        auto toAppend = Variant(rhs);
         fptr(OpID.catAssign, &store, &toAppend) == 0 || assert(false);
         return this;
     }
@@ -1299,6 +1299,15 @@ unittest
     assert(aa["b"] == 3);
 }
 
+// Issue #14233
+unittest
+{
+    alias Atom = Algebraic!(string, This[]);
+
+    Atom[] values = [];
+    auto a = Atom(values);
+}
+
 pure nothrow @nogc
 unittest
 {