Changeset 481 for Generics/NativeGenerics/Units/GenericList.pas

Timestamp:

Feb 23, 2016, 10:30:36 PM (9 years ago)

Author:

chronos

Message:

• Updated: Fix NativeGenerics project compilation with FPC 3.0.0.

File:

• Generics/NativeGenerics/Units/GenericList.pas (modified) (8 diffs)

Generics/NativeGenerics/Units/GenericList.pas

@@ -96 +96 @@
     function GetInternal(Index: TIndex): TItem; override;
     function GetCount: TIndex; override;
-    function GetCapacity: TIndex;
+    function GetCapacity: TIndex; virtual;
     procedure SetCount(const AValue: TIndex); override;
-    procedure SetCapacity(const AValue: TIndex);
+    procedure SetCapacity(const AValue: TIndex); virtual;
     procedure SetCapacityOptimized(const NewCapacity: TIndex);
     procedure Put(Index: TIndex; const AValue: TItem); override;
@@ -115 +115 @@
   TGObjectList<TItem> = class(TGList<TItem>)
   protected
-    procedure Put(Index: Integer; const AValue: TItem); override;
+    procedure Put(Index: TIndex; const AValue: TItem); override;
   public
     OwnsObjects: Boolean;
     procedure SetCount(const AValue: TIndex); override;
     function AddNew(NewObject: TItem = nil): TItem;
-    procedure Delete(const Index: Integer); override;
+    procedure Delete(const Index: TIndex); override;
     procedure Clear; override;
     procedure Assign(Source: TGAbstractList<TItem>); override;
@@ -130 +130 @@
   private
   public
-    procedure Delete(const Index: Integer); override;
+    procedure Delete(const Index: TIndex); override;
     procedure Clear; override;
     procedure Assign(Source: TGAbstractList<TItem>); override;
@@ -157 +157 @@
     procedure Open;
     procedure Close;
-    constructor Create;
+    constructor Create; override;
     destructor Destroy; override;
     property FileName: string read FFileName write SetFileName;
@@ -328 +328 @@
 end;
 
-procedure TGObjectList<TItem>.Put(Index: Integer; const AValue: TItem);
+procedure TGObjectList<TItem>.Put(Index: TIndex; const AValue: TItem);
 begin
   if OwnsObjects and Assigned(FItems[Index]) then FItems[Index].Free;
@@ -348 +348 @@
 end;
 
-procedure TGObjectList<TItem>.Delete(const Index: Integer);
+procedure TGObjectList<TItem>.Delete(const Index: TIndex);
 begin
   (*if OwnsObjects then begin
@@ -383 +383 @@
 end;
 
-procedure TGStringList<TItem>.Delete(const Index: Integer);
+procedure TGStringList<TItem>.Delete(const Index: TIndex);
 begin
   FItems[Index] := '';
@@ -720 +720 @@
     end else
     if NewIndex < CurIndex then begin
-      Temp.AddListPart(Self, CurIndex, ACount);
+       Temp.AddListPart(Self, CurIndex, ACount);
       CopyItems(NewIndex, NewIndex + ACount, CurIndex - NewIndex);
       ReplaceList(NewIndex, Temp);