Merge pull request #128 from RyanTMontoya/master

Warning Fixes for Delphi 12
exilon · Sep 25, 2024 · fd6b54c · fd6b54c
2 parents 8036c32 + 787bcbd
commit fd6b54c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/Quick.RTTI.Utils.pas b/Quick.RTTI.Utils.pas
@@ -88,6 +88,7 @@ class function TRTTI.CreateInstance<T>(const Args: array of TValue): T;
   rmethod: TRttiMethod;
   rinstype: TRttiInstanceType;
 begin
+  Result := Default(T);
   rtype := fCtx.GetType(TypeInfo(T));
   for rmethod in rtype.GetMethods do
   begin

diff --git a/Quick.Threads.pas b/Quick.Threads.pas
@@ -685,7 +685,7 @@ procedure TThreadedQueueCS<T>.Clear;
   try
     for obj in FQueue do
     begin
-      if TypeInfo(T) = TypeInfo(TObject) then PObject(@obj){$IFNDEF FPC}.DisposeOf;{$ELSE}.Free;{$ENDIF}
+      if TypeInfo(T) = TypeInfo(TObject) then PObject(@obj){$ifndef FPC}{$IFDEF  DELPHIRX12_UP}.Free{$ELSE}.DisposeOf{$ENDIF}{$ELSE}.Free{$ENDIF};
     end;
 
     SetLength(FQueue,0);