diff options
| author | Aleksandar Pokopec <aleksandar.prokopec@epfl.ch> | 2011-01-26 08:37:23 +0000 |
|---|---|---|
| committer | Aleksandar Pokopec <aleksandar.prokopec@epfl.ch> | 2011-01-26 08:37:23 +0000 |
| commit | 78a48c46cf3727dd06179cb1360b2f9057647042 (patch) | |
| tree | 01f418fab8ee1cd61c5a6a891bdce09cde142098 /src/library/scala/collection/parallel/Tasks.scala | |
| parent | 78007ac467c9d6e88ae183a9126772829072704c (diff) | |
| download | scala-78a48c46cf3727dd06179cb1360b2f9057647042.tar.gz scala-78a48c46cf3727dd06179cb1360b2f9057647042.tar.bz2 scala-78a48c46cf3727dd06179cb1360b2f9057647042.zip | |
Merge branch 'work'
Conflicts:
src/library/scala/concurrent/SyncVar.scala
Diffstat (limited to 'src/library/scala/collection/parallel/Tasks.scala')
| -rw-r--r-- | src/library/scala/collection/parallel/Tasks.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/library/scala/collection/parallel/Tasks.scala b/src/library/scala/collection/parallel/Tasks.scala index e88d5dd0e0..13a41eb7d4 100644 --- a/src/library/scala/collection/parallel/Tasks.scala +++ b/src/library/scala/collection/parallel/Tasks.scala @@ -417,9 +417,9 @@ trait ForkJoinTasks extends Tasks with HavingForkJoinPool { object ForkJoinTasks { - val defaultForkJoinPool: ForkJoinPool = new ForkJoinPool - defaultForkJoinPool.setParallelism(Runtime.getRuntime.availableProcessors) - defaultForkJoinPool.setMaximumPoolSize(Runtime.getRuntime.availableProcessors) + val defaultForkJoinPool: ForkJoinPool = scala.parallel.forkjoinpool + // defaultForkJoinPool.setParallelism(Runtime.getRuntime.availableProcessors) + // defaultForkJoinPool.setMaximumPoolSize(Runtime.getRuntime.availableProcessors) } |