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

@ -45,7 +45,7 @@ namespace System.Runtime.Caching {
{
}
public void Add (MemoryCacheEntry entry)
public new void Add (MemoryCacheEntry entry)
{
var now = DateTime.UtcNow;
if (now == prevDateTime)
@ -61,7 +61,7 @@ namespace System.Runtime.Caching {
base.Add (entry);
}
public void Remove (MemoryCacheEntry entry)
public new void Remove (MemoryCacheEntry entry)
{
base.Remove (entry);
entry.UsageEntryRef = UsageEntryRef.INVALID;