diff options
| author | aleksandar <aleksandar@lampmac14.epfl.ch> | 2011-12-13 13:31:06 +0100 |
|---|---|---|
| committer | aleksandar <aleksandar@lampmac14.epfl.ch> | 2011-12-13 13:31:06 +0100 |
| commit | 65b27aa3ab58b39a3b68999f4c6b9d3af7a81f85 (patch) | |
| tree | 57f57618a306f852349dfb662a2caf97c1c3732d /src/library/scala/concurrent/ExecutionContext.scala | |
| parent | d9981460533949182691e2d83079af364d2dfcde (diff) | |
| download | scala-65b27aa3ab58b39a3b68999f4c6b9d3af7a81f85.tar.gz scala-65b27aa3ab58b39a3b68999f4c6b9d3af7a81f85.tar.bz2 scala-65b27aa3ab58b39a3b68999f4c6b9d3af7a81f85.zip | |
Rename block->await. Add more tck test cases.
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 77d805b19c..b7b3e901e6 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: Blockable[T]): T + def blockingCall[T](timeout: Timeout, body: Awaitable[T]): T } |