Imported Upstream version 5.16.0.112

Former-commit-id: 6cc2610f66eef3edea492b48d5312acef686f417
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-08-16 08:23:32 +00:00
parent 8622ac6ee2
commit 14c2d0c196
45 changed files with 64 additions and 35 deletions

View File

@@ -810,5 +810,20 @@ namespace System
return false;
}
}
[System.Runtime.InteropServices.ComVisible(true)]
[Pure]
public override bool IsSubclassOf(Type type)
{
if ((object)type == null)
throw new ArgumentNullException("type");
Contract.EndContractBlock();
RuntimeType rtType = type as RuntimeType;
if (rtType == null)
return false;
return RuntimeTypeHandle.IsSubclassOf (this, rtType);
}
}
}

View File

@@ -250,5 +250,13 @@ namespace System
[MethodImplAttribute(MethodImplOptions.InternalCall)]
internal extern static IntPtr GetGenericParameterInfo (RuntimeType type);
internal static bool IsSubclassOf (RuntimeType childType, RuntimeType baseType)
{
return is_subclass_of (childType._impl.Value, baseType._impl.Value);
}
[MethodImplAttribute(MethodImplOptions.InternalCall)]
internal extern static bool is_subclass_of (IntPtr childType, IntPtr baseType);
}
}

View File

@@ -1 +1 @@
744f1a217a1af896659e714634a6b4c7b8a08b5a
80fe02b425454e3f5205fb0e48c932f6fbe95c5e