diff options
| author | Paul Phillips <paulp@improving.org> | 2012-03-14 10:03:52 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-03-14 10:03:52 -0700 |
| commit | 0c9ffe55c774de261d32f36cc29b954638e86574 (patch) | |
| tree | 5b84b76b14c00bd776a9e8da6f403b204d4043b8 /test | |
| parent | fbeceb8f38f0a02bbfcc03ddbb0aea15dfa2f63a (diff) | |
| parent | 57475a8eca20a89bc7be326a9b198d2eff0bcc43 (diff) | |
| download | scala-0c9ffe55c774de261d32f36cc29b954638e86574.tar.gz scala-0c9ffe55c774de261d32f36cc29b954638e86574.tar.bz2 scala-0c9ffe55c774de261d32f36cc29b954638e86574.zip | |
Merge remote-tracking branches 'soc/fix-todos' and 'axel22/feature/pc-execution-contexts' into develop
Diffstat (limited to 'test')
| -rw-r--r-- | test/benchmarking/ParCtrie-map.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/benchmarking/ParCtrie-map.scala b/test/benchmarking/ParCtrie-map.scala index c8de99f33e..f1d2f560b7 100644 --- a/test/benchmarking/ParCtrie-map.scala +++ b/test/benchmarking/ParCtrie-map.scala @@ -10,7 +10,7 @@ object Map extends testing.Benchmark { val par = sys.props("par").toInt val parctrie = ParCtrie((0 until length) zip (0 until length): _*) - collection.parallel.ForkJoinTasks.defaultForkJoinPool.setParallelism(par) + parctrie.tasksupport = new collection.parallel.ForkJoinTaskSupport(new scala.concurrent.forkjoin.ForkJoinPool(par)) def run = { parctrie map { |