Merge pull request #5084 from kinke/patch-1

JackStouffer · web-flow · commit f02b106fe401 · 2017-02-04T01:27:55.000-05:00
[Trivial] Fix std.conv unittest compile error for double-precision reals
diff --git a/std/conv.d b/std/conv.d
@@ -1624,8 +1624,11 @@ private void testFloatingToIntegral(Floating, Integral)()
         assert(to!long(to!double(b)) == b);
         assert(to!long(to!double(-b)) == -b);
         // real
-        ulong c = 18_446_744_073_709_551_615UL; // 2^64 - 1
-        assert(to!ulong(to!real(c)) == c);
+        static if (real.mant_dig >= 64)
+        {
+            ulong c = 18_446_744_073_709_551_615UL; // 2^64 - 1
+            assert(to!ulong(to!real(c)) == c);
+        }
     }
     // test conversions floating => integral
     {
@@ -3032,7 +3035,7 @@ Target parse(Target, Source)(ref Source source)
 }
 
 //Tests for the double implementation
-@safe unittest
+unittest
 {
     static if (real.mant_dig == 53)
     {

Original file line number	Diff line number	Diff line change
`@@ -1624,8 +1624,11 @@ private void testFloatingToIntegral(Floating, Integral)()`
`1624`	`1624`	`assert(to!long(to!double(b)) == b);`
`1625`	`1625`	`assert(to!long(to!double(-b)) == -b);`
`1626`	`1626`	`// real`
`1627`		`- ulong c = 18_446_744_073_709_551_615UL; // 2^64 - 1`
`1628`		`- assert(to!ulong(to!real(c)) == c);`
	`1627`	`+ static if (real.mant_dig >= 64)`
	`1628`	`+ {`
	`1629`	`+ ulong c = 18_446_744_073_709_551_615UL; // 2^64 - 1`
	`1630`	`+ assert(to!ulong(to!real(c)) == c);`
	`1631`	`+ }`
`1629`	`1632`	`}`
`1630`	`1633`	`// test conversions floating => integral`
`1631`	`1634`	`{`
`@@ -3032,7 +3035,7 @@ Target parse(Target, Source)(ref Source source)`
`3032`	`3035`	`}`
`3033`	`3036`
`3034`	`3037`	`//Tests for the double implementation`
`3035`		`-@safe unittest`
	`3038`	`+unittest`
`3036`	`3039`	`{`
`3037`	`3040`	`static if (real.mant_dig == 53)`
`3038`	`3041`	`{`