* fix for Mantis #35921: apply patch by Maciej Izak

git-svn-id: trunk@42556 -
This commit is contained in:
svenbarth 2019-08-02 13:16:07 +00:00
parent 3195b64599
commit e8a7661bcf

View File

@ -747,8 +747,8 @@ type
function Remove(constref AKey: TKey; ADisposeNode: boolean = true): boolean; function Remove(constref AKey: TKey; ADisposeNode: boolean = true): boolean;
function ExtractPair(constref AKey: TKey; ADisposeNode: boolean = true): TTreePair; overload; function ExtractPair(constref AKey: TKey; ADisposeNode: boolean = true): TTreePair; overload;
function ExtractPair(constref ANode: PNode; ADispose: boolean = true): TTreePair; overload; function ExtractPair(constref ANode: PNode; ADispose: boolean = true): TTreePair; overload;
function ExtractNode(constref AKey: TKey; ADisposeNode: boolean): PNode; overload; function Extract(constref AKey: TKey; ADisposeNode: boolean): PNode;
function ExtractNode(ANode: PNode; ADispose: boolean): PNode; overload; function ExtractNode(ANode: PNode; ADispose: boolean): PNode;
procedure Delete(ANode: PNode; ADispose: boolean = true); inline; procedure Delete(ANode: PNode; ADispose: boolean = true); inline;
function GetEnumerator: TPairEnumerator; function GetEnumerator: TPairEnumerator;
@ -3430,7 +3430,7 @@ begin
Result.Value := DoRemove(ANode, cnExtracted, ADispose); Result.Value := DoRemove(ANode, cnExtracted, ADispose);
end; end;
function TCustomAVLTreeMap<TREE_CONSTRAINTS>.ExtractNode(constref AKey: TKey; ADisposeNode: boolean): PNode; function TCustomAVLTreeMap<TREE_CONSTRAINTS>.Extract(constref AKey: TKey; ADisposeNode: boolean): PNode;
begin begin
Result:=Find(AKey); Result:=Find(AKey);
if Result<>nil then if Result<>nil then