Merge pull request #409 from Alkarex/patch-1

[mono.git] / mcs / class / corlib / System / Exception.cs

diff --git a/mcs/class/corlib/System/Exception.cs b/mcs/class/corlib/System/Exception.cs
index 40e7ad173588c163cae62350c2f910c9f147b17a..40fb0cfe6bacf2fef3efa47d19af7ce2dcb26bd9 100644 (file)
--- a/mcs/class/corlib/System/Exception.cs
+++ b/mcs/class/corlib/System/Exception.cs
@@ -63,6 +63,7 @@ namespace System
                string source;
                IDictionary _data;
                StackTrace[] captured_traces;
+               IntPtr[] native_trace_ips;
                #endregion
 #pragma warning restore 169, 649
 
@@ -114,11 +115,17 @@ namespace System
                        set { help_link = value; }
                }
 
+#if NET_4_5
+               public int HResult {
+                       get { return hresult; }
+                       protected set { hresult = value; }
+               }
+#else
                protected int HResult {
                        get { return hresult; }
                        set { hresult = value; }
                }
-
+#endif
                internal void SetMessage (string s)
                {
                        message = s;
@@ -358,7 +365,7 @@ namespace System
                                if (i > 0)
                                        sb.Append (", ");
                                Type pt = p[i].ParameterType;
-                               if (pt.IsClass && pt.Namespace != String.Empty) {
+                               if (pt.IsClass && !String.IsNullOrEmpty (pt.Namespace)) {
                                        sb.Append (pt.Namespace);
                                        sb.Append (".");
                                }