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

@@ -17,10 +17,15 @@ namespace System {
[Serializable]
[AttributeUsageAttribute(AttributeTargets.All, Inherited = true, AllowMultiple=false)]
#if !MOBILE
[ClassInterface(ClassInterfaceType.None)]
[ComDefaultInterface(typeof(_Attribute))]
[System.Runtime.InteropServices.ComVisible(true)]
public abstract partial class Attribute : _Attribute
#endif
public abstract partial class Attribute
#if !MOBILE
: _Attribute
#endif
{
#region Private Statics
#if MONO
@@ -42,15 +47,15 @@ namespace System {
var method = (MethodInfo) parameter.Member;
var definition = method.GetBaseDefinition ();
if (attributeType == null)
attributeType = typeof (Attribute);
if (method == definition)
return (Attribute []) parameter.GetCustomAttributes (typeof(Attribute), inherit);
return (Attribute []) parameter.GetCustomAttributes (attributeType, inherit);
var types = new List<Type> ();
var custom_attributes = new List<Attribute> ();
if (attributeType == null)
attributeType = typeof (Attribute);
while (true) {
var param = method.GetParametersInternal () [parameter.Position];
var param_attributes = (Attribute []) param.GetCustomAttributes (attributeType, false);
@@ -1012,7 +1017,7 @@ namespace System {
#region Public Members
public virtual bool IsDefaultAttribute() { return false; }
#endregion
#if !MOBILE
void _Attribute.GetTypeInfoCount(out uint pcTInfo)
{
throw new NotImplementedException();
@@ -1032,5 +1037,6 @@ namespace System {
{
throw new NotImplementedException();
}
#endif
}
}