mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 4.0.0~alpha1

Browse Source 
Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9
This commit is contained in:
Jo Shields
2015-04-07 09:35:12 +01:00
parent 283343f570
commit 3c1f479b9d
22469 changed files with 2931443 additions and 869343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
mcs/class/corlib/System/Exception.cs
View File

@ -120,17 +120,16 @@ 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; }
internal void SetErrorCode(int hr)
{
HResult = hr;
}
#endif
internal void SetMessage (string s)
{
message = s;
@ -159,7 +158,6 @@ namespace System
}
}
#if NET_4_0
[MonoTODO]
protected event EventHandler<SafeSerializationEventArgs> SerializeObjectState {
add {
@ -167,7 +165,6 @@ namespace System
remove {
}
}
#endif
public virtual string Source {
get {
@ -208,12 +205,12 @@ namespace System
if (internal_name != null)
sb.Append (internal_name);
else
sb.AppendFormat ("<0x{0:x5}> {1}", frame.GetNativeOffset (), unknown);
sb.AppendFormat ("<0x{0:x5} + 0x{1:x5}> {2}", frame.GetMethodAddress (), frame.GetNativeOffset (), unknown);
} else {
GetFullNameForStackTrace (sb, frame.GetMethod ());
if (frame.GetILOffset () == -1)
sb.AppendFormat (" <0x{0:x5}> ", frame.GetNativeOffset ());
sb.AppendFormat ("<0x{0:x5} + 0x{1:x5}> ", frame.GetMethodAddress (), frame.GetNativeOffset ());
else
sb.AppendFormat (" [0x{0:x5}] ", frame.GetILOffset ());