summary refs log tree commit diff stats
path: root/lib/upcoming/asyncdispatch.nim
diff options
context:
space:
mode:
authorDominik Picheta <dominikpicheta@gmail.com>2016-09-17 17:21:05 +0200
committerDominik Picheta <dominikpicheta@gmail.com>2016-09-17 17:21:05 +0200
commitdfe416eaadc05a7262cfae16237d1a5d03049f14 (patch)
treee9b49533915a5a30dca3c6d5045b5f7ce058e0fb /lib/upcoming/asyncdispatch.nim
parent75e5c87f1525d5c5ea59005bc458ff6f561a27c9 (diff)
downloadNim-dfe416eaadc05a7262cfae16237d1a5d03049f14.tar.gz
Fixes Futures' `or` operation so that asyncftpclient compiles.
Diffstat (limited to 'lib/upcoming/asyncdispatch.nim')
-rw-r--r--lib/upcoming/asyncdispatch.nim6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/upcoming/asyncdispatch.nim b/lib/upcoming/asyncdispatch.nim
index 460dfbd1a..4465e961c 100644
--- a/lib/upcoming/asyncdispatch.nim
+++ b/lib/upcoming/asyncdispatch.nim
@@ -353,11 +353,11 @@ proc `or`*[T, Y](fut1: Future[T], fut2: Future[Y]): Future[void] =
   ## Returns a future which will complete once either ``fut1`` or ``fut2``
   ## complete.
   var retFuture = newFuture[void]("asyncdispatch.`or`")
-  proc cb(fut: Future[T]) =
+  proc cb[X](fut: Future[X]) =
     if fut.failed: retFuture.fail(fut.error)
     if not retFuture.finished: retFuture.complete()
-  fut1.callback = cb
-  fut2.callback = cb
+  fut1.callback = cb[T]
+  fut2.callback = cb[Y]
   return retFuture
 
 proc all*[T](futs: varargs[Future[T]]): auto =