From: henri g. <pro...@us...> - 2003-09-24 19:23:46
|
Update of /cvsroot/jvcl/dev/JVCL3/run In directory sc8-pr-cvs1:/tmp/cvs-serv1314/run Modified Files: JvUIBDataSet.pas Log Message: Delphi 5 compatibility Index: JvUIBDataSet.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvUIBDataSet.pas,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** JvUIBDataSet.pas 23 Sep 2003 22:29:03 -0000 1.1 --- JvUIBDataSet.pas 24 Sep 2003 19:23:41 -0000 1.2 *************** *** 121,125 **** --- 121,127 ---- published property Transaction; + {$IFDEF DELPHI6_UP} property UniDirectionnal; + {$ENDIF} property OnClose; property OnError; *************** *** 137,141 **** --- 139,145 ---- implementation + {$IFDEF DELPHI6_UP} uses FMTBCD; + {$ENDIF} procedure TJvUIBCustomDataSet.InternalOpen; *************** *** 174,178 **** ReqBookmark: Integer; begin ! ReqBookmark := PInteger (Bookmark)^; FCurrentRecord := ReqBookmark end; --- 178,182 ---- ReqBookmark: Integer; begin ! ReqBookmark := Integer(Bookmark^); FCurrentRecord := ReqBookmark end; *************** *** 216,220 **** Buffer: PChar; Data: Pointer); begin ! PInteger(Data)^ := PUIBBookMark(Buffer + FRecordSize).Bookmark; end; --- 220,224 ---- Buffer: PChar; Data: Pointer); begin ! Integer(Data^) := PUIBBookMark(Buffer + FRecordSize).Bookmark; end; *************** *** 224,228 **** begin PUIBBookMark(Buffer + FRecordSize).Bookmark := ! PInteger(Data)^; end; --- 228,232 ---- begin PUIBBookMark(Buffer + FRecordSize).Bookmark := ! Integer(Data^); end; *************** *** 298,302 **** end; ! PInteger (Buffer)^ := FCurrentRecord; with PUIBBookMark(Buffer + FRecordSize)^ do begin --- 302,306 ---- end; ! PInteger(Buffer)^ := FCurrentRecord; with PUIBBookMark(Buffer + FRecordSize)^ do begin *************** *** 379,383 **** --- 383,389 ---- procedure TJvUIBCustomDataSet.SetUniDirectional(const Value: boolean); begin + {$IFDEF DELPHI6_UP} inherited SetUniDirectional(Value); + {$ENDIF} FStatement.CachedFetch := not Value; end; *************** *** 431,436 **** --- 437,444 ---- Precision := 10 else Precision := 9; + {$IFDEF DELPHI6_UP} if size > 4 then DataType := ftFMTBcd else + {$ENDIF} DataType := ftBCD; end; *************** *** 443,448 **** --- 451,458 ---- Precision := 19 else Precision := 18; + {$IFDEF DELPHI6_UP} if size > 4 then DataType := ftFMTBcd else + {$ENDIF} DataType := ftBCD; end; *************** *** 510,526 **** --- 520,548 ---- SQL_SHORT: begin + {$IFDEF DELPHI6_UP} TBCD(Buffer^) := strToBcd(IntToStr(PSmallint(sqldata)^)); BcdDivide(TBCD(Buffer^), inttostr(scaledivisor[sqlscale]), TBCD(Buffer^)); + {$ELSE} + CurrToBcd(PSmallint(sqldata)^/scaledivisor[sqlscale], TBCD(Buffer^)); + {$ENDIF} end; SQL_LONG: begin + {$IFDEF DELPHI6_UP} TBCD(Buffer^) := strToBcd(IntToStr(PInteger(sqldata)^)); BcdDivide(TBCD(Buffer^), inttostr(scaledivisor[sqlscale]), TBCD(Buffer^)); + {$ELSE} + CurrToBcd(PInteger(sqldata)^/scaledivisor[sqlscale], TBCD(Buffer^)); + {$ENDIF} end; SQL_INT64, SQL_QUAD: begin + {$IFDEF DELPHI6_UP} TBCD(Buffer^) := strToBcd(IntToStr(PInt64(sqldata)^)); BcdDivide(TBCD(Buffer^), inttostr(scaledivisor[sqlscale]), TBCD(Buffer^)); + {$ELSE} + CurrToBcd(PInt64(sqldata)^/scaledivisor[sqlscale], TBCD(Buffer^)); + {$ENDIF} end; SQL_DOUBLE: PDouble(Buffer)^ := PDouble(sqldata)^; |