From 41d2a7604a1d0c12eb12ede7748fe9514cb10304 Mon Sep 17 00:00:00 2001
From: alexs75 <alexs75@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Sat, 3 Mar 2012 18:35:29 +0000
Subject: [PATCH] fix compile with latest FPC 2.7

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@2332 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 components/rx/dbutils.pas | 7 +++++--
 components/rx/rxmemds.pas | 8 +++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/components/rx/dbutils.pas b/components/rx/dbutils.pas
index 0c85da01a..00fef5721 100644
--- a/components/rx/dbutils.pas
+++ b/components/rx/dbutils.pas
@@ -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;
diff --git a/components/rx/rxmemds.pas b/components/rx/rxmemds.pas
index ceb63aeb7..ca5ab5126 100644
--- a/components/rx/rxmemds.pas
+++ b/components/rx/rxmemds.pas
@@ -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;