From 52afb619aacf7863b677d5368950d91ab4df46e6 Mon Sep 17 00:00:00 2001 From: marco Date: Thu, 4 Aug 2011 17:01:34 +0000 Subject: [PATCH] * add overloaded strtotime, patch by Lacak2, Mantis #19870 git-svn-id: trunk@18093 - --- rtl/objpas/sysutils/dati.inc | 14 ++++++++++++++ rtl/objpas/sysutils/datih.inc | 2 ++ 2 files changed, 16 insertions(+) diff --git a/rtl/objpas/sysutils/dati.inc b/rtl/objpas/sysutils/dati.inc index db580cf03d..f8dc293dd1 100644 --- a/rtl/objpas/sysutils/dati.inc +++ b/rtl/objpas/sysutils/dati.inc @@ -708,6 +708,20 @@ begin Raise EConvertError.Create(Msg); end; +function StrToTime(const S: PChar; Len : integer; FormatSettings : TFormatSettings; separator : char = #0): TDateTime; +Var + Msg : AnsiString; +begin + Result:=IntStrToTime(Msg,S,Len,FormatSettings,Separator); + If (Msg<>'') then + Raise EConvertError.Create(Msg); +end; + +function StrToTime(const S: string; FormatSettings : TFormatSettings): TDateTime; +begin + Result := StrToTime(@S[1], length(S), FormatSettings, #0); +end; + function StrToTime(const s: ShortString; separator : char): TDateTime; begin result := StrToTime(@s[1], length(s), separator); diff --git a/rtl/objpas/sysutils/datih.inc b/rtl/objpas/sysutils/datih.inc index 13113ba3e7..335eaad42c 100644 --- a/rtl/objpas/sysutils/datih.inc +++ b/rtl/objpas/sysutils/datih.inc @@ -135,6 +135,8 @@ function StrToTime(const S: Shortstring): TDateTime; {$ifdef SY function StrToTime(const S: Ansistring): TDateTime; {$ifdef SYSUTILSINLINE}inline;{$endif} function StrToTime(const S: ShortString; separator : char): TDateTime;{$ifdef SYSUTILSINLINE}inline;{$endif} function StrToTime(const S: AnsiString; separator : char): TDateTime; {$ifdef SYSUTILSINLINE}inline;{$endif} +function StrToTime(const S: PChar; Len : integer; FormatSettings : TFormatSettings; separator : char = #0): TDateTime; +function StrToTime(const S: string; FormatSettings : TFormatSettings): TDateTime; function StrToDate(const S: ShortString; const useformat : string; separator : char): TDateTime;{$ifdef SYSUTILSINLINE}inline;{$endif} function StrToDate(const S: AnsiString; const useformat : string; separator : char): TDateTime;{$ifdef SYSUTILSINLINE}inline;{$endif} function StrToTime(const S: PChar; Len : integer; separator : char = #0): TDateTime;