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