diff options
| author | Paul Phillips <paulp@improving.org> | 2013-04-02 21:45:20 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2013-04-02 21:45:20 -0700 |
| commit | b575c1ed131a578a18239e3922c1ea8b7dd188a2 (patch) | |
| tree | 84d7472cff2ceced69c091fb43a4566a9d9110e5 | |
| parent | c0b3e586e3051d30fa509eb725033abfd86b7347 (diff) | |
| parent | 29a9c64fda44b5ce715e6bd9b8505b155ce64574 (diff) | |
| download | scala-b575c1ed131a578a18239e3922c1ea8b7dd188a2.tar.gz scala-b575c1ed131a578a18239e3922c1ea8b7dd188a2.tar.bz2 scala-b575c1ed131a578a18239e3922c1ea8b7dd188a2.zip | |
Merge pull request #2348 from paulp/pr/2324-edit
SI-7237 Always choose ForkJoinTaskSupport
| -rw-r--r-- | src/library/scala/collection/parallel/package.scala | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/library/scala/collection/parallel/package.scala b/src/library/scala/collection/parallel/package.scala index 85c620239a..66fbad7643 100644 --- a/src/library/scala/collection/parallel/package.scala +++ b/src/library/scala/collection/parallel/package.scala @@ -41,9 +41,7 @@ package object parallel { private[parallel] def outofbounds(idx: Int) = throw new IndexOutOfBoundsException(idx.toString) - private[parallel] def getTaskSupport: TaskSupport = - if (scala.util.Properties.isJavaAtLeast("1.6")) new ForkJoinTaskSupport - else new ThreadPoolTaskSupport + private[parallel] def getTaskSupport: TaskSupport = new ForkJoinTaskSupport val defaultTaskSupport: TaskSupport = getTaskSupport |