Normalize the line endings to CRLF.

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

diff --git a/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/MessageFormatter.cs b/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/MessageFormatter.cs
index 19dfc70259b216dc9c57ca0dc7cb514d915b4458..c7086f319b0f6914b8adec78930ccf63cbc27098 100644 (file)
--- a/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/MessageFormatter.cs
+++ b/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/MessageFormatter.cs
@@ -179,7 +179,7 @@ namespace System.Runtime.Serialization.Formatters.Binary
                        if ((resp.LogicalCallContext != null) && resp.LogicalCallContext.HasInfo) \r
                        {\r
                                contextFlag = MethodFlags.IncludesLogicalCallContext;\r
-                               infoArrayLength++;
+                               infoArrayLength++;\r
                        }\r
 \r
                        if (resp.Properties.Count > internalProperties.Length && ((returnTypeTag & ReturnTypeTag.Exception) == 0))\r
@@ -239,8 +239,8 @@ namespace System.Runtime.Serialization.Formatters.Binary
                        {\r
                                object[] infoArray = new object[infoArrayLength];\r
                                int n = 0;\r
-
-                               if ((returnTypeTag & ReturnTypeTag.Exception) != 0)
+\r
+                               if ((returnTypeTag & ReturnTypeTag.Exception) != 0)\r
                                        infoArray[n++] = resp.Exception;\r
                                \r
                                if (formatFlag == MethodFlags.ArgumentsInMultiArray)\r
@@ -412,7 +412,7 @@ namespace System.Runtime.Serialization.Formatters.Binary
                                object[] msgInfo = (object[]) result;\r
 \r
                                if ((typeTag & ReturnTypeTag.Exception) > 0) {\r
-                                       exception = (Exception) msgInfo[0];
+                                       exception = (Exception) msgInfo[0];\r
                                        if (hasContextInfo) callContext = (LogicalCallContext)msgInfo[1];\r
                                }\r
                                else if ((flags & MethodFlags.NoArguments) > 0 || (flags & MethodFlags.PrimitiveArguments) > 0) {\r

diff --git a/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/ObjectReader.cs b/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/ObjectReader.cs
index 12820b896c164fc0278c43f45566c7929afdee3a..473cdddf3cdcc1c602e28a67c91db41f92f02b25 100644 (file)
--- a/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/ObjectReader.cs
+++ b/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/ObjectReader.cs
@@ -262,9 +262,9 @@ namespace System.Runtime.Serialization.Formatters.Binary
                        else\r
 #endif\r
                                objectInstance = FormatterServices.GetUninitializedObject (metadata.Type);\r
-#if NET_2_0
-                       _manager.RaiseOnDeserializingEvent (objectInstance);
-#endif
+#if NET_2_0\r
+                       _manager.RaiseOnDeserializingEvent (objectInstance);\r
+#endif\r
                                \r
                        info = metadata.NeedsSerializationInfo ? new SerializationInfo(metadata.Type, new FormatterConverter()) : null;\r
 \r

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 b61e7fc3b9a495286f762f413afb8fcb59684899..a976bbcfacbc9ae4edd518d326066e86dc3a331c 100644 (file)
--- a/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/ObjectWriter.cs
+++ b/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/ObjectWriter.cs
@@ -221,9 +221,9 @@ namespace System.Runtime.Serialization.Formatters.Binary
                FormatterTypeStyle _typeFormat;\r
                byte[] arrayBuffer;\r
                int ArrayBufferLength = 4096;\r
-#if NET_2_0
-               SerializationObjectManager _manager;
-#endif
+#if NET_2_0\r
+               SerializationObjectManager _manager;\r
+#endif\r
                \r
                class MetadataReference\r
                {\r
@@ -243,9 +243,9 @@ namespace System.Runtime.Serialization.Formatters.Binary
                        _context = context;\r
                        _assemblyFormat = assemblyFormat;\r
                        _typeFormat = typeFormat;\r
-#if NET_2_0
-                       _manager = new SerializationObjectManager (context);
-#endif
+#if NET_2_0\r
+                       _manager = new SerializationObjectManager (context);\r
+#endif\r
                }\r
 \r
                public void WriteObjectGraph (BinaryWriter writer, object obj, Header[] headers)\r
@@ -255,9 +255,9 @@ namespace System.Runtime.Serialization.Formatters.Binary
                        QueueObject (obj);\r
                        WriteQueuedObjects (writer);\r
                        WriteSerializationEnd (writer);\r
-#if NET_2_0
-                       _manager.RaiseOnSerializedEvent ();
-#endif
+#if NET_2_0\r
+                       _manager.RaiseOnSerializedEvent ();\r
+#endif\r
                }\r
 \r
                public void QueueObject (object obj)\r
@@ -385,10 +385,10 @@ namespace System.Runtime.Serialization.Formatters.Binary
 \r
                        BinaryCommon.CheckSerializable (instanceType, _surrogateSelector, _context);\r
 \r
-#if NET_2_0
-                       _manager.RegisterObject (obj);
-#endif
-
+#if NET_2_0\r
+                       _manager.RegisterObject (obj);\r
+#endif\r
+\r
                        ISerializable ser = obj as ISerializable;\r
 \r
                        if (ser != null) \r