paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-14 17:29:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Allow usage of other type kinds than only objects for keys and values for TObjectDictionaries constraints.

Browse Source 
git-svn-id: trunk@38780 -
This commit is contained in:
maciej-izak 2018-04-17 11:16:28 +00:00
parent 49caa8fcef
commit 487e01af79
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/rtl-generics/src/inc/generics.dictionaries.inc
View File

@ -2179,7 +2179,7 @@ begin
inherited; inherited;
if (doOwnsKeys in FOwnerships) and (ACollectionNotification = cnRemoved) then if (doOwnsKeys in FOwnerships) and (ACollectionNotification = cnRemoved) then
TObject(AKey).Free; TObject((@AKey)^).Free;
end; end;
procedure TObjectDeamortizedDArrayCuckooMap<CUCKOO_CONSTRAINTS>.ValueNotify(constref AValue: TValue; procedure TObjectDeamortizedDArrayCuckooMap<CUCKOO_CONSTRAINTS>.ValueNotify(constref AValue: TValue;
@ -2188,7 +2188,7 @@ begin
inherited; inherited;
if (doOwnsValues in FOwnerships) and (ACollectionNotification = cnRemoved) then if (doOwnsValues in FOwnerships) and (ACollectionNotification = cnRemoved) then
TObject(AValue).Free; TObject((@AValue)^).Free;
end; end;
constructor TObjectDeamortizedDArrayCuckooMap<CUCKOO_CONSTRAINTS>.Create( constructor TObjectDeamortizedDArrayCuckooMap<CUCKOO_CONSTRAINTS>.Create(
@ -2227,7 +2227,7 @@ begin
inherited; inherited;
if (doOwnsKeys in FOwnerships) and (ACollectionNotification = cnRemoved) then if (doOwnsKeys in FOwnerships) and (ACollectionNotification = cnRemoved) then
TObject(AKey).Free; TObject((@AKey)^).Free;
end; end;
procedure TObjectOpenAddressingLP<OPEN_ADDRESSING_CONSTRAINTS>.ValueNotify( procedure TObjectOpenAddressingLP<OPEN_ADDRESSING_CONSTRAINTS>.ValueNotify(
@ -2236,7 +2236,7 @@ begin
inherited; inherited;
if (doOwnsValues in FOwnerships) and (ACollectionNotification = cnRemoved) then if (doOwnsValues in FOwnerships) and (ACollectionNotification = cnRemoved) then
TObject(AValue).Free; TObject((@AValue)^).Free;
end; end;
constructor TObjectOpenAddressingLP<OPEN_ADDRESSING_CONSTRAINTS>.Create(AOwnerships: TDictionaryOwnerships); constructor TObjectOpenAddressingLP<OPEN_ADDRESSING_CONSTRAINTS>.Create(AOwnerships: TDictionaryOwnerships);

8
packages/rtl-generics/tests/tests.generics.hashmaps.pas
View File

@ -62,6 +62,8 @@ type
procedure Test_OpenAddressingLP_TrimExcess; procedure Test_OpenAddressingLP_TrimExcess;
procedure Test_CuckooD2_TrimExcess; procedure Test_CuckooD2_TrimExcess;
procedure Test_ObjectDictionary;
procedure Test_TryAddOrSetOrGetValue; procedure Test_TryAddOrSetOrGetValue;
end; end;
@ -316,6 +318,12 @@ begin
TEST_TRIMEXCESS; TEST_TRIMEXCESS;
end; end;
procedure TTestHashMaps.Test_ObjectDictionary;
begin
with TObjectOpenAddressingLP<TGUID, TGUID>.Create do Free;
with TObjectCuckooD2<TGUID, TGUID>.Create do Free;
end;
procedure TTestHashMaps.Test_TryAddOrSetOrGetValue; procedure TTestHashMaps.Test_TryAddOrSetOrGetValue;
// modified test from Castle Game Engine (https://castle-engine.sourceforge.io) // modified test from Castle Game Engine (https://castle-engine.sourceforge.io)
var var