summaryrefslogtreecommitdiff
path: root/src/library/scala/concurrent/ExecutionContext.scala
diff options
context:
space:
mode:
authoraleksandar <aleksandar@lampmac14.epfl.ch>2011-12-08 15:46:11 +0100
committeraleksandar <aleksandar@lampmac14.epfl.ch>2011-12-08 15:46:11 +0100
commitdb7f44b64340a5dc24aeb28bed09241b0b902dd6 (patch)
tree714304167f808805075ae2f82412c5c9c3c55941 /src/library/scala/concurrent/ExecutionContext.scala
parentf07e5e2eef9db072ce171d1df0c9133b707f2d42 (diff)
downloadscala-db7f44b64340a5dc24aeb28bed09241b0b902dd6.tar.gz
scala-db7f44b64340a5dc24aeb28bed09241b0b902dd6.tar.bz2
scala-db7f44b64340a5dc24aeb28bed09241b0b902dd6.zip
Fixed the build.
Diffstat (limited to 'src/library/scala/concurrent/ExecutionContext.scala')
-rw-r--r--src/library/scala/concurrent/ExecutionContext.scala15
1 files changed, 5 insertions, 10 deletions
diff --git a/src/library/scala/concurrent/ExecutionContext.scala b/src/library/scala/concurrent/ExecutionContext.scala
index 9606c28bab..207e190e95 100644
--- a/src/library/scala/concurrent/ExecutionContext.scala
+++ b/src/library/scala/concurrent/ExecutionContext.scala
@@ -1,7 +1,7 @@
package scala.concurrent
-import java.util.concurrent.{ Executors, Future => JFuture }
+import java.util.concurrent.{ Executors, Future => JFuture, Callable }
import scala.util.{ Duration, Timeout }
import scala.concurrent.forkjoin.{ ForkJoinPool, RecursiveTask => FJTask, RecursiveAction, ForkJoinWorkerThread }
@@ -10,17 +10,13 @@ trait ExecutionContext {
protected implicit object CanBlockEvidence extends CanBlock
- def execute(task: Runnable): Unit
-
- def task[T](task: => T): Task[T]
+ def execute(runnable: Runnable): Unit
def promise[T]: Promise[T]
- def future[T](body: => T): Future[T] = {
- val t = task(body)
- t.start()
- t.future
- }
+ def future[T](body: Callable[T]): Future[T] = future(body.call())
+
+ def future[T](body: => T): Future[T]
/** Only callable from the tasks running on the same execution context. */
def blockingCall[T](body: Blockable[T]): T
@@ -28,7 +24,6 @@ trait ExecutionContext {
}
-
sealed trait CanBlock