diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2016-11-16 16:26:41 +1000 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2016-11-16 16:33:18 +1000 |
commit | 1ae160037b1d2b603a20595caa44ad2ce3b8dcd6 (patch) | |
tree | 02a52661063e809f78ee7213192e087a9ff42feb /src/library | |
parent | 371bc2c7fcd128deb61e8249588138b7e2b0d2b0 (diff) | |
download | scala-1ae160037b1d2b603a20595caa44ad2ce3b8dcd6.tar.gz scala-1ae160037b1d2b603a20595caa44ad2ce3b8dcd6.tar.bz2 scala-1ae160037b1d2b603a20595caa44ad2ce3b8dcd6.zip |
Restore binary compatiblity with 2.12.0
- Revert a typo fix to a non-private method
- Whitelist changes to internals of runtime reflection that
are not part of the API and should only be referenced from
within scala-reflect.jar itself.
Diffstat (limited to 'src/library')
-rw-r--r-- | src/library/scala/collection/mutable/HashTable.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/library/scala/collection/mutable/HashTable.scala b/src/library/scala/collection/mutable/HashTable.scala index bd6fb508fe..a6a6e1e432 100644 --- a/src/library/scala/collection/mutable/HashTable.scala +++ b/src/library/scala/collection/mutable/HashTable.scala @@ -396,11 +396,11 @@ private[collection] object HashTable { /** The load factor for the hash table (in 0.001 step). */ private[collection] final def defaultLoadFactor: Int = 750 // corresponds to 75% - private[collection] final def loadFactorDenom = 1000 + private[collection] final def loadFactorDenum = 1000 // should be loadFactorDenom, but changing that isn't binary compatible - private[collection] final def newThreshold(_loadFactor: Int, size: Int) = ((size.toLong * _loadFactor) / loadFactorDenom).toInt + private[collection] final def newThreshold(_loadFactor: Int, size: Int) = ((size.toLong * _loadFactor) / loadFactorDenum).toInt - private[collection] final def sizeForThreshold(_loadFactor: Int, thr: Int) = ((thr.toLong * loadFactorDenom) / _loadFactor).toInt + private[collection] final def sizeForThreshold(_loadFactor: Int, thr: Int) = ((thr.toLong * loadFactorDenum) / _loadFactor).toInt private[collection] final def capacity(expectedSize: Int) = if (expectedSize == 0) 1 else powerOfTwo(expectedSize) |