Imported Upstream version 4.2.0.179

Former-commit-id: 0a113cb3a6feb7873f632839b1307cc6033cd595
This commit is contained in:
Xamarin Public Jenkins
2015-08-26 07:17:56 -04:00
committed by Jo Shields
parent 183bba2c9a
commit 6992685b86
7507 changed files with 90259 additions and 657307 deletions

View File

@ -68,7 +68,7 @@ namespace System.Runtime.CompilerServices
/*LOCKING: _lock must be held*/
void Rehash () {
uint newSize = (uint)HashPrimeNumbers.ToPrime ((data.Length << 1) | 1);
uint newSize = (uint)HashHelpers.GetPrime ((data.Length << 1) | 1);
//Console.WriteLine ("--- resizing from {0} to {1}", data.Length, newSize);
Ephemeron[] tmp = new Ephemeron [newSize];
@ -231,7 +231,9 @@ namespace System.Runtime.CompilerServices
{
for (int i = 0; i < data.Length; ++i)
{
list.Add ((TKey) data [i].key);
TKey key = (TKey) data [i].key;
if (key != null)
list.Add (key);
}
}
return list;