2006-02-15 Martin Baulig <martin@ximian.com>

	* TypeBuilder.cs (TypeBuilder.DefineMethod): Also enable the
	2-argument version in the `BOOTSTRAP_NET_2_0' profile.
	(TypeBuilder.DefineGenericMethod): Removed.

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

diff --git a/mcs/class/corlib/System.Reflection.Emit/ChangeLog b/mcs/class/corlib/System.Reflection.Emit/ChangeLog
index eec3c5738348b8dc6e6fbc23c894a955ac85a90c..3d229bedae7267401ef2151a757edea3fe2a4cc8 100644 (file)
--- a/mcs/class/corlib/System.Reflection.Emit/ChangeLog
+++ b/mcs/class/corlib/System.Reflection.Emit/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-15  Martin Baulig  <martin@ximian.com>
+
+       * TypeBuilder.cs (TypeBuilder.DefineMethod): Also enable the
+       2-argument version in the `BOOTSTRAP_NET_2_0' profile.
+       (TypeBuilder.DefineGenericMethod): Removed.
+
 2006-02-14  Martin Baulig  <martin@ximian.com>
 
        * ConstructorBuilder.cs

diff --git a/mcs/class/corlib/System.Reflection.Emit/ConstructorBuilder.cs b/mcs/class/corlib/System.Reflection.Emit/ConstructorBuilder.cs
index bba54abd8664a7a82c9c80ec3a2e9651d1aee7b8..bd35c08908cfe15f9aabaeba709102258006a0ca 100644 (file)
--- a/mcs/class/corlib/System.Reflection.Emit/ConstructorBuilder.cs
+++ b/mcs/class/corlib/System.Reflection.Emit/ConstructorBuilder.cs
@@ -270,18 +270,6 @@ namespace System.Reflection.Emit {
                }
 
 #if NET_2_0 || BOOTSTRAP_NET_2_0
-               public override bool Mono_IsInflatedMethod {
-                       get {
-                               return false;
-                       }
-               }
-
-               public override bool HasGenericParameters {
-                       get {
-                               return false;
-                       }
-               }
-
                public override bool IsGenericMethodDefinition {
                        get {
                                return false;

diff --git a/mcs/class/corlib/System.Reflection.Emit/MethodBuilder.cs b/mcs/class/corlib/System.Reflection.Emit/MethodBuilder.cs
index f4443cbca2414b8ad4b9935e0e91404f3561e953..ba9574b5d2eb41930920c79b7b3359fb6f4cbfbb 100644 (file)
--- a/mcs/class/corlib/System.Reflection.Emit/MethodBuilder.cs
+++ b/mcs/class/corlib/System.Reflection.Emit/MethodBuilder.cs
@@ -482,27 +482,15 @@ namespace System.Reflection.Emit {
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
                public override extern MethodInfo MakeGenericMethod (Type [] types);
 
-               public override bool Mono_IsInflatedMethod {
-                       get {
-                               return false;
-                       }
-               }
-
-               public override bool HasGenericParameters {
-                       get {
-                               return generic_params != null;
-                       }
-               }
-
                public override bool IsGenericMethodDefinition {
                        get {
-                               return HasGenericParameters;
+                               return generic_params != null;
                        }
                }
 
                public override bool IsGenericMethod {
                        get {
-                               return HasGenericParameters;
+                               return generic_params != null;
                        }
                }
 
@@ -543,7 +531,7 @@ namespace System.Reflection.Emit {
                        this.attrs = attributes;
                        this.call_conv = callingConvention;
                        if ((attributes & MethodAttributes.Static) == 0)
-                               this.call_conv |= CallingConventions.HasThis;
+                               this.call_conv |= CallingConventions.HasThis;
 
                        this.rtype = return_type;
                        this.parameters = new Type [parameter_types.Length];

diff --git a/mcs/class/corlib/System.Reflection.Emit/TypeBuilder.cs b/mcs/class/corlib/System.Reflection.Emit/TypeBuilder.cs
index 1578f425bbebfd7af93798a8c1720762072a10b9..0795ea0939c56145f7cca5af3ed2d05180746b19 100644 (file)
--- a/mcs/class/corlib/System.Reflection.Emit/TypeBuilder.cs
+++ b/mcs/class/corlib/System.Reflection.Emit/TypeBuilder.cs
@@ -568,7 +568,7 @@ namespace System.Reflection.Emit {
                                nativeCallConv, nativeCharSet);
                }
 
-#if NET_2_0
+#if NET_2_0 || BOOTSTRAP_NET_2_0
                public MethodBuilder DefineMethod (string name, MethodAttributes attributes) {
                        return DefineMethod (name, attributes, CallingConventions.Standard);
                }
@@ -1525,11 +1525,6 @@ namespace System.Reflection.Emit {
                        return generic_params;
                }
 
-               public MethodBuilder DefineGenericMethod (string name, MethodAttributes attributes)
-               {
-                       return DefineMethod (name, attributes, CallingConventions.Standard, null, null);
-               }
-
                 public static ConstructorInfo GetConstructor (Type instanciated, ConstructorInfo ctor)
                 {
                        ConstructorInfo res = instanciated.GetConstructor (ctor);