summaryrefslogtreecommitdiff
path: root/src/library/scala/concurrent/ExecutionContext.scala
diff options
context:
space:
mode:
authorbrijest <brijest@tsf3-028.epfl.ch>2012-01-16 16:16:08 +0100
committerbrijest <brijest@tsf3-028.epfl.ch>2012-01-16 16:16:08 +0100
commit031eea9cb2b7ff00f70f9adb8d8da371bd013bfe (patch)
treea66de2a6d297af652e35126cb322bc5a38e98493 /src/library/scala/concurrent/ExecutionContext.scala
parent8b5f05ac364dd13f6b0443690825adc382ff8fc7 (diff)
downloadscala-031eea9cb2b7ff00f70f9adb8d8da371bd013bfe.tar.gz
scala-031eea9cb2b7ff00f70f9adb8d8da371bd013bfe.tar.bz2
scala-031eea9cb2b7ff00f70f9adb8d8da371bd013bfe.zip
Work in progress.
Diffstat (limited to 'src/library/scala/concurrent/ExecutionContext.scala')
-rw-r--r--src/library/scala/concurrent/ExecutionContext.scala5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/library/scala/concurrent/ExecutionContext.scala b/src/library/scala/concurrent/ExecutionContext.scala
index 078b05c517..2650022e1e 100644
--- a/src/library/scala/concurrent/ExecutionContext.scala
+++ b/src/library/scala/concurrent/ExecutionContext.scala
@@ -30,8 +30,9 @@ trait ExecutionContext {
def future[T](body: => T): Future[T]
- /** Only callable from the tasks running on the same execution context. */
- def blockingCall[T](body: Awaitable[T]): T
+ def blocking[T](atMost: Duration)(body: =>T): T
+
+ def blocking[T](atMost: Duration)(awaitable: Awaitable[T]): T
}