* Removed 'inline' from public methods of TFPObjectList and TFPHashObjectList since they use private fields and can not be inlined when called from other units.

git-svn-id: trunk@40181 -
This commit is contained in:
yury 2018-11-02 16:55:33 +00:00
parent 1b151df89f
commit fa2d82f879

View File

@ -138,24 +138,24 @@ type
constructor Create(FreeObjects : Boolean); constructor Create(FreeObjects : Boolean);
destructor Destroy; override; destructor Destroy; override;
procedure Clear; procedure Clear;
function Add(AObject: TObject): Integer; {$ifdef CCLASSESINLINE}inline;{$endif} function Add(AObject: TObject): Integer;
procedure Delete(Index: Integer); procedure Delete(Index: Integer);
procedure Exchange(Index1, Index2: Integer); {$ifdef CCLASSESINLINE}inline;{$endif} procedure Exchange(Index1, Index2: Integer);
function Expand: TFPObjectList;{$ifdef CCLASSESINLINE}inline;{$endif} function Expand: TFPObjectList;
function Extract(Item: TObject): TObject; {$ifdef CCLASSESINLINE}inline;{$endif} function Extract(Item: TObject): TObject;
function Remove(AObject: TObject): Integer; function Remove(AObject: TObject): Integer;
function IndexOf(AObject: TObject): Integer; {$ifdef CCLASSESINLINE}inline;{$endif} function IndexOf(AObject: TObject): Integer;
function FindInstanceOf(AClass: TClass; AExact: Boolean; AStartAt: Integer): Integer; function FindInstanceOf(AClass: TClass; AExact: Boolean; AStartAt: Integer): Integer;
procedure Insert(Index: Integer; AObject: TObject); {$ifdef CCLASSESINLINE}inline;{$endif} procedure Insert(Index: Integer; AObject: TObject);
function First: TObject; {$ifdef CCLASSESINLINE}inline;{$endif} function First: TObject;
function Last: TObject; {$ifdef CCLASSESINLINE}inline;{$endif} function Last: TObject;
procedure Move(CurIndex, NewIndex: Integer); {$ifdef CCLASSESINLINE}inline;{$endif} procedure Move(CurIndex, NewIndex: Integer);
procedure Assign(Obj:TFPObjectList); procedure Assign(Obj:TFPObjectList);
procedure ConcatListCopy(Obj:TFPObjectList); procedure ConcatListCopy(Obj:TFPObjectList);
procedure Pack; {$ifdef CCLASSESINLINE}inline;{$endif} procedure Pack;
procedure Sort(Compare: TListSortCompare); {$ifdef CCLASSESINLINE}inline;{$endif} procedure Sort(Compare: TListSortCompare);
procedure ForEachCall(proc2call:TObjectListCallback;arg:pointer); {$ifdef CCLASSESINLINE}inline;{$endif} procedure ForEachCall(proc2call:TObjectListCallback;arg:pointer);
procedure ForEachCall(proc2call:TObjectListStaticCallback;arg:pointer); {$ifdef CCLASSESINLINE}inline;{$endif} procedure ForEachCall(proc2call:TObjectListStaticCallback;arg:pointer);
property Capacity: Integer read GetCapacity write SetCapacity; property Capacity: Integer read GetCapacity write SetCapacity;
property Count: Integer read GetCount write SetCount; property Count: Integer read GetCount write SetCount;
property OwnsObjects: Boolean read FFreeObjects write FFreeObjects; property OwnsObjects: Boolean read FFreeObjects write FFreeObjects;
@ -293,26 +293,26 @@ type
constructor Create(FreeObjects : boolean = True); constructor Create(FreeObjects : boolean = True);
destructor Destroy; override; destructor Destroy; override;
procedure Clear; procedure Clear;
function Add(const AName:TSymStr;AObject: TObject): Integer; {$ifdef CCLASSESINLINE}inline;{$endif} function Add(const AName:TSymStr;AObject: TObject): Integer;
function NameOfIndex(Index: Integer): TSymStr; {$ifdef CCLASSESINLINE}inline;{$endif} function NameOfIndex(Index: Integer): TSymStr;
function HashOfIndex(Index: Integer): LongWord; {$ifdef CCLASSESINLINE}inline;{$endif} function HashOfIndex(Index: Integer): LongWord;
function GetNextCollision(Index: Integer): Integer; {$ifdef CCLASSESINLINE}inline;{$endif} function GetNextCollision(Index: Integer): Integer;
procedure Delete(Index: Integer); procedure Delete(Index: Integer);
function Expand: TFPHashObjectList; {$ifdef CCLASSESINLINE}inline;{$endif} function Expand: TFPHashObjectList;
function Extract(Item: TObject): TObject; {$ifdef CCLASSESINLINE}inline;{$endif} function Extract(Item: TObject): TObject;
function Remove(AObject: TObject): Integer; function Remove(AObject: TObject): Integer;
function IndexOf(AObject: TObject): Integer; {$ifdef CCLASSESINLINE}inline;{$endif} function IndexOf(AObject: TObject): Integer;
function Find(const s:TSymStr): TObject; {$ifdef CCLASSESINLINE}inline;{$endif} function Find(const s:TSymStr): TObject;
function FindIndexOf(const s:TSymStr): Integer; {$ifdef CCLASSESINLINE}inline;{$endif} function FindIndexOf(const s:TSymStr): Integer;
function FindWithHash(const AName:TSymStr;AHash:LongWord): Pointer; function FindWithHash(const AName:TSymStr;AHash:LongWord): Pointer;
function Rename(const AOldName,ANewName:TSymStr): Integer; {$ifdef CCLASSESINLINE}inline;{$endif} function Rename(const AOldName,ANewName:TSymStr): Integer;
function FindInstanceOf(AClass: TClass; AExact: Boolean; AStartAt: Integer): Integer; function FindInstanceOf(AClass: TClass; AExact: Boolean; AStartAt: Integer): Integer;
procedure Pack; {$ifdef CCLASSESINLINE}inline;{$endif} procedure Pack;
procedure ShowStatistics; {$ifdef CCLASSESINLINE}inline;{$endif} procedure ShowStatistics;
procedure ForEachCall(proc2call:TObjectListCallback;arg:pointer); {$ifdef CCLASSESINLINE}inline;{$endif} procedure ForEachCall(proc2call:TObjectListCallback;arg:pointer);
procedure ForEachCall(proc2call:TObjectListStaticCallback;arg:pointer); {$ifdef CCLASSESINLINE}inline;{$endif} procedure ForEachCall(proc2call:TObjectListStaticCallback;arg:pointer);
procedure WhileEachCall(proc2call:TObjectListCallback;arg:pointer); {$ifdef CCLASSESINLINE}inline;{$endif} procedure WhileEachCall(proc2call:TObjectListCallback;arg:pointer);
procedure WhileEachCall(proc2call:TObjectListStaticCallback;arg:pointer); {$ifdef CCLASSESINLINE}inline;{$endif} procedure WhileEachCall(proc2call:TObjectListStaticCallback;arg:pointer);
property Capacity: Integer read GetCapacity write SetCapacity; property Capacity: Integer read GetCapacity write SetCapacity;
property Count: Integer read GetCount write SetCount; property Count: Integer read GetCount write SetCount;
property OwnsObjects: Boolean read FFreeObjects write FFreeObjects; property OwnsObjects: Boolean read FFreeObjects write FFreeObjects;