[Dotgnu-pnet-commits] CVS: pnetlib/runtime/System/IO BinaryReader.cs,1.3,1.4 BinaryWriter.cs,1.2,1.3 FileAttributes.cs,1.1,1.2

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnetlib/runtime/System/IO
In directory subversions:/tmp/cvs-serv9550/runtime/System/IO

Modified Files:
        BinaryReader.cs BinaryWriter.cs FileAttributes.cs 
Log Message:


Minor tweaks to a lot of classes to make them more signature compatible
with .NET Framework SDK 1.1.


Index: BinaryReader.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/runtime/System/IO/BinaryReader.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** BinaryReader.cs     8 Nov 2002 08:58:52 -0000       1.3
--- BinaryReader.cs     23 Apr 2003 05:39:49 -0000      1.4
***************
*** 2,6 ****
   * BinaryReader.cs - Implementation of the "System.IO.BinaryReader" class.
   *
!  * Copyright (C) 2001  Southern Storm Software, Pty Ltd.
   *
   * This program is free software; you can redistribute it and/or modify
--- 2,6 ----
   * BinaryReader.cs - Implementation of the "System.IO.BinaryReader" class.
   *
!  * Copyright (C) 2001, 2003  Southern Storm Software, Pty Ltd.
   *
   * This program is free software; you can redistribute it and/or modify
***************
*** 63,72 ****
                        }
  
-       // Destructor.
-       ~BinaryReader()
-                       {
-                               Dispose(false);
-                       }
- 
        // Get the base stream that underlies this binary reader.
        public virtual Stream BaseStream
--- 63,66 ----
***************
*** 178,182 ****
  
        // Read the next character, throwing an exception at EOF.
!       public virtual int ReadChar()
                        {
                                int ch = Read();
--- 172,176 ----
  
        // Read the next character, throwing an exception at EOF.
!       public virtual char ReadChar()
                        {
                                int ch = Read();
***************
*** 185,189 ****
                                        throw new 
EndOfStreamException(_("IO_ReadEndOfStream"));
                                }
!                               return ch;
                        }
  
--- 179,183 ----
                                        throw new 
EndOfStreamException(_("IO_ReadEndOfStream"));
                                }
!                               return (char)ch;
                        }
  
***************
*** 460,464 ****
  
        // Read an integer value that is encoded in a 7-bit format.
!       protected virtual int Read7BitEncodedInt()
                        {
                                int value = 0;
--- 454,458 ----
  
        // Read an integer value that is encoded in a 7-bit format.
!       protected int Read7BitEncodedInt()
                        {
                                int value = 0;

Index: BinaryWriter.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/runtime/System/IO/BinaryWriter.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** BinaryWriter.cs     7 Nov 2002 19:46:05 -0000       1.2
--- BinaryWriter.cs     23 Apr 2003 05:39:49 -0000      1.3
***************
*** 2,6 ****
   * BinaryWriter.cs - Implementation of the "System.IO.BinaryWriter" class.
   *
!  * Copyright (C) 2001  Southern Storm Software, Pty Ltd.
   *
   * This program is free software; you can redistribute it and/or modify
--- 2,6 ----
   * BinaryWriter.cs - Implementation of the "System.IO.BinaryWriter" class.
   *
!  * Copyright (C) 2001, 2003  Southern Storm Software, Pty Ltd.
   *
   * This program is free software; you can redistribute it and/or modify
***************
*** 74,83 ****
                        }
  
-       // Destructor.
-       ~BinaryWriter()
-                       {
-                               Dispose(false);
-                       }
- 
        // Get the base stream that underlies this binary writer.
        public virtual Stream BaseStream
--- 74,77 ----
***************
*** 376,380 ****
  
        // Write a 7-bit encoded integer value to the output.
!       public virtual void Write7BitEncodedInt(int value)
                        {
                                uint temp = (uint)value;
--- 370,374 ----
  
        // Write a 7-bit encoded integer value to the output.
!       protected void Write7BitEncodedInt(int value)
                        {
                                uint temp = (uint)value;

Index: FileAttributes.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/runtime/System/IO/FileAttributes.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** FileAttributes.cs   1 Feb 2003 02:04:50 -0000       1.1
--- FileAttributes.cs   23 Apr 2003 05:39:49 -0000      1.2
***************
*** 26,29 ****
--- 26,30 ----
  using System;
  
+ [Flags]
  public enum FileAttributes
  {