Wed Aug 14 17:37:30 CEST 2002 Paolo Molaro <lupus@ximian.com>

	* MonoEvent.cs, MonoMethod.cs: implemented ReflectedType.

svn path=/trunk/mcs/; revision=6636

diff --git a/mcs/class/corlib/System.Reflection/ChangeLog b/mcs/class/corlib/System.Reflection/ChangeLog
index a50cee639b412a31ddb3a63ca373887c3f8a78a3..ea06f54291771dd4158e25a0db0ac359e1efde83 100644 (file)
--- a/mcs/class/corlib/System.Reflection/ChangeLog
+++ b/mcs/class/corlib/System.Reflection/ChangeLog
@@ -1,3 +1,8 @@
+
+Wed Aug 14 17:37:30 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+       * MonoEvent.cs, MonoMethod.cs: implemented ReflectedType.
+
 2002-08-14  Dick Porter  <dick@ximian.com>
 
        * Assembly.cs: Stub out GetSatelliteAssembly
@@ -289,3 +294,4 @@ Thu Sep 13 18:05:16 CEST 2001 Paolo Molaro <lupus@ximian.com>
 2001-07-18  Michael Lambert <michaellambert@email.com>
 
        * BindingFlags.cs: Add.
+>>>>>>> 1.52

diff --git a/mcs/class/corlib/System.Reflection/MonoEvent.cs b/mcs/class/corlib/System.Reflection/MonoEvent.cs
index 925af97b50f95326918f2059ac5f459d3ba6b4b9..9fc6b3d8b2cfbeb1d84993ab13df88e86a4bc48c 100755 (executable)
--- a/mcs/class/corlib/System.Reflection/MonoEvent.cs
+++ b/mcs/class/corlib/System.Reflection/MonoEvent.cs
@@ -65,6 +65,14 @@ namespace System.Reflection {
                                return info.parent;
                        }
                }
+               public override Type ReflectedType {
+                       get {
+                               MonoEventInfo info;
+                               MonoEventInfo.get_event_info (this, out info);
+                               
+                               return info.parent;
+                       }
+               }
                public override string Name {
                        get {
                                MonoEventInfo info;

diff --git a/mcs/class/corlib/System.Reflection/MonoMethod.cs b/mcs/class/corlib/System.Reflection/MonoMethod.cs
index 0c9e097586809c75ecbfeec20137d03f3a4401e4..ee86caf8d07376bf67c9a887f3179e49c00d0c0e 100755 (executable)
--- a/mcs/class/corlib/System.Reflection/MonoMethod.cs
+++ b/mcs/class/corlib/System.Reflection/MonoMethod.cs
@@ -34,6 +34,7 @@ namespace System.Reflection {
        internal class MonoMethod : MethodInfo {
                internal RuntimeMethodHandle mhandle;
                string name;
+               Type reftype;
                
                [MonoTODO]
                public override MethodInfo GetBaseDefinition() {
@@ -86,9 +87,7 @@ namespace System.Reflection {
                
                public override Type ReflectedType {
                        get {
-                               MonoMethodInfo info;
-                               MonoMethodInfo.get_method_info (mhandle, out info);
-                               return info.parent;
+                               return reftype;
                        }
                }
                public override Type DeclaringType {
@@ -130,6 +129,7 @@ namespace System.Reflection {
        internal class MonoCMethod : ConstructorInfo {
                internal RuntimeMethodHandle mhandle;
                string name;
+               Type reftype;
                
                public override MethodImplAttributes GetMethodImplementationFlags() {
                        MonoMethodInfo info;
@@ -169,9 +169,7 @@ namespace System.Reflection {
                
                public override Type ReflectedType {
                        get {
-                               MonoMethodInfo info;
-                               MonoMethodInfo.get_method_info (mhandle, out info);
-                               return info.parent;
+                               return reftype;
                        }
                }
                public override Type DeclaringType {