Merge pull request #5541 from jmdavis/issue_17482

Fix issue 17482: Fix Nullable!Variant equality checks. merged-on-behalf-of: Sebastian Wilzbach <sebi.wilzbach@gmail.com>
dlang · Jul 7, 2017 · d07b101 · d07b101
2 parents bff3364 + a7ea880
commit d07b101
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/std/typecons.d b/std/typecons.d
@@ -2228,7 +2228,8 @@ Params:
     }
 
     /// Ditto
-    bool opEquals()(auto ref const(T) rhs) const
+    bool opEquals(U)(auto ref const(U) rhs) const
+    if (is(typeof(this.get == rhs)))
     {
         return _isNull ? false : rhs == _value;
     }
@@ -2276,6 +2277,16 @@ Params:
         assert(a != Nullable!int(29));
     }
 
+    // Issue 17482
+    @system unittest
+    {
+        import std.variant : Variant;
+        Nullable!Variant a = Variant(12);
+        assert(a == 12);
+        Nullable!Variant e;
+        assert(e != 12);
+    }
+
     template toString()
     {
         import std.format : FormatSpec, formatValue;