diff options
| author | Zoltan Varga <vargaz@gmail.com> | 2004-09-09 14:17:03 +0400 |
|---|---|---|
| committer | Zoltan Varga <vargaz@gmail.com> | 2004-09-09 14:17:03 +0400 |
| commit | e1b7e8c457247c6a89c805cf1ce3eb98b8a74d36 (patch) | |
| tree | 547314bb5e08420824197fcec1c99a6dd78deb7e | |
| parent | c86617e74bf7da9d1d4ad326aa460fa012992170 (diff) | |
Merge from HEAD.
svn path=/branches/mono-1-0/mcs/; revision=33634
| -rw-r--r-- | mcs/class/corlib/System.Reflection.Emit/ChangeLog | 2 | ||||
| -rw-r--r-- | mcs/class/corlib/System.Reflection.Emit/TypeBuilder.cs | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/mcs/class/corlib/System.Reflection.Emit/ChangeLog b/mcs/class/corlib/System.Reflection.Emit/ChangeLog index 1efc626a916..8885e3c981a 100644 --- a/mcs/class/corlib/System.Reflection.Emit/ChangeLog +++ b/mcs/class/corlib/System.Reflection.Emit/ChangeLog @@ -1,5 +1,7 @@ 2004-09-09 Zoltan Varga <vargaz@freemail.hu> + * TypeBuilder.cs: Set the table_idx of the global type to 1. + * ModuleBuilder.cs: Save the main module of the assembly even if it is transient. diff --git a/mcs/class/corlib/System.Reflection.Emit/TypeBuilder.cs b/mcs/class/corlib/System.Reflection.Emit/TypeBuilder.cs index c0059b54286..edcf429d9cc 100644 --- a/mcs/class/corlib/System.Reflection.Emit/TypeBuilder.cs +++ b/mcs/class/corlib/System.Reflection.Emit/TypeBuilder.cs @@ -97,6 +97,7 @@ namespace System.Reflection.Emit { this.attrs = attr; this.class_size = 0; fullname = this.tname = "<Module>"; + this.table_idx = 1; this.nspace = ""; pmodule = mb; setup_internal_class (this); @@ -987,7 +988,7 @@ namespace System.Reflection.Emit { public override Type[] GetNestedTypes (BindingFlags bindingAttr) { bool match; ArrayList result = new ArrayList (); - + if (subtypes == null) return Type.EmptyTypes; foreach (TypeBuilder t in subtypes) { |