浏览代码

Merge branch 'develop'

Exilon 4 年之前
父节点
当前提交
0332033131
共有 2 个文件被更改,包括 3 次插入4 次删除
  1. 2 3
      Quick.RTTI.Utils.pas
  2. 1 1
      QuickLib.inc

+ 2 - 3
Quick.RTTI.Utils.pas

@@ -7,7 +7,7 @@
   Author      : Kike Pérez
   Author      : Kike Pérez
   Version     : 1.4
   Version     : 1.4
   Created     : 09/03/2018
   Created     : 09/03/2018
-  Modified    : 14/07/2020
+  Modified    : 05/11/2020
 
 
   This file is part of QuickLib: https://github.com/exilon/QuickLib
   This file is part of QuickLib: https://github.com/exilon/QuickLib
 
 
@@ -143,7 +143,6 @@ var
   rtype : TRttiType;
   rtype : TRttiType;
   rmethod : TRttiMethod;
   rmethod : TRttiMethod;
   rinstype: TRttiInstanceType;
   rinstype: TRttiInstanceType;
-  value : TValue;
 begin
 begin
   rtype := fCtx.GetType(aObject.ClassInfo);
   rtype := fCtx.GetType(aObject.ClassInfo);
   for rmethod in rtype.GetMethods do
   for rmethod in rtype.GetMethods do
@@ -151,7 +150,7 @@ begin
     if CompareText(rmethod.Name,aMethodName) = 0 then
     if CompareText(rmethod.Name,aMethodName) = 0 then
     begin
     begin
       rinstype := rtype.AsInstance;
       rinstype := rtype.AsInstance;
-      value := rmethod.Invoke(rinstype.MetaclassType,aParams);
+      Result := rmethod.Invoke(rinstype.MetaclassType,aParams);
     end;
     end;
 
 
   end;
   end;

+ 1 - 1
QuickLib.inc

@@ -131,7 +131,7 @@
     {$if CompilerVersion >= 34.0} //Delphi RX10.4 Sydney
     {$if CompilerVersion >= 34.0} //Delphi RX10.4 Sydney
       {$define DELPHIRX104_UP}
       {$define DELPHIRX104_UP}
 	    {$define DELPHISYDNEY_UP}
 	    {$define DELPHISYDNEY_UP}
-      {$if defined(ANDROID) OR defined(LINUX) OR defined(IOS)}
+      {$if defined(ANDROID) OR defined(IOS)}
         {$define NEXTGEN} //compatibility with older delphis
         {$define NEXTGEN} //compatibility with older delphis
       {$endif}
       {$endif}
     {$ifend}
     {$ifend}