Imported Upstream version 4.2.0.179

Former-commit-id: 4610231f55806d2a05ed69e5ff3faa7336cc1479
This commit is contained in:
Xamarin Public Jenkins
2015-08-26 07:17:56 -04:00
committed by Jo Shields
parent aa7da660d6
commit c042cd0c52
7507 changed files with 90259 additions and 657307 deletions

View File

@@ -586,7 +586,7 @@ namespace System.Threading
/// </summary>
private static int GetNewTableSize(int minSize)
{
if ((uint)minSize > Array.MaxArrayLength)
if ((uint)minSize > Array_ReferenceSources.MaxArrayLength)
{
// Intentionally return a value that will result in an OutOfMemoryException
return int.MaxValue;
@@ -621,9 +621,9 @@ namespace System.Threading
newSize++;
// Don't set newSize to more than Array.MaxArrayLength
if ((uint)newSize > Array.MaxArrayLength)
if ((uint)newSize > Array_ReferenceSources.MaxArrayLength)
{
newSize = Array.MaxArrayLength;
newSize = Array_ReferenceSources.MaxArrayLength;
}
return newSize;