summaryrefslogtreecommitdiff
path: root/src/library/scala/collection/parallel/package.scala
diff options
context:
space:
mode:
authorAleksandar Prokopec <axel22@gmail.com>2012-02-02 19:59:12 +0100
committerAleksandar Prokopec <axel22@gmail.com>2012-02-02 19:59:12 +0100
commit2d9dfe3077fa2b43a336548cad98a522215c52a9 (patch)
treec0d8a801230fc8b0984e0ae416a4bd21c4ded35f /src/library/scala/collection/parallel/package.scala
parentc3d19c58d8a94b7232718321f6994c001257cc96 (diff)
downloadscala-2d9dfe3077fa2b43a336548cad98a522215c52a9.tar.gz
scala-2d9dfe3077fa2b43a336548cad98a522215c52a9.tar.bz2
scala-2d9dfe3077fa2b43a336548cad98a522215c52a9.zip
Add parallel Ctrie parallel collection.
Diffstat (limited to 'src/library/scala/collection/parallel/package.scala')
-rw-r--r--src/library/scala/collection/parallel/package.scala11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/library/scala/collection/parallel/package.scala b/src/library/scala/collection/parallel/package.scala
index cdb9944fdc..8f19d0ecdb 100644
--- a/src/library/scala/collection/parallel/package.scala
+++ b/src/library/scala/collection/parallel/package.scala
@@ -196,22 +196,23 @@ package parallel {
* the receiver (which will be the return value).
*/
private[parallel] abstract class BucketCombiner[-Elem, +To, Buck, +CombinerType <: BucketCombiner[Elem, To, Buck, CombinerType]]
- (private val bucketnumber: Int)
+ (private val bucketnumber: Int)
extends Combiner[Elem, To] {
//self: EnvironmentPassingCombiner[Elem, To] =>
protected var buckets: Array[UnrolledBuffer[Buck]] @uncheckedVariance = new Array[UnrolledBuffer[Buck]](bucketnumber)
protected var sz: Int = 0
-
+
def size = sz
-
+
def clear() = {
buckets = new Array[UnrolledBuffer[Buck]](bucketnumber)
sz = 0
}
-
+
def beforeCombine[N <: Elem, NewTo >: To](other: Combiner[N, NewTo]) {}
+
def afterCombine[N <: Elem, NewTo >: To](other: Combiner[N, NewTo]) {}
-
+
def combine[N <: Elem, NewTo >: To](other: Combiner[N, NewTo]): Combiner[N, NewTo] = {
if (this eq other) this
else other match {