Преглед изворни кода

fixed compilation issues with Delphi NextGen compilers

Ugochukwu Mmaduekwe пре 7 година
родитељ
комит
3c4b248a3d
1 измењених фајлова са 16 додато и 5 уклоњено
  1. 16 5
      CryptoLib/src/Utils/ClpConverters.pas

+ 16 - 5
CryptoLib/src/Utils/ClpConverters.pas

@@ -96,16 +96,20 @@ type
       overload; static; inline;
       overload; static; inline;
 
 
     class procedure ReadUInt32AsBytesLE(a_in: UInt32;
     class procedure ReadUInt32AsBytesLE(a_in: UInt32;
-      const a_out: TCryptoLibByteArray; a_index: Int32); overload; static; inline;
+      const a_out: TCryptoLibByteArray; a_index: Int32); overload;
+      static; inline;
 
 
     class procedure ReadUInt32AsBytesBE(a_in: UInt32;
     class procedure ReadUInt32AsBytesBE(a_in: UInt32;
-      const a_out: TCryptoLibByteArray; a_index: Int32); overload; static; inline;
+      const a_out: TCryptoLibByteArray; a_index: Int32); overload;
+      static; inline;
 
 
     class procedure ReadUInt64AsBytesLE(a_in: UInt64;
     class procedure ReadUInt64AsBytesLE(a_in: UInt64;
-      const a_out: TCryptoLibByteArray; a_index: Int32); overload; static; inline;
+      const a_out: TCryptoLibByteArray; a_index: Int32); overload;
+      static; inline;
 
 
     class procedure ReadUInt64AsBytesBE(a_in: UInt64;
     class procedure ReadUInt64AsBytesBE(a_in: UInt64;
-      const a_out: TCryptoLibByteArray; a_index: Int32); overload; static; inline;
+      const a_out: TCryptoLibByteArray; a_index: Int32); overload;
+      static; inline;
 
 
     class function ConvertStringToBytes(const a_in: String;
     class function ConvertStringToBytes(const a_in: String;
       a_encoding: TEncoding): TCryptoLibByteArray; overload; static;
       a_encoding: TEncoding): TCryptoLibByteArray; overload; static;
@@ -465,8 +469,15 @@ begin
   System.Assert(System.length(l_in) and 1 = 0);
   System.Assert(System.length(l_in) and 1 = 0);
 {$ENDIF DEBUG}
 {$ENDIF DEBUG}
   System.SetLength(result, System.length(l_in) shr 1);
   System.SetLength(result, System.length(l_in) shr 1);
+{$IFDEF FPC}
   HexToBin(PChar(l_in), @result[0], System.length(result));
   HexToBin(PChar(l_in), @result[0], System.length(result));
-
+{$ELSE}
+{$IFNDEF NEXTGEN}
+  HexToBin(PChar(l_in), @result[0], System.length(result));
+{$ELSE}
+  HexToBin(PChar(l_in), 0, result, 0, System.length(l_in));
+{$ENDIF !NEXTGEN}
+{$ENDIF FPC}
 end;
 end;
 
 
 class function TConverters.ConvertStringToBytes(const a_in: String;
 class function TConverters.ConvertStringToBytes(const a_in: String;