Skip to content

Commit f30d7d0

Browse files
committed
prepare for Dotty: avoid ambiguities
1 parent f9a2f8a commit f30d7d0

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

core/src/main/scala/scala/collection/parallel/mutable/ParHashMap.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ extends scala.collection.parallel.BucketCombiner[(K, V), ParHashMap[K, V], Defau
229229
_loadFactor = lf
230230
table = new Array[HashEntry[K, DefaultEntry[K, V]]](capacity(sizeForThreshold(_loadFactor, numelems)))
231231
tableSize = 0
232-
seedvalue = _seedvalue
232+
this.seedvalue = _seedvalue
233233
threshold = newThreshold(_loadFactor, table.length)
234234
sizeMapInit(table.length)
235235
def setSize(sz: Int) = tableSize = sz

core/src/main/scala/scala/collection/parallel/mutable/ParHashSet.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ with scala.collection.mutable.FlatHashTable.HashUtils[T] {
162162
// TODO parallelize by keeping separate size maps and merging them
163163
val tbl = new FlatHashTable[T] {
164164
sizeMapInit(table.length)
165-
seedvalue = ParHashSetCombiner.this.seedvalue
165+
this.seedvalue = ParHashSetCombiner.this.seedvalue
166166
for {
167167
buffer <- buckets
168168
if buffer ne null
@@ -184,7 +184,7 @@ with scala.collection.mutable.FlatHashTable.HashUtils[T] {
184184
table = new Array[AnyRef](capacity(FlatHashTable.sizeForThreshold(numelems, _loadFactor)))
185185
tableSize = 0
186186
threshold = FlatHashTable.newThreshold(_loadFactor, table.length)
187-
seedvalue = inseedvalue
187+
this.seedvalue = inseedvalue
188188
sizeMapInit(table.length)
189189

190190
override def toString = "AFHT(%s)".format(table.length)

0 commit comments

Comments
 (0)