Merge pull request #3708 from kinke/variant

std.variant: don't assert that target address != null if type size is 0
dlang · Oct 18, 2015 · ca01aee · ca01aee
2 parents 6ee65f4 + 4e1b8dc
commit ca01aee
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/std/variant.d b/std/variant.d
@@ -303,7 +303,8 @@ private:
                     auto zat = cast(T*) target;
                     if (src)
                     {
-                        assert(target, "target must be non-null");
+                        static if (T.sizeof > 0)
+                            assert(target, "target must be non-null");
                         *zat = *src;
                     }
                 }
@@ -315,7 +316,8 @@ private:
                     auto zat = cast(U*) target;
                     if (src)
                     {
-                        assert(target, "target must be non-null");
+                        static if (U.sizeof > 0)
+                            assert(target, "target must be non-null");
                         *zat = *(cast(UA*) (src));
                     }
                 }