summaryrefslogtreecommitdiff
path: root/src/library/scala/concurrent/ExecutionContext.scala
diff options
context:
space:
mode:
authoraleksandar <aleksandar@lampmac14.epfl.ch>2012-01-30 16:33:05 +0100
committeraleksandar <aleksandar@lampmac14.epfl.ch>2012-01-30 16:33:05 +0100
commit8f36bf7a71f29af5ab61a3f58897881932c1daa3 (patch)
tree89f1c621275f8a91e54d644060ab3526c90e6382 /src/library/scala/concurrent/ExecutionContext.scala
parentb346ad485ff55091a370c93238628ea4fe1249b1 (diff)
downloadscala-8f36bf7a71f29af5ab61a3f58897881932c1daa3.tar.gz
scala-8f36bf7a71f29af5ab61a3f58897881932c1daa3.tar.bz2
scala-8f36bf7a71f29af5ab61a3f58897881932c1daa3.zip
Add some missing methods, remove obsolete methods in futures.
Remove `ensure`. Add `reportFailure` to execution contexts. Add `zip` to futures.
Diffstat (limited to 'src/library/scala/concurrent/ExecutionContext.scala')
-rw-r--r--src/library/scala/concurrent/ExecutionContext.scala2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/library/scala/concurrent/ExecutionContext.scala b/src/library/scala/concurrent/ExecutionContext.scala
index 5ad9265f59..40fafd130c 100644
--- a/src/library/scala/concurrent/ExecutionContext.scala
+++ b/src/library/scala/concurrent/ExecutionContext.scala
@@ -37,6 +37,8 @@ trait ExecutionContext {
def blocking[T](awaitable: Awaitable[T], atMost: Duration): T
+ def reportFailure(t: Throwable): Unit
+
/* implementations follow */
private implicit val executionContext = this