2007-08-17 Zoltan Varga <vargaz@gmail.com>

	* Exception.cs: Make 1.0 and 2.0 object layout the same since this class is seen
	by the runtime. Fixes #82459.

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

diff --git a/mcs/class/corlib/System/ChangeLog b/mcs/class/corlib/System/ChangeLog
index bf473f0deea16faeaf35ecc51101c0be770be400..c196713c25a9840cb25d4dc4fe96181489f51eec 100644 (file)
--- a/mcs/class/corlib/System/ChangeLog
+++ b/mcs/class/corlib/System/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-17  Zoltan Varga  <vargaz@gmail.com>
+
+       * Exception.cs: Make 1.0 and 2.0 object layout the same since this class is seen
+       by the runtime. Fixes #82459.
+
 2007-08-16  Gert Driesen  <drieseng@users.sourceforge.net>
 
        * MonoCustomAttrs.cs: In IsDefined, throw ArgumentNullException if

diff --git a/mcs/class/corlib/System/Exception.cs b/mcs/class/corlib/System/Exception.cs
index a233a8b7256e41a35253432793c2692a3df66a57..97a6d5bd3fd9d77d644c89aa93a72282ffb289ae 100644 (file)
--- a/mcs/class/corlib/System/Exception.cs
+++ b/mcs/class/corlib/System/Exception.cs
@@ -52,6 +52,7 @@ namespace System
        , _Exception
 #endif
        {
+               #region Sync with object-internals.h
                IntPtr [] trace_ips;
                Exception inner_exception;
                internal string message;
@@ -62,6 +63,8 @@ namespace System
                int remote_stack_index;
                internal int hresult = unchecked ((int)0x80004005);
                string source;
+               private IDictionary _data;
+               #endregion
 
                public Exception ()
                {
@@ -215,8 +218,6 @@ namespace System
                }
 
 #if NET_2_0
-               private IDictionary _data;
-
                public virtual IDictionary Data {
                        get {
                                if (_data == null) {