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

fix compile with latest FPC - tnx Ludo Brands

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@2413 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
alexs75
2012-05-02 16:40:14 +00:00
parent 29823d09b4
commit c150575c15
3 changed files with 43 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/rx/dbutils.pas
View File

@ -445,7 +445,11 @@ begin
end; end;
end; end;
finally finally
{$IFDEF NoAutomatedBookmark}
if not Result and DataSet.BookmarkValid(PChar(Bookmark)) then if not Result and DataSet.BookmarkValid(PChar(Bookmark)) then
{$ELSE}
if not Result and DataSet.BookmarkValid(Bookmark) then
{$ENDIF}
DataSet.GotoBookmark(Bookmark); DataSet.GotoBookmark(Bookmark);
end; end;
finally finally

4
components/rx/rx.inc
View File

@ -50,3 +50,7 @@
// //
{.$DEFINE DBDateEdit_OLD} {.$DEFINE DBDateEdit_OLD}
{$if FPC_FULLVERSION<20701}
{$DEFINE NoAutomatedBookmark}
{$endif}

39
components/rx/rxmemds.pas
View File

@ -125,7 +125,11 @@ type
procedure CloseBlob(Field: TField); override; procedure CloseBlob(Field: TField); override;
procedure GetBookmarkData(Buffer: PChar; Data: Pointer); override; procedure GetBookmarkData(Buffer: PChar; Data: Pointer); override;
function GetBookmarkFlag(Buffer: PChar): TBookmarkFlag; override; function GetBookmarkFlag(Buffer: PChar): TBookmarkFlag; override;
{$IFDEF NoAutomatedBookmark}
procedure InternalGotoBookmark(ABookmark: TBookmark); override; procedure InternalGotoBookmark(ABookmark: TBookmark); override;
{$ELSE}
procedure InternalGotoBookmark(ABookmark: Pointer); override;
{$ENDIF}
procedure InternalSetToRecord(Buffer: PChar); override; procedure InternalSetToRecord(Buffer: PChar); override;
procedure SetBookmarkFlag(Buffer: PChar; Value: TBookmarkFlag); override; procedure SetBookmarkFlag(Buffer: PChar; Value: TBookmarkFlag); override;
procedure SetBookmarkData(Buffer: PChar; Data: Pointer); override; procedure SetBookmarkData(Buffer: PChar; Data: Pointer); override;
@ -1051,18 +1055,37 @@ end;
function TRxMemoryData.BookmarkValid(ABookmark: TBookmark): Boolean; function TRxMemoryData.BookmarkValid(ABookmark: TBookmark): Boolean;
begin begin
{$IFDEF NoAutomatedBookmark}
Result := FActive and (TBookmarkData(ABookmark^) > Low(Integer)) and Result := FActive and (TBookmarkData(ABookmark^) > Low(Integer)) and
(TBookmarkData(ABookmark^) <= FLastID); (TBookmarkData(ABookmark^) <= FLastID);
{$ELSE}
Result := FActive and (TBookmarkData(pointer(ABookmark)^) > Low(Integer)) and
(TBookmarkData(pointer(ABookmark)^) <= FLastID);
{$ENDIF}
end; end;
function TRxMemoryData.CompareBookmarks(Bookmark1, Bookmark2: TBookmark): Integer; function TRxMemoryData.CompareBookmarks(Bookmark1, Bookmark2: TBookmark): Integer;
begin begin
if (Bookmark1 = nil) and (Bookmark2 = nil) then Result := 0 if (Bookmark1 = nil) and (Bookmark2 = nil) then Result := 0
else if (Bookmark1 <> nil) and (Bookmark2 = nil) then Result := 1 else
else if (Bookmark1 = nil) and (Bookmark2 <> nil) then Result := -1 if (Bookmark1 <> nil) and (Bookmark2 = nil) then Result := 1
else if TBookmarkData(Bookmark1^) > TBookmarkData(Bookmark2^) then else
if (Bookmark1 = nil) and (Bookmark2 <> nil) then Result := -1
{$IFDEF NoAutomatedBookmark}
else
if TBookmarkData(Bookmark1^) > TBookmarkData(Bookmark2^) then
{$ELSE}
else
if TBookmarkData(pointer(Bookmark1)^) > TBookmarkData(pointer(Bookmark2)^) then
{$ENDIF}
Result := 1 Result := 1
else if TBookmarkData(Bookmark1^) < TBookmarkData(Bookmark2^) then {$IFDEF NoAutomatedBookmark}
else
if TBookmarkData(Bookmark1^) < TBookmarkData(Bookmark2^) then
{$ELSE}
else
if TBookmarkData(pointer(Bookmark1)^) < TBookmarkData(pointer(Bookmark2)^) then
{$ENDIF}
Result := -1 Result := -1
else Result := 0; else Result := 0;
end; end;
@ -1089,7 +1112,11 @@ begin
PMemBookmarkInfo(Buffer + FBookmarkOfs)^.BookmarkFlag := Value; PMemBookmarkInfo(Buffer + FBookmarkOfs)^.BookmarkFlag := Value;
end; end;
{$IFDEF NoAutomatedBookmark}
procedure TRxMemoryData.InternalGotoBookmark(ABookmark: TBookmark); procedure TRxMemoryData.InternalGotoBookmark(ABookmark: TBookmark);
{$ELSE}
procedure TRxMemoryData.InternalGotoBookmark(ABookmark: Pointer);
{$ENDIF}
var var
Rec: TMemoryRecord; Rec: TMemoryRecord;
SavePos: Integer; SavePos: Integer;
@ -1365,7 +1392,11 @@ begin
end; end;
end; end;
finally finally
{$IFDEF NoAutomatedBookmark}
if not Result and DataSet.BookmarkValid(PChar(Bookmark)) then if not Result and DataSet.BookmarkValid(PChar(Bookmark)) then
{$ELSE}
if not Result and DataSet.BookmarkValid(Bookmark) then
{$ENDIF}
DataSet.GotoBookmark(Bookmark); DataSet.GotoBookmark(Bookmark);
end; end;
finally finally