commit ceb1fac7aa57a875a4a23513de0946869cb21c19
author Maxim Moiseev <moiseev@users.noreply.github.com> Mon Jan 23 09:55:40 2017 -0800
committer GitHub <noreply@github.com> Mon Jan 23 09:55:40 2017 -0800
tree 41bbbc9f8ace91116b8d6c181d3e558427bf30d0
parent 44c22917cd74bc3e61e45c8a1fa072d2d44db3b5
parent 6a3189d96ab92cab19f42e2e2b1c1647826bd101

Merge pull request #202 from moiseev/nan-time

Fix + and - operations on DispatchTime and DispatchWallTime

src/swift/Time.swift

diff --git a/src/swift/Time.swift b/src/swift/Time.swift
index 709dac8..46a71d6 100644
--- a/src/swift/Time.swift
+++ b/src/swift/Time.swift
@@ -110,12 +110,16 @@
 }
 
 public func +(time: DispatchTime, seconds: Double) -> DispatchTime {
-	let t = CDispatch.dispatch_time(time.rawValue, Int64(seconds * Double(NSEC_PER_SEC)))
+	let interval = seconds * Double(NSEC_PER_SEC)
+	let t = CDispatch.dispatch_time(time.rawValue,
+		interval.isInfinite || interval.isNaN ? Int64.max : Int64(interval))
 	return DispatchTime(rawValue: t)
 }
 
 public func -(time: DispatchTime, seconds: Double) -> DispatchTime {
-	let t = CDispatch.dispatch_time(time.rawValue, Int64(-seconds * Double(NSEC_PER_SEC)))
+	let interval = -seconds * Double(NSEC_PER_SEC)
+	let t = CDispatch.dispatch_time(time.rawValue,
+		interval.isInfinite || interval.isNaN ? Int64.min : Int64(interval))
 	return DispatchTime(rawValue: t)
 }
 
@@ -130,11 +134,15 @@
 }
 
 public func +(time: DispatchWallTime, seconds: Double) -> DispatchWallTime {
-	let t = CDispatch.dispatch_time(time.rawValue, Int64(seconds * Double(NSEC_PER_SEC)))
+	let interval = seconds * Double(NSEC_PER_SEC)
+	let t = CDispatch.dispatch_time(time.rawValue,
+		interval.isInfinite || interval.isNaN ? Int64.max : Int64(interval))
 	return DispatchWallTime(rawValue: t)
 }
 
 public func -(time: DispatchWallTime, seconds: Double) -> DispatchWallTime {
-	let t = CDispatch.dispatch_time(time.rawValue, Int64(-seconds * Double(NSEC_PER_SEC)))
+	let interval = seconds * Double(NSEC_PER_SEC)
+	let t = CDispatch.dispatch_time(time.rawValue,
+		interval.isInfinite || interval.isNaN ? Int64.min : Int64(interval))
 	return DispatchWallTime(rawValue: t)
 }