Browse Source

* Merging revisions 42799 from trunk:
------------------------------------------------------------------------
r42799 | michael | 2019-08-24 13:01:15 +0200 (Sat, 24 Aug 2019) | 1 line

* Make order of args in TryISO8601ToDate delphi compatible
------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@42847 -

michael 6 years ago
parent
commit
10629fb682
1 changed files with 4 additions and 4 deletions
  1. 4 4
      packages/rtl-objpas/src/inc/dateutil.inc

+ 4 - 4
packages/rtl-objpas/src/inc/dateutil.inc

@@ -455,7 +455,7 @@ Function TryISOTZStrToTZOffset(const TZ : String; Out TZOffset : Integer) : bool
 function DateToISO8601(const ADate: TDateTime; AInputIsUTC: Boolean = True): string;
 function DateToISO8601(const ADate: TDateTime; AInputIsUTC: Boolean = True): string;
 Function ISO8601ToDate(const DateString: string; ReturnUTC : Boolean): TDateTime;
 Function ISO8601ToDate(const DateString: string; ReturnUTC : Boolean): TDateTime;
 Function ISO8601ToDateDef(const DateString: string; ReturnUTC : Boolean; aDefault : TDateTime): TDateTime;
 Function ISO8601ToDateDef(const DateString: string; ReturnUTC : Boolean; aDefault : TDateTime): TDateTime;
-Function TryISO8601ToDate(const DateString: string; ReturnUTC : Boolean;out ADateTime: TDateTime) : Boolean;
+Function TryISO8601ToDate(const DateString: string; out ADateTime: TDateTime; ReturnUTC : Boolean) : Boolean;
 
 
 
 
 implementation
 implementation
@@ -2896,7 +2896,7 @@ begin
     Raise EConvertError.CreateFmt('Invalid ISO timezone string',[TZ]);
     Raise EConvertError.CreateFmt('Invalid ISO timezone string',[TZ]);
 end;
 end;
 
 
-Function TryISO8601ToDate(const DateString: string; ReturnUTC : Boolean;out ADateTime: TDateTime) : Boolean;
+Function TryISO8601ToDate(const DateString: string; out ADateTime: TDateTime;ReturnUTC : Boolean) : Boolean;
 
 
 
 
 Var
 Var
@@ -2944,14 +2944,14 @@ end;
 Function ISO8601ToDate(const DateString: string; ReturnUTC : Boolean): TDateTime;
 Function ISO8601ToDate(const DateString: string; ReturnUTC : Boolean): TDateTime;
 
 
 begin
 begin
-  if not TryISO8601ToDate(DateString,ReturnUTC,Result) then
+  if not TryISO8601ToDate(DateString,Result,ReturnUTC) then
     Raise EConvertError.CreateFmt(SErrInvalidTimeStamp,[DateString]);
     Raise EConvertError.CreateFmt(SErrInvalidTimeStamp,[DateString]);
 end;
 end;
 
 
 Function ISO8601ToDateDef(const DateString: string; ReturnUTC : Boolean; aDefault : TDateTime): TDateTime;
 Function ISO8601ToDateDef(const DateString: string; ReturnUTC : Boolean; aDefault : TDateTime): TDateTime;
 
 
 begin
 begin
-  if not TryISO8601ToDate(DateString,ReturnUTC,Result) then
+  if not TryISO8601ToDate(DateString,Result,ReturnUTC) then
     Result:=aDefault;
     Result:=aDefault;
 end;
 end;