2004-04-07 Bernie Solomon <bernard@ugsolutions.com>

	* MethodBuilder.cs, TypeBuilder.cs: always have
	slot for generic_params for consistent offsets.

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

diff --git a/mcs/class/corlib/System.Reflection.Emit/ChangeLog b/mcs/class/corlib/System.Reflection.Emit/ChangeLog
index c05c1056cbb25fe6b89ea51ad473de8ac8b6f4f5..837d0d2414f749bb13d79e9b3ba652f065fe61d3 100644 (file)
--- a/mcs/class/corlib/System.Reflection.Emit/ChangeLog
+++ b/mcs/class/corlib/System.Reflection.Emit/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-07  Bernie Solomon  <bernard@ugsolutions.com>
+
+       * MethodBuilder.cs, TypeBuilder.cs: always have 
+       slot for generic_params for consistent offsets.
+
 2004-04-07  Martin Baulig  <martin@ximian.com>
 
        * GenericTypeParameterBuilder.cs: New file.

diff --git a/mcs/class/corlib/System.Reflection.Emit/MethodBuilder.cs b/mcs/class/corlib/System.Reflection.Emit/MethodBuilder.cs
index 1d64757d041e32730c2441377fe1115de120495d..5fcb4d0d80ca05fb9791169bb996471eb812d9a3 100755 (executable)
--- a/mcs/class/corlib/System.Reflection.Emit/MethodBuilder.cs
+++ b/mcs/class/corlib/System.Reflection.Emit/MethodBuilder.cs
@@ -40,6 +40,8 @@ namespace System.Reflection.Emit {
                private bool init_locals = true;
 #if NET_1_2
                private GenericTypeParameterBuilder[] generic_params;
+#else
+               private Object generic_params; /* so offsets are the same */
 #endif
                private Type[] returnModReq;
                private Type[] returnModOpt;

diff --git a/mcs/class/corlib/System.Reflection.Emit/TypeBuilder.cs b/mcs/class/corlib/System.Reflection.Emit/TypeBuilder.cs
index 353c5aa22079bea948788d2feb8becb02b6cdd08..90460e8c7b744e482bbaee8e74ff48bfa27b9554 100644 (file)
--- a/mcs/class/corlib/System.Reflection.Emit/TypeBuilder.cs
+++ b/mcs/class/corlib/System.Reflection.Emit/TypeBuilder.cs
@@ -43,6 +43,8 @@ namespace System.Reflection.Emit {
        private PackingSize packing_size;
 #if NET_1_2
        private GenericTypeParameterBuilder[] generic_params;
+#else
+        private Object generic_params; /* so offsets don't change */
 #endif
        private RefEmitPermissionSet[] permissions;     
        #endregion