diff options
| author | aleksandar <aleksandar@lampmac14.epfl.ch> | 2012-01-13 19:32:48 +0100 |
|---|---|---|
| committer | aleksandar <aleksandar@lampmac14.epfl.ch> | 2012-01-13 19:32:48 +0100 |
| commit | 7993ec04baf28cd12009d15979c2c904afad89d3 (patch) | |
| tree | 1b35adc699d75cbd585917ad347f24232db491ea /src/library/scala/concurrent/ExecutionContext.scala | |
| parent | f8c3f31f2fbf1544723e4cc3fe4af602dab62372 (diff) | |
| download | scala-7993ec04baf28cd12009d15979c2c904afad89d3.tar.gz scala-7993ec04baf28cd12009d15979c2c904afad89d3.tar.bz2 scala-7993ec04baf28cd12009d15979c2c904afad89d3.zip | |
Migrate akka promises. Changes to some of the interfaces.
Diffstat (limited to 'src/library/scala/concurrent/ExecutionContext.scala')
| -rw-r--r-- | src/library/scala/concurrent/ExecutionContext.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/library/scala/concurrent/ExecutionContext.scala b/src/library/scala/concurrent/ExecutionContext.scala index ebeeca995e..38a28044e1 100644 --- a/src/library/scala/concurrent/ExecutionContext.scala +++ b/src/library/scala/concurrent/ExecutionContext.scala @@ -23,7 +23,7 @@ trait ExecutionContext { def future[T](body: => T): Future[T] /** Only callable from the tasks running on the same execution context. */ - def blockingCall[T](timeout: Timeout, body: Awaitable[T]): T + def blockingCall[T](body: Awaitable[T]): T } |