pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

fix compile with latest FPC 2.7

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@2332 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
alexs75
2012-03-03 18:35:29 +00:00
parent 96d0c1deb9
commit 41d2a7604a
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
components/rx/dbutils.pas
View File

@ -381,7 +381,6 @@ function DataSetLocateThrough(DataSet: TDataSet; const KeyFields: string;
var
FieldCount: Integer;
Fields: TList;
Bookmark: TBookmarkStr;
function CompareField(Field: TField; Value: Variant): Boolean;
var
@ -417,6 +416,8 @@ var
end;
end;
var
Bookmark: TBookmark;
begin
Result := False;
with DataSet do begin
@ -446,6 +447,7 @@ begin
DataSet.Bookmark := Bookmark;
end;
finally
DataSet.FreeBookmark(Bookmark);
DataSet.EnableControls;
end;
finally
@ -914,7 +916,7 @@ end;
procedure FillValueForField(const Field: TField; Value: Variant);
var
DS:TDataSet;
P:TBookmarkStr;
P:TBookmark;
begin
DS:=Field.DataSet;
DS.DisableControls;
@ -930,6 +932,7 @@ begin
end;
finally
DS.Bookmark:=P;
DS.FreeBookmark(P);
DS.EnableControls;
end;
end;

8
components/rx/rxmemds.pas
View File

@ -1290,7 +1290,6 @@ function DataSetLocateThrough(DataSet: TDataSet; const KeyFields: string;
var
FieldCount: Integer;
Fields: TList;
Bookmark: TBookmarkStr;
function CompareField(Field: TField; Value: Variant): Boolean;
var
@ -1325,7 +1324,8 @@ var
Result := Result and CompareField(TField(Fields[I]), KeyValues[I]);
end;
end;
var
Bookmark: TBookmark;
begin
Result := False;
with DataSet do begin
@ -1355,6 +1355,7 @@ begin
DataSet.Bookmark := Bookmark;
end;
finally
DataSet.FreeBookmark(Bookmark);
DataSet.EnableControls;
end;
finally
@ -1576,7 +1577,7 @@ end;
procedure TRxMemoryData.Sort;
var
Pos: TBookmarkStr;
Pos: TBookmark;
begin
if Active and (FRecords <> nil) and (FRecords.Count > 0) then
begin
@ -1595,6 +1596,7 @@ begin
end;
finally
Bookmark := Pos;
FreeBookmark(Pos);
end;
Resync([]);
end;