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

11
mcs/class/corlib/System.Runtime.Serialization/FormatterServices.cs
View File

@ -40,11 +40,7 @@ using System.Globalization;
namespace System.Runtime.Serialization
{
[System.Runtime.InteropServices.ComVisibleAttribute (true)]
#if NET_4_5
static
#else
sealed
#endif
public class FormatterServices
{
private const BindingFlags fieldFlags = BindingFlags.Public |
@ -52,11 +48,6 @@ namespace System.Runtime.Serialization
BindingFlags.NonPublic |
BindingFlags.DeclaredOnly;
#if !NET_4_5
private FormatterServices ()
{
}
#endif
public static object [] GetObjectData (object obj, MemberInfo [] members)
{
@ -215,7 +206,6 @@ namespace System.Runtime.Serialization
return GetUninitializedObject (type);
}
#if NET_4_0
// This method was introduced in .Net due to a bug serializing objects with circular references
// which we don't appear to have, so we just return the same object.
// See http://support.microsoft.com/kb/927495/en-us/ in case of doubt.
@ -224,6 +214,5 @@ namespace System.Runtime.Serialization
{
return innerSurrogate;
}
#endif
}
}