Jelajahi Sumber

--- Merging r42062 into '.':
U rtl/objpas/classes/classesh.inc
--- Recording mergeinfo for merge of r42062 into '.':
U .

# revisions: 42062

git-svn-id: branches/fixes_3_2@43961 -

marco 5 tahun lalu
induk
melakukan
e01f4d52f5
1 mengubah file dengan 7 tambahan dan 7 penghapusan
  1. 7 7
      rtl/objpas/classes/classesh.inc

+ 7 - 7
rtl/objpas/classes/classesh.inc

@@ -930,7 +930,7 @@ type
     procedure WriteNotImplemented;
     procedure WriteNotImplemented;
   public
   public
     function Read(var Buffer; Count: Longint): Longint; virtual; overload;
     function Read(var Buffer; Count: Longint): Longint; virtual; overload;
-    function Write(const Buffer; Count: Longint): Longint; virtual;
+    function Write(const Buffer; Count: Longint): Longint; virtual; overload;
     function Seek(Offset: Longint; Origin: Word): Longint; virtual; overload;
     function Seek(Offset: Longint; Origin: Word): Longint; virtual; overload;
     function Seek(const Offset: Int64; Origin: TSeekOrigin): Int64; virtual; overload;
     function Seek(const Offset: Int64; Origin: TSeekOrigin): Int64; virtual; overload;
     procedure ReadBuffer(var Buffer; Count: Longint);
     procedure ReadBuffer(var Buffer; Count: Longint);
@@ -966,8 +966,8 @@ type
     function GetIStream: IStream;
     function GetIStream: IStream;
   public
   public
     constructor Create(const Stream: IStream);
     constructor Create(const Stream: IStream);
-    function Read(var Buffer; Count: Longint): Longint; override; overload;
-    function Write(const Buffer; Count: Longint): Longint; override; overload;
+    function Read(var Buffer; Count: Longint): Longint; override;
+    function Write(const Buffer; Count: Longint): Longint; override;
     function Seek(const Offset: int64; Origin: TSeekOrigin): int64; override;
     function Seek(const Offset: int64; Origin: TSeekOrigin): int64; override;
     procedure Check(err:integer); virtual;
     procedure Check(err:integer); virtual;
   end;
   end;
@@ -1000,8 +1000,8 @@ type
     procedure SetSize(const NewSize: Int64); override;
     procedure SetSize(const NewSize: Int64); override;
   public
   public
     constructor Create(AHandle: THandle);
     constructor Create(AHandle: THandle);
-    function Read(var Buffer; Count: Longint): Longint; override; overload;
-    function Write(const Buffer; Count: Longint): Longint; override; overload;
+    function Read(var Buffer; Count: Longint): Longint; override;
+    function Write(const Buffer; Count: Longint): Longint; override;
     function Seek(const Offset: Int64; Origin: TSeekOrigin): Int64; override;
     function Seek(const Offset: Int64; Origin: TSeekOrigin): Int64; override;
     property Handle: THandle read FHandle;
     property Handle: THandle read FHandle;
   end;
   end;
@@ -1029,7 +1029,7 @@ type
     function GetPosition: Int64; Override;
     function GetPosition: Int64; Override;
     procedure SetPointer(Ptr: Pointer; ASize: PtrInt);
     procedure SetPointer(Ptr: Pointer; ASize: PtrInt);
   public
   public
-    function Read(var Buffer; Count: LongInt): LongInt; override; overload;
+    function Read(var Buffer; Count: LongInt): LongInt; override;
     function Seek(const Offset: Int64; Origin: TSeekOrigin): Int64; override;
     function Seek(const Offset: Int64; Origin: TSeekOrigin): Int64; override;
     procedure SaveToStream(Stream: TStream);
     procedure SaveToStream(Stream: TStream);
     procedure SaveToFile(const FileName: string);
     procedure SaveToFile(const FileName: string);
@@ -1051,7 +1051,7 @@ type
     procedure LoadFromStream(Stream: TStream);
     procedure LoadFromStream(Stream: TStream);
     procedure LoadFromFile(const FileName: string);
     procedure LoadFromFile(const FileName: string);
     procedure SetSize({$ifdef CPU64}const NewSize: Int64{$else}NewSize: LongInt{$endif}); override;
     procedure SetSize({$ifdef CPU64}const NewSize: Int64{$else}NewSize: LongInt{$endif}); override;
-    function Write(const Buffer; Count: LongInt): LongInt; override; overload;
+    function Write(const Buffer; Count: LongInt): LongInt; override;
   end;
   end;
 
 
 { TBytesStream }
 { TBytesStream }