diff options
| author | Aleksandar Pokopec <aleksandar.prokopec@epfl.ch> | 2010-12-09 10:08:11 +0000 |
|---|---|---|
| committer | Aleksandar Pokopec <aleksandar.prokopec@epfl.ch> | 2010-12-09 10:08:11 +0000 |
| commit | a730fb5cc6cea39a29e9ff4cd666fa8498f6adec (patch) | |
| tree | a271e1b7cdd2bd044344fa7aef19d6820637b3a5 /src/library/scala/collection/mutable/PriorityQueue.scala | |
| parent | 4dbe72f83f7ade1517bad7444009d3d0c8a69bd5 (diff) | |
| download | scala-a730fb5cc6cea39a29e9ff4cd666fa8498f6adec.tar.gz scala-a730fb5cc6cea39a29e9ff4cd666fa8498f6adec.tar.bz2 scala-a730fb5cc6cea39a29e9ff4cd666fa8498f6adec.zip | |
Fixing jvm 1.5 support for parallel collections.
Special cased with thread pool executor scheduling. Fixed an ugly
concurrency bug where futures returned by a thread pool executor didn't
remove the task from the queue when cancel was called. Note to self and
others: don't cancel futures returned by thread pool executors, it might
lead to unexpected behaviour. Modified the executor to add new threads
if all the active threads are syncing, in order to avoid deadlocks.
Fixed a hidden bug in AdaptiveWorkStealingTasks, where correct behaviour
depended on the execution order of the tasks. This didn't fail before
with ForkJoinTasks, since there the execution order is well-defined.
Scalachecked 1.5 & 1.6 support.
No review.
Diffstat (limited to 'src/library/scala/collection/mutable/PriorityQueue.scala')
| -rw-r--r-- | src/library/scala/collection/mutable/PriorityQueue.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/library/scala/collection/mutable/PriorityQueue.scala b/src/library/scala/collection/mutable/PriorityQueue.scala index 45f1d1f06f..453bed54e6 100644 --- a/src/library/scala/collection/mutable/PriorityQueue.scala +++ b/src/library/scala/collection/mutable/PriorityQueue.scala @@ -15,8 +15,8 @@ import generic._ import annotation.migration /** This class implements priority queues using a heap. - * To prioritize elements of type T there must be an implicit - * Ordering[T] available at creation. + * To prioritize elements of type A there must be an implicit + * Ordering[A] available at creation. * * @tparam A type of the elements in this priority queue. * @param ord implicit ordering used to compare the elements of type `A`. |