Wed Jun 23 15:40:48 CEST 2004 Paolo Molaro <lupus@ximian.com>

	* TypeBuilder.cs: handle properly the case when SetParent()
	is called (requires an updated runtime, too bug#60474).

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

diff --git a/mcs/class/corlib/System.Reflection.Emit/ChangeLog b/mcs/class/corlib/System.Reflection.Emit/ChangeLog
index 7463fe64529244062f677a317b5f74fb4b005086..9fc4aa442ec5e97f452eea5e292dcb17528aac8b 100644 (file)
--- a/mcs/class/corlib/System.Reflection.Emit/ChangeLog
+++ b/mcs/class/corlib/System.Reflection.Emit/ChangeLog
@@ -1,4 +1,9 @@
 
+Wed Jun 23 15:40:48 CEST 2004 Paolo Molaro <lupus@ximian.com>
+
+       * TypeBuilder.cs: handle properly the case when SetParent() 
+       is called (requires an updated runtime, too bug#60474).
+
 Wed Jun 23 14:20:47 CEST 2004 Paolo Molaro <lupus@ximian.com>
 
        * EnumBuilder.cs, TypeBuilder.cs: patch from Gert Driesen

diff --git a/mcs/class/corlib/System.Reflection.Emit/TypeBuilder.cs b/mcs/class/corlib/System.Reflection.Emit/TypeBuilder.cs
index b1d34980d02afead57c1bf9a7136ec616e57934c..1f6884bdc126fb0adb607c41b5f8c1e178d43852 100644 (file)
--- a/mcs/class/corlib/System.Reflection.Emit/TypeBuilder.cs
+++ b/mcs/class/corlib/System.Reflection.Emit/TypeBuilder.cs
@@ -1257,6 +1257,8 @@ namespace System.Reflection.Emit {
                                throw not_after_created ();
 
                        parent = parentType;
+                       // will just set the parent-related bits if called a second time
+                       setup_internal_class (this);
                }
                internal int get_next_table_index (object obj, int table, bool inc) {
                        return pmodule.get_next_table_index (obj, table, inc);