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

lazreport: fixed compilation with fpc 2.7.1

Browse Source 
git-svn-id: trunk@37101 -
This commit is contained in:
mattias 2012-04-30 10:24:01 +00:00
parent b0c62dc7dd
commit 82997d00c0
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/lazreport/source/lr_class.pas
View File

@ -9851,7 +9851,7 @@ var
min, max, avg, sum, count, d, v: Double;
dk: (dkNone, dkSum, dkMin, dkMax, dkAvg, dkCount);
vv, v2, v1: Variant;
BM : Pointer;
BM : TBookMark;
{$IFDEF DebugLR}
function FNoStr: string;
begin

7
components/lazreport/source/lr_dbset.pas
View File

@ -137,7 +137,7 @@ begin
Result:=inherited GetBookMark;
ds := DataSet;
if Assigned(ds) then
Result:=ds.GetBookmark;
TBookMark(Result):=ds.GetBookmark; //increases refcount of bookmark
end;
procedure TfrDBDataSet.GotoBookMark(BM: Pointer);
@ -146,13 +146,16 @@ var
begin
ds := DataSet;
if Assigned(ds) then
ds.GotoBookmark(BM);
ds.GotoBookmark(TBookMark(BM));
end;
procedure TfrDBDataSet.FreeBookMark(BM: Pointer);
var
ds: TDataset;
begin
{$IFNDEF noautomatedbookmark}
SetLength(TBookMark(BM),0); //decreases refcount of bookmark
{$ENDIF noautomatedbookmark}
ds := DataSet;
if Assigned(ds) and Assigned(BM) then
ds.FreeBookmark(BM);

6
components/lazreport/source/lr_vers.inc
View File

@ -55,3 +55,9 @@
{$ENDIF}
{$ENDIF}
{$DEFINE Delphi5}
{$if FPC_FULLVERSION<20701}
// in former FCL versions TBookmark was a simple pointer
{$DEFINE noautomatedbookmark}
{$endif}