fixed compilation with older Delphis

gabr42 · Mar 12, 2018 · 97a3991 · 97a3991
1 parent b968342
commit 97a3991
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/OtlCollections.pas b/OtlCollections.pas
@@ -118,7 +118,7 @@ interface
   {$IFDEF OTL_Generics}{$IFDEF OTL_HasArrayOfT}{$IFDEF OTL_ERTTI}
   TypInfo,
   RTTI,
-  System.Generics.Collections,
+  Generics.Collections,
   {$ENDIF OTL_ERTTI}{$ENDIF OTL_HasArrayOfT}{$ENDIF OTL_Generics}
   OtlCommon,
   OtlContainers,

diff --git a/src/GpLists.pas b/src/GpLists.pas
@@ -7814,7 +7814,11 @@ function TGpCache<K, V>.IsNil(element: integer): boolean; //inline
 procedure TGpCache<K, V>.DestroyOwnedValues;
 begin
   while not IsNil(FHead) do begin
+    {$IF CompilerVersion < 25} // DisposeOf was implemented in XE4
+    PObject(@FKeys[FHead].Value)^.Free;
+    {$ELSE}
     PObject(@FKeys[FHead].Value)^.DisposeOf;
+    {$IFEND}
     FHead := FKeys[FHead].Next;
   end;
 end; { TGpCache<K, V>.DestroyOwnedValues }
@@ -7876,7 +7880,11 @@ function TGpCache<K, V>.Remove(const key: K): boolean;
     FFreeList := element;
     FCache.Remove(key);
     if FOwnsValues then
+      {$IF CompilerVersion < 25} // DisposeOf was implemented in XE4
+      PObject(@pElement.Value)^.Free;
+      {$ELSE}
       PObject(@pElement.Value)^.DisposeOf;
+      {$IFEND}
   end;
 end; { TGpCache<K, V>.Remove }
 
@@ -7890,7 +7898,11 @@ function TGpCache<K, V>.RemoveOldest: integer;
   Unlink(FTail);
   FCache.Remove(FKeys[Result].Key);
   if FOwnsValues then
+    {$IF CompilerVersion < 25} // DisposeOf was implemented in XE4
+    PObject(@FKeys[Result].Value)^.Free;
+    {$ELSE}
     PObject(@FKeys[Result].Value)^.DisposeOf;
+    {$IFEND}
 end; { TGpCache<K, V>.RemoveOldest }
 
 function TGpCache<K, V>.TryGetValue(const key: K; var value: V): boolean;
@@ -7939,7 +7951,11 @@ procedure TGpCache<K, V>.Update(const key: K; const value: V);
       oldValue := pElement.Value;
       pElement.Value := value;
       if PObject(@oldValue)^ <> PObject(@value)^ then
+        {$IF CompilerVersion < 25} // DisposeOf was implemented in XE4
+        PObject(@oldValue)^.Free;
+        {$ELSE}
         PObject(@oldValue)^.DisposeOf;
+        {$IFEND}
     end;
     Unlink(element);
     InsertInFront(element);