Drop more obsolete defines

[mono.git] / mcs / class / corlib / System.IO / BinaryWriter.cs

diff --git a/mcs/class/corlib/System.IO/BinaryWriter.cs b/mcs/class/corlib/System.IO/BinaryWriter.cs
index bee0c25581d4bc0db1cb4dc6bdda73f47cf2301e..b5b8cc261ce9e4de3e7bdb7448dda0e60b6a412e 100644 (file)
--- a/mcs/class/corlib/System.IO/BinaryWriter.cs
+++ b/mcs/class/corlib/System.IO/BinaryWriter.cs
@@ -32,9 +32,11 @@ using System;
 using System.Text;
 using System.Globalization;
 using Mono.Security;
+using System.Runtime.InteropServices;
 
 namespace System.IO {
        [Serializable]
+       [ComVisible (true)]
        public class BinaryWriter : IDisposable {
 
                // Null is a BinaryWriter with no backing store.
@@ -45,15 +47,17 @@ namespace System.IO {
                private byte [] buffer;
                private bool disposed = false;
 
-               protected BinaryWriter() : this (Stream.Null, Encoding.UTF8Unmarked) {
+               protected BinaryWriter() : this (Stream.Null, Encoding.UTF8UnmarkedUnsafe) {
                }
 
-               public BinaryWriter(Stream output) : this(output, Encoding.UTF8Unmarked) {
+               public BinaryWriter(Stream output) : this(output, Encoding.UTF8UnmarkedUnsafe) {
                }
 
                public BinaryWriter(Stream output, Encoding encoding) {
-                       if (output == null || encoding == null) 
-                               throw new ArgumentNullException(Locale.GetText ("Output or Encoding is a null reference."));
+                       if (output == null) 
+                               throw new ArgumentNullException("output");
+                       if (encoding == null) 
+                               throw new ArgumentNullException("encoding");
                        if (!output.CanWrite)
                                throw new ArgumentException(Locale.GetText ("Stream does not support writing or already closed."));
 
@@ -112,56 +116,56 @@ namespace System.IO {
                        OutStream.WriteByte(value);
                }
 
-               public virtual void Write(byte[] value) {
+               public virtual void Write(byte[] buffer) {
 
                        if (disposed)
                                throw new ObjectDisposedException ("BinaryWriter", "Cannot write to a closed BinaryWriter");
 
-                       if (value == null)
-                               throw new ArgumentNullException(Locale.GetText ("Byte buffer is a null reference."));
-                       OutStream.Write(value, 0, value.Length);
+                       if (buffer == null)
+                               throw new ArgumentNullException("buffer");
+                       OutStream.Write(buffer, 0, buffer.Length);
                }
 
-               public virtual void Write(byte[] value, int offset, int length) {
+               public virtual void Write(byte[] buffer, int index, int count) {
 
                        if (disposed)
                                throw new ObjectDisposedException ("BinaryWriter", "Cannot write to a closed BinaryWriter");
 
-                       if (value == null)
-                               throw new ArgumentNullException(Locale.GetText ("Byte buffer is a null reference."));
-                       OutStream.Write(value, offset, length);
+                       if (buffer == null)
+                               throw new ArgumentNullException("buffer");
+                       OutStream.Write(buffer, index, count);
                }
 
-               public virtual void Write(char value) {
+               public virtual void Write(char ch) {
 
                        if (disposed)
                                throw new ObjectDisposedException ("BinaryWriter", "Cannot write to a closed BinaryWriter");
 
                        char[] dec = new char[1];
-                       dec[0] = value;
+                       dec[0] = ch;
                        byte[] enc = m_encoding.GetBytes(dec, 0, 1);
                        OutStream.Write(enc, 0, enc.Length);
                }
                
-               public virtual void Write(char[] value) {
+               public virtual void Write(char[] chars) {
 
                        if (disposed)
                                throw new ObjectDisposedException ("BinaryWriter", "Cannot write to a closed BinaryWriter");
 
-                       if (value == null)
-                               throw new ArgumentNullException(Locale.GetText ("Chars is a null reference."));
-                       byte[] enc = m_encoding.GetBytes(value, 0, value.Length);
+                       if (chars == null)
+                               throw new ArgumentNullException("chars");
+                       byte[] enc = m_encoding.GetBytes(chars, 0, chars.Length);
                        OutStream.Write(enc, 0, enc.Length);
                }
 
-               public virtual void Write(char[] value, int offset, int length) {
+               public virtual void Write(char[] chars, int index, int count) {
 
                        if (disposed)
                                throw new ObjectDisposedException ("BinaryWriter", "Cannot write to a closed BinaryWriter");
 
-                       if (value == null)
-                               throw new ArgumentNullException(Locale.GetText ("Chars is a null reference."));
-                       byte[] enc = m_encoding.GetBytes(value, offset, length);
+                       if (chars == null)
+                               throw new ArgumentNullException("chars");
+                       byte[] enc = m_encoding.GetBytes(chars, index, count);
                        OutStream.Write(enc, 0, enc.Length);
                }