projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[bcl] Remove NET_4_5 defines from class libs.
[mono.git]
/
mcs
/
class
/
corlib
/
System.Reflection
/
TypeDelegator.cs
diff --git
a/mcs/class/corlib/System.Reflection/TypeDelegator.cs
b/mcs/class/corlib/System.Reflection/TypeDelegator.cs
index f663033fbfba4cfe791f43293c9fa74fd3970fb6..8beffb64cd216b1469aabef6db6e0864f5a16685 100644
(file)
--- a/
mcs/class/corlib/System.Reflection/TypeDelegator.cs
+++ b/
mcs/class/corlib/System.Reflection/TypeDelegator.cs
@@
-34,11
+34,11
@@
using System.Runtime.InteropServices;
namespace System.Reflection {
namespace System.Reflection {
-#if NET_2_0
[ComVisible (true)]
[ComVisible (true)]
-#endif
[Serializable]
[Serializable]
- public class TypeDelegator : Type {
+ public class TypeDelegator :
+ TypeInfo, IReflectableType
+ {
protected Type typeImpl;
protected TypeDelegator () {
protected Type typeImpl;
protected TypeDelegator () {
@@
-103,9
+103,7
@@
namespace System.Reflection {
return typeImpl.GetConstructor (bindingAttr, binder, callConvention, types, modifiers);
}
return typeImpl.GetConstructor (bindingAttr, binder, callConvention, types, modifiers);
}
-#if NET_2_0
[ComVisible (true)]
[ComVisible (true)]
-#endif
public override ConstructorInfo[] GetConstructors( BindingFlags bindingAttr)
{
return typeImpl.GetConstructors (bindingAttr);
public override ConstructorInfo[] GetConstructors( BindingFlags bindingAttr)
{
return typeImpl.GetConstructors (bindingAttr);
@@
-156,9
+154,7
@@
namespace System.Reflection {
return typeImpl.GetInterface (name, ignoreCase);
}
return typeImpl.GetInterface (name, ignoreCase);
}
-#if NET_2_0
[ComVisible (true)]
[ComVisible (true)]
-#endif
public override InterfaceMapping GetInterfaceMap( Type interfaceType)
{
return typeImpl.GetInterfaceMap (interfaceType);
public override InterfaceMapping GetInterfaceMap( Type interfaceType)
{
return typeImpl.GetInterfaceMap (interfaceType);
@@
-254,37
+250,23
@@
namespace System.Reflection {
return typeImpl.IsValueType;
}
return typeImpl.IsValueType;
}
-#if NET_2_0 || BOOTSTRAP_NET_2_0
- public override Type[] GetGenericArguments ()
- {
- throw new NotImplementedException ();
- }
-
-
- public override bool ContainsGenericParameters {
+ public override int MetadataToken {
get {
get {
-
throw new NotImplementedException ()
;
+
return typeImpl.MetadataToken
;
}
}
}
}
- public override bool IsGenericParameter {
- get {
- throw new NotImplementedException ();
- }
+ public override bool IsConstructedGenericType {
+ get { return typeImpl.IsConstructedGenericType; }
}
}
- public override int GenericParameterPosition {
- get {
- throw new NotImplementedException ();
- }
- }
+ public override bool IsAssignableFrom (TypeInfo typeInfo)
+ {
+ if (typeInfo == null)
+ throw new ArgumentNullException ("typeInfo");
- public override int MetadataToken {
- get {
- return typeImpl.MetadataToken;
- }
+ return IsAssignableFrom (typeInfo.AsType ());
}
}
-#endif
}
}
}
}