[bcl] Remove NET_4_0 defines from class libs.

[mono.git] / mcs / class / corlib / System.Runtime.Serialization.Formatters.Binary / ObjectWriter.cs

diff --git a/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/ObjectWriter.cs b/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/ObjectWriter.cs
index 9d3c42bbd19d6e3c85134a0c2639f20adc501bcc..d88fd2975ebaebef64c5aa92b8c815650154bac4 100644 (file)
--- a/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/ObjectWriter.cs
+++ b/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/ObjectWriter.cs
@@ -52,7 +52,6 @@ namespace System.Runtime.Serialization.Formatters.Binary
                        return true;
                }
 
-#if NET_4_0
                public void BindToName (string assemblyName, string typeName)
                {
                        if (assemblyName != null)
@@ -60,7 +59,6 @@ namespace System.Runtime.Serialization.Formatters.Binary
                        if (typeName != null)
                                InstanceTypeName = typeName;
                }
-#endif
                
                public abstract bool RequiresTypes { get; }
        }
@@ -229,9 +227,7 @@ namespace System.Runtime.Serialization.Formatters.Binary
                StreamingContext _context;
                FormatterAssemblyStyle _assemblyFormat;
                FormatterTypeStyle _typeFormat;
-#if NET_4_0
                SerializationBinder _binder;
-#endif
                byte[] arrayBuffer;
                int ArrayBufferLength = 4096;
                SerializationObjectManager _manager;
@@ -255,9 +251,7 @@ namespace System.Runtime.Serialization.Formatters.Binary
                        _assemblyFormat = formatter.AssemblyFormat;
                        _typeFormat = formatter.TypeFormat;
                        _manager = new SerializationObjectManager (formatter.Context);
-#if NET_4_0
                        _binder = formatter.Binder;
-#endif
                }
 
                public void WriteObjectGraph (BinaryWriter writer, object obj, Header[] headers)
@@ -373,12 +367,10 @@ namespace System.Runtime.Serialization.Formatters.Binary
                private void GetObjectData (object obj, out TypeMetadata metadata, out object data)
                {
                        Type instanceType = obj.GetType();
-#if NET_4_0
                        string binderAssemblyName = null;
                        string binderTypeName = null;
                        if (_binder != null)
                                _binder.BindToName (instanceType, out binderAssemblyName, out binderTypeName);
-#endif
                        // Check if the formatter has a surrogate selector, if it does, 
                        // check if the surrogate selector handles objects of the given type. 
 
@@ -391,10 +383,8 @@ namespace System.Runtime.Serialization.Formatters.Binary
                                        SerializationInfo info = new SerializationInfo (instanceType, new FormatterConverter ());
                                        surrogate.GetObjectData (obj, info, _context);
                                        metadata = new SerializableTypeMetadata (instanceType, info);
-#if NET_4_0
                                        if (_binder != null)
                                                metadata.BindToName (binderAssemblyName, binderTypeName);
-#endif
 
                                        data = info;
                                        return;
@@ -414,10 +404,8 @@ namespace System.Runtime.Serialization.Formatters.Binary
                                SerializationInfo info = new SerializationInfo (instanceType, new FormatterConverter ());
                                ser.GetObjectData (info, _context);
                                metadata = new SerializableTypeMetadata (instanceType, info);
-#if NET_4_0
                                if (_binder != null)
                                        metadata.BindToName (binderAssemblyName, binderTypeName);
-#endif
 
                                data = info;
                        } 
@@ -429,10 +417,8 @@ namespace System.Runtime.Serialization.Formatters.Binary
                                        // Don't cache metadata info when the Context property is not null sice
                                        // we can't control the number of possible contexts in this case
                                        metadata = new MemberTypeMetadata (instanceType, _context);
-#if NET_4_0
                                        if (_binder != null)
                                                metadata.BindToName (binderAssemblyName, binderTypeName);
-#endif
 
                                        return;
                                }
@@ -456,10 +442,8 @@ namespace System.Runtime.Serialization.Formatters.Binary
 
                                        if (metadata == null) {
                                                metadata = CreateMemberTypeMetadata (instanceType);
-#if NET_4_0
                                                if (_binder != null)
                                                        metadata.BindToName (binderAssemblyName, binderTypeName);
-#endif
                                        }
 
                                        typesTable [instanceType] = metadata;