From 6393a3e33ce0ac9f1bcad49ea2782271578b557e Mon Sep 17 00:00:00 2001 From: Martin Baulig Date: Wed, 15 Feb 2006 19:51:19 +0000 Subject: [PATCH] 2006-02-15 Martin Baulig * 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 --- .../corlib/System.Reflection.Emit/ChangeLog | 6 ++++++ .../ConstructorBuilder.cs | 12 ------------ .../System.Reflection.Emit/MethodBuilder.cs | 18 +++--------------- .../System.Reflection.Emit/TypeBuilder.cs | 7 +------ 4 files changed, 10 insertions(+), 33 deletions(-) diff --git a/mcs/class/corlib/System.Reflection.Emit/ChangeLog b/mcs/class/corlib/System.Reflection.Emit/ChangeLog index eec3c573834..3d229bedae7 100644 --- 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 + + * 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 * ConstructorBuilder.cs diff --git a/mcs/class/corlib/System.Reflection.Emit/ConstructorBuilder.cs b/mcs/class/corlib/System.Reflection.Emit/ConstructorBuilder.cs index bba54abd866..bd35c08908c 100644 --- 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 f4443cbca24..ba9574b5d2e 100644 --- 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 1578f425bbe..0795ea0939c 100644 --- 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); -- 2.25.1