Browse Source

Fix: Delphi compatibility fixes

Herman Schoenfeld 6 years ago
parent
commit
c0ff1981fb
2 changed files with 17 additions and 13 deletions
  1. 16 12
      src/libraries/sphere10/UCommon.pas
  2. 1 1
      src/tests/PascalCoinUnitTests.dproj

+ 16 - 12
src/libraries/sphere10/UCommon.pas

@@ -170,8 +170,8 @@ type
     property TimeStamp : TDateTime read FTimestamp;
     property TimeStamp : TDateTime read FTimestamp;
     property Severity : TLogSeverity read FSeverity;
     property Severity : TLogSeverity read FSeverity;
     property Text : String read FText;
     property Text : String read FText;
-    class function From(const AText : String; ASeverity : TLogSeverity; ATimeStamp : TDateTime) : TLogMessage; static; overload;
-    class function From(const AText : String; ASeverity : TLogSeverity = lsError) : TLogMessage; static; overload;
+    class function From(const AText : String; ASeverity : TLogSeverity; ATimeStamp : TDateTime) : TLogMessage; overload; static;
+    class function From(const AText : String; ASeverity : TLogSeverity = lsError) : TLogMessage; overload; static;
   end;
   end;
 
 
   { TResult }
   { TResult }
@@ -195,10 +195,10 @@ type
     procedure AddError(const AString : String);
     procedure AddError(const AString : String);
     function ToString(AIncludeTimeStamp : boolean = false) : String; overload;
     function ToString(AIncludeTimeStamp : boolean = false) : String; overload;
     function ToString(AIncludeTimeStamp, AIncludeSeverity : boolean) : String; overload;
     function ToString(AIncludeTimeStamp, AIncludeSeverity : boolean) : String; overload;
-    class function Success : TResult; static;
-    class function Success(const AText : String) : TResult; static; overload;
-    class function Failure : TResult; static; overload;
-    class function Failure(const AText : String) : TResult; static; overload;
+    class function Success : TResult; overload; static;
+    class function Success(const AText : String) : TResult; overload; static;
+    class function Failure : TResult; overload; static;
+    class function Failure(const AText : String) : TResult; overload; static;
   end;
   end;
 
 
   { TDateTimeHelper }
   { TDateTimeHelper }
@@ -965,14 +965,14 @@ begin
   Result := NOT FHasError;
   Result := NOT FHasError;
 end;
 end;
 
 
-procedure TResult.Add(const ALogMessage : TLogMessage); overload;
+procedure TResult.Add(const ALogMessage : TLogMessage);
 begin
 begin
   TArrayTool<TLogMessage>.Add(FMessages, ALogMessage);
   TArrayTool<TLogMessage>.Add(FMessages, ALogMessage);
   if ALogMessage.Severity = lsError then
   if ALogMessage.Severity = lsError then
     Self.FHasError := true;
     Self.FHasError := true;
 end;
 end;
 
 
-procedure TResult.Add(ASeverity : TLogSeverity; const AString : String); overload;
+procedure TResult.Add(ASeverity : TLogSeverity; const AString : String);
 begin
 begin
   Add(TLogMessage.From(AString, ASeverity));
   Add(TLogMessage.From(AString, ASeverity));
 end;
 end;
@@ -1026,27 +1026,27 @@ begin
   end;
   end;
 end;
 end;
 
 
-class function TResult.Success : TResult; static;
+class function TResult.Success : TResult;
 begin
 begin
   SetLength(Result.FMessages, 0);
   SetLength(Result.FMessages, 0);
   Result.FValue := Variants.Null;
   Result.FValue := Variants.Null;
   Result.FHasError := false;
   Result.FHasError := false;
 end;
 end;
 
 
-class function TResult.Success(const AText : String) : TResult; static; overload;
+class function TResult.Success(const AText : String) : TResult;
 begin
 begin
   Result := Success;
   Result := Success;
   Result.AddInfo(AText);
   Result.AddInfo(AText);
 end;
 end;
 
 
-class function TResult.Failure : TResult; static; overload;
+class function TResult.Failure : TResult;
 begin
 begin
   SetLength(Result.FMessages, 0);
   SetLength(Result.FMessages, 0);
   Result.FValue := Variants.Null;
   Result.FValue := Variants.Null;
   Result.FHasError := true;
   Result.FHasError := true;
 end;
 end;
 
 
-class function TResult.Failure(const AText : String) : TResult; static; overload;
+class function TResult.Failure(const AText : String) : TResult;
 begin
 begin
   Result := Failure;
   Result := Failure;
   Result.AddError(AText);
   Result.AddError(AText);
@@ -1183,7 +1183,11 @@ end;
 
 
 class function TDateTimeHelper.GetNowUtc: TDateTime;
 class function TDateTimeHelper.GetNowUtc: TDateTime;
 begin
 begin
+{$IFDEF FPC}
   Result := LocalTimeToUniversal(SysUtils.Now);
   Result := LocalTimeToUniversal(SysUtils.Now);
+{$ELSE}
+  Result := TTimeZone.Local.ToUniversalTime(SysUtils.Now);
+{$ENDIF}
 end;
 end;
 
 
 function TDateTimeHelper.GetSecond: Word;
 function TDateTimeHelper.GetSecond: Word;

+ 1 - 1
src/tests/PascalCoinUnitTests.dproj

@@ -52,7 +52,7 @@
         <DCC_N>false</DCC_N>
         <DCC_N>false</DCC_N>
         <DCC_S>false</DCC_S>
         <DCC_S>false</DCC_S>
         <DCC_ImageBase>00400000</DCC_ImageBase>
         <DCC_ImageBase>00400000</DCC_ImageBase>
-        <SanitizedProjectName>PasclaCoinUnitTests</SanitizedProjectName>
+        <SanitizedProjectName>PascalCoinUnitTests</SanitizedProjectName>
         <DCC_Namespace>Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;DUnitX;$(DCC_Namespace)</DCC_Namespace>
         <DCC_Namespace>Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;DUnitX;$(DCC_Namespace)</DCC_Namespace>
         <VerInfo_Locale>3081</VerInfo_Locale>
         <VerInfo_Locale>3081</VerInfo_Locale>
         <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=;CFBundleName=</VerInfo_Keys>
         <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=;CFBundleName=</VerInfo_Keys>