summaryrefslogtreecommitdiff
path: root/src/library/scala/collection/parallel/Tasks.scala
diff options
context:
space:
mode:
authorAleksandar Pokopec <aleksandar.prokopec@epfl.ch>2011-02-10 10:17:42 +0000
committerAleksandar Pokopec <aleksandar.prokopec@epfl.ch>2011-02-10 10:17:42 +0000
commit5749084921c4868836d888bf6b0c3b28b094b09d (patch)
treeb86f79128d09921f23782ca5864cb4ed6c0d1187 /src/library/scala/collection/parallel/Tasks.scala
parent854de25ee63e85c3bda6f0205f25b341458dd5f1 (diff)
downloadscala-5749084921c4868836d888bf6b0c3b28b094b09d.tar.gz
scala-5749084921c4868836d888bf6b0c3b28b094b09d.tar.bz2
scala-5749084921c4868836d888bf6b0c3b28b094b09d.zip
Updated docs. No review.
Diffstat (limited to 'src/library/scala/collection/parallel/Tasks.scala')
-rw-r--r--src/library/scala/collection/parallel/Tasks.scala15
1 files changed, 11 insertions, 4 deletions
diff --git a/src/library/scala/collection/parallel/Tasks.scala b/src/library/scala/collection/parallel/Tasks.scala
index 13a41eb7d4..6f00547925 100644
--- a/src/library/scala/collection/parallel/Tasks.scala
+++ b/src/library/scala/collection/parallel/Tasks.scala
@@ -1,3 +1,12 @@
+/* __ *\
+** ________ ___ / / ___ Scala API **
+** / __/ __// _ | / / / _ | (c) 2003-2011, LAMP/EPFL **
+** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
+** /____/\___/_/ |_/____/_/ | | **
+** |/ **
+\* */
+
+
package scala.collection.parallel
@@ -13,10 +22,7 @@ import annotation.unchecked.uncheckedVariance
/** A trait that declares task execution capabilities used
- * by parallel collections. Parallel collections inherit a subtrait
- * of this trait.
- *
- * One implementation trait of `TaskExecution` is `ForkJoinTaskExecution`.
+ * by parallel collections.
*/
trait Tasks {
@@ -214,6 +220,7 @@ trait AdaptiveWorkStealingTasks extends Tasks {
}
+/** An implementation of tasks objects based on the Java thread pooling API. */
trait ThreadPoolTasks extends Tasks {
import java.util.concurrent._