Changeset 337 for trunk/Include/Classes/System/IO

Timestamp:

Sep 22, 2007, 12:32:25 PM (17 years ago)

Author:

dai

Message:

index.abを一つにまとめた。

Location:

trunk/Include/Classes/System/IO

Files:

• Directory.ab (modified) (1 diff)
• DirectorySecurity.ab (added)
• FileStream.ab (modified) (4 diffs)
• Stream.ab (modified) (2 diffs)
• index.ab (deleted)

trunk/Include/Classes/System/IO/Directory.ab

@@ -26 +26 @@
     End Function 
 
-    Static Function GetAccessControl(path As String, includeSections As AccessControlSections) As DirectorySecurity
+    Static Function GetAccessControl(path As String, includeSections As System.Security.AccessControl.AccessControlSections) As DirectorySecurity
     End Function
 

trunk/Include/Classes/System/IO/FileStream.ab

@@ -297 +297 @@
     End Sub
 
-    Override Function Read(ByRef buffer[] As Byte, offset As Long, count As Long) As Long
+    Override Function Read( buffer As *Byte, offset As Long, count As Long) As Long
         If This.CanRead() Then
             Dim ret As DWord
@@ -316 +316 @@
     End Function
 
-    Override Function ReadByte() As Long
-        Dim b As Byte
-        Dim ret = Read(b, 0, 1)
-        If ret <> 0 Then
-            Return b As Long
-        Else
-            Return -1
-        End If
-    End Function
 /*  ReferenceEquals*/
 
@@ -388 +379 @@
     End Sub
 
-    Override Sub Write(ByRef buffer[] As Byte, offset As Long, count As Long)
+    Override Sub Write(buffer As *Byte, offset As Long, count As Long)
         If This.CanWrite() Then
             Dim ret As DWord
@@ -405 +396 @@
     End Sub
 
-    Override Sub WriteByte(b As Byte)
-        Write(b, 0, 1)
-    End Sub
-
 Protected
     Override Function CreateWaitHandle() As System.Threading.WaitHandle

trunk/Include/Classes/System/IO/Stream.ab

@@ -46 +46 @@
     Virtual Sub EndWrite(ByRef asyncResult As System.IAsyncResult): End Sub
     Abstract Sub Flush()
-    Abstract Function Read(ByRef buffer[] As Byte, offset As Long, count As Long) As Long
+    Abstract Function Read(buffer As *Byte, offset As Long, count As Long) As Long
 
     Virtual Function ReadByte() As Long
         Dim b As Byte
-        Dim ret = Read(b, 0, 1)
+        Dim ret = Read(VarPtr(b), 0, 1)
         If ret <> 0 Then
             Return b
@@ -60 +60 @@
     Abstract Function Seek(offset As Int64, origin As SeekOrigin) As Long
     Abstract Sub SetLength(value As Int64)
-    Abstract Sub Write(ByRef buffer[] As Byte, offset As Long, count As Long)
+    Abstract Sub Write(buffer As *Byte, offset As Long, count As Long)
 
     Virtual Sub WriteByte(b As Byte)
-        Write(b, 0, 1)
+        Write(VarPtr(b), 0, 1)
     End Sub
 Protected