From: <wp...@us...> - 2008-10-07 15:21:07
|
Revision: 11947 http://jvcl.svn.sourceforge.net/jvcl/?rev=11947&view=rev Author: wpostma Date: 2008-10-07 15:19:06 +0000 (Tue, 07 Oct 2008) Log Message: ----------- Previous checkin broken Delphi2009 compile on JvCsvData.pas. Fixed. Oops. Still one RTTI warning W1005. Modified Paths: -------------- trunk/jvcl/run/JvCsvData.pas Property Changed: ---------------- trunk/jvcl/lib/d12/ Property changes on: trunk/jvcl/lib/d12 ___________________________________________________________________ Added: svn:ignore + *.dcu Modified: trunk/jvcl/run/JvCsvData.pas =================================================================== --- trunk/jvcl/run/JvCsvData.pas 2008-10-07 14:04:58 UTC (rev 11946) +++ trunk/jvcl/run/JvCsvData.pas 2008-10-07 15:19:06 UTC (rev 11947) @@ -1017,16 +1017,24 @@ end; -function JvCsvStrToFloatDef(strvalue:String;defvalue:Double;aseparator:Char):Double; +function JvCsvStrToFloatDef(strvalue:String;defvalue:Double;aseparator:AnsiChar):Double; begin { does not raise exceptions} - result := JvSafeStrToFloatDef(strvalue,defvalue,aseparator); // // JvJCLUtils + result := JvSafeStrToFloatDef(strvalue,defvalue, + {$IFDEF COMPILER12_UP}Char({$endif} + aseparator + {$IFDEF COMPILER12_UP}){$endif} + ); // // JvJCLUtils end; -function JvCsvStrToFloat(strvalue:String;aseparator:Char):Double; +function JvCsvStrToFloat(strvalue:String;aseparator:AnsiChar):Double; begin { raises EConvertError exception } - result := JvSafeStrToFloat(strvalue,aseparator); // // JvJCLUtils + result := JvSafeStrToFloat(strvalue, + {$IFDEF COMPILER12_UP}Char({$endif} + aseparator + {$IFDEF COMPILER12_UP}){$endif} + ); // // JvJCLUtils end; @@ -1382,7 +1390,7 @@ function TJvCustomCsvDataSet._CsvFloatToStr(fvalue:Double):String; begin { raises exception EJvConvertError (same as EConvertError) } - FFormatSettings.DecimalSeparator := GetDecimalSeparator; + FFormatSettings.DecimalSeparator := {$IFDEF COMPILER12_UP}Char({$endif}GetDecimalSeparator {$IFDEF COMPILER12_UP}){$endif}; result := FloatToStr( fvalue, FFormatSettings ); end; @@ -1461,7 +1469,7 @@ inherited; FFileDirty := False; if FUseSystemDecimalSeparator then begin - FData.DecimalSeparator := SysUtils.DecimalSeparator; + FData.DecimalSeparator := {$IFDEF COMPILER12_UP}AnsiChar({$endif}SysUtils.DecimalSeparator{$IFDEF COMPILER12_UP}){$endif}; end; end; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |