summaryrefslogtreecommitdiff
path: root/src/library/scala/concurrent/ExecutionContext.scala
diff options
context:
space:
mode:
authoraleksandar <aleksandar@lampmac14.epfl.ch>2012-01-12 15:41:53 +0100
committeraleksandar <aleksandar@lampmac14.epfl.ch>2012-01-12 15:41:53 +0100
commit7a6d66399eab9e29b0e4270b1c7e47c20471c91d (patch)
treea702515173b190aaba9fbdc5c2080a165d2500bd /src/library/scala/concurrent/ExecutionContext.scala
parentaa568432a102287881a2a524f340926c1698165b (diff)
downloadscala-7a6d66399eab9e29b0e4270b1c7e47c20471c91d.tar.gz
scala-7a6d66399eab9e29b0e4270b1c7e47c20471c91d.tar.bz2
scala-7a6d66399eab9e29b0e4270b1c7e47c20471c91d.zip
Refactor blockable to awaitable on several places.
Diffstat (limited to 'src/library/scala/concurrent/ExecutionContext.scala')
-rw-r--r--src/library/scala/concurrent/ExecutionContext.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/library/scala/concurrent/ExecutionContext.scala b/src/library/scala/concurrent/ExecutionContext.scala
index 2de080a822..ebeeca995e 100644
--- a/src/library/scala/concurrent/ExecutionContext.scala
+++ b/src/library/scala/concurrent/ExecutionContext.scala
@@ -10,7 +10,7 @@ import scala.concurrent.forkjoin.{ ForkJoinPool, RecursiveTask => FJTask, Recurs
trait ExecutionContext {
- protected implicit object CanBlockEvidence extends CanBlock
+ protected implicit object CanAwaitEvidence extends CanAwait
def execute(runnable: Runnable): Unit