paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-13 09:39:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

* removed exporting a non standard strtotime, which was a workaround for missing

Browse Source 
formatsettings/locale versions. Patch by Lacak2, Mantis #19870 (3rd)

git-svn-id: trunk@18110 -
This commit is contained in:
marco 2011-08-06 12:19:44 +00:00
parent 911a220a13
commit b59c42f2c7
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
rtl/objpas/sysutils/dati.inc
View File

@ -708,20 +708,15 @@ begin
Raise EConvertError.Create(Msg); Raise EConvertError.Create(Msg);
end; end;
function StrToTime(const S: PChar; Len : integer; FormatSettings : TFormatSettings; separator : char = #0): TDateTime; function StrToTime(const S: string; FormatSettings : TFormatSettings): TDateTime;
Var Var
Msg : AnsiString; Msg : AnsiString;
begin begin
Result:=IntStrToTime(Msg,S,Len,FormatSettings,#0); Result:=IntStrToTime(Msg, @S[1], length(S), FormatSettings, #0);
If (Msg<>'') then If (Msg<>'') then
Raise EConvertError.Create(Msg); Raise EConvertError.Create(Msg);
end; end;
function StrToTime(const S: string; FormatSettings : TFormatSettings): TDateTime;
begin
Result := StrToTime(@S[1], length(S), FormatSettings);
end;
function StrToTime(const s: ShortString; separator : char): TDateTime; function StrToTime(const s: ShortString; separator : char): TDateTime;
begin begin
result := StrToTime(@s[1], length(s), separator); result := StrToTime(@s[1], length(s), separator);

5
rtl/objpas/sysutils/datih.inc
View File

@ -135,15 +135,14 @@ function StrToTime(const S: Shortstring): TDateTime; {$ifdef SY
function StrToTime(const S: Ansistring): TDateTime; {$ifdef SYSUTILSINLINE}inline;{$endif} 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: ShortString; separator : char): TDateTime;{$ifdef SYSUTILSINLINE}inline;{$endif}
function StrToTime(const S: AnsiString; 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 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: 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 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; function StrToTime(const S: PChar; Len : integer; separator : char = #0): TDateTime;
function StrToDate(const S: PChar; Len : integer; const useformat : string; separator : char = #0): TDateTime; function StrToDate(const S: PChar; Len : integer; const useformat : string; separator : char = #0): TDateTime;
function StrToDateTime(const S: string): TDateTime; function StrToDateTime(const S: string): TDateTime;
function StrToDateTime(const s: ShortString; const Formatsettings : TFormatSettings): TDateTime; function StrToDateTime(const s: ShortString; const FormatSettings : TFormatSettings): TDateTime;
function StrToDateTime(const s: AnsiString; const Formatsettings : TFormatSettings): TDateTime; function StrToDateTime(const s: AnsiString; const FormatSettings : TFormatSettings): TDateTime;
function FormatDateTime(const FormatStr: string; DateTime: TDateTime):string; function FormatDateTime(const FormatStr: string; DateTime: TDateTime):string;
function FormatDateTime(const FormatStr: string; DateTime: TDateTime; const FormatSettings: TFormatSettings): string; function FormatDateTime(const FormatStr: string; DateTime: TDateTime; const FormatSettings: TFormatSettings): string;
procedure DateTimeToString(out Result: string; const FormatStr: string; const DateTime: TDateTime); procedure DateTimeToString(out Result: string; const FormatStr: string; const DateTime: TDateTime);