2004-10-12 Martin Baulig <martin@ximian.com>

	* TypeBuilder.cs (TypeBuilder.setup_generic_class): Renamed to
	create_generic_class() and added a new setup_generic_class().
	(TypeBuilder.DefineGenericParameters): Call setup_generic_class()
	before creating the type parameters.

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

diff --git a/mcs/class/corlib/System.Reflection.Emit/ChangeLog b/mcs/class/corlib/System.Reflection.Emit/ChangeLog
index a6f488934171856b646178ce44b8a3b1318f97d8..e5f51d8cc3f1b842e784270fe82a3910dab3a8f5 100644 (file)
--- a/mcs/class/corlib/System.Reflection.Emit/ChangeLog
+++ b/mcs/class/corlib/System.Reflection.Emit/ChangeLog
@@ -1,3 +1,10 @@
+2004-10-12  Martin Baulig  <martin@ximian.com>
+
+       * TypeBuilder.cs (TypeBuilder.setup_generic_class): Renamed to
+       create_generic_class() and added a new setup_generic_class().
+       (TypeBuilder.DefineGenericParameters): Call setup_generic_class()
+       before creating the type parameters.
+
 2004-10-11  Martin Baulig  <martin@ximian.com>
 
        * TypeBuilder.cs (TypeBuilder.generic_container): New private field.

diff --git a/mcs/class/corlib/System.Reflection.Emit/TypeBuilder.cs b/mcs/class/corlib/System.Reflection.Emit/TypeBuilder.cs
index eed3b4bd824133db5d1d275c2cbb6919e2677bef..3a3bf8a7b1b3111f6a18c907ba1fe069daa74859 100644 (file)
--- a/mcs/class/corlib/System.Reflection.Emit/TypeBuilder.cs
+++ b/mcs/class/corlib/System.Reflection.Emit/TypeBuilder.cs
@@ -88,7 +88,10 @@ namespace System.Reflection.Emit {
                private extern void create_internal_class (TypeBuilder tb);
                
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
-               private extern void setup_generic_class (TypeBuilder tb);
+               private extern void setup_generic_class ();
+
+               [MethodImplAttribute(MethodImplOptions.InternalCall)]
+               private extern void create_generic_class ();
 
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
                private extern EventInfo get_event_info (EventBuilder eb);
@@ -1337,7 +1340,7 @@ namespace System.Reflection.Emit {
 
                public override Type GetGenericTypeDefinition ()
                {
-                       setup_generic_class (this);
+                       create_generic_class ();
 
                        return base.GetGenericTypeDefinition ();
                }
@@ -1373,6 +1376,8 @@ namespace System.Reflection.Emit {
 
                public GenericTypeParameterBuilder[] DefineGenericParameters (string[] names)
                {
+                       setup_generic_class ();
+
                        generic_params = new GenericTypeParameterBuilder [names.Length];
                        for (int i = 0; i < names.Length; i++)
                                generic_params [i] = new GenericTypeParameterBuilder (