git-svn-id: trunk@9171 -
This commit is contained in:
mattias 2006-04-23 20:59:30 +00:00
parent 491a7b2186
commit 92afac14f1

View File

@ -33,7 +33,8 @@ uses
Classes, SysUtils, AvgLvlTree; Classes, SysUtils, AvgLvlTree;
type type
TMapIdType = (itu1, its1, itu2, its2, itu4, its4, itu8, its8, itu16, its16, itu32, its32); TMapIdType = (itu1, its1, itu2, its2, itu4, its4, itu8, its8, itu16, its16,
itu32, its32);
PMapItem = ^TMapItem; PMapItem = ^TMapItem;
@ -216,7 +217,7 @@ begin
Exit; Exit;
end; end;
Item := GetMem(SizeOF(TMapLink) + ID_LENGTH[FIdType] + FDataSize); Item := GetMem(SizeOF(TMapLink) + cardinal(ID_LENGTH[FIdType]) + FDataSize);
p := @item^.ID; p := @item^.ID;
Move(AId, p^, ID_LENGTH[FIdType]); Move(AId, p^, ID_LENGTH[FIdType]);
inc(p, ID_LENGTH[FIdType]); inc(p, ID_LENGTH[FIdType]);
@ -533,8 +534,6 @@ procedure TBaseMapIterator.Next;
begin begin
raise EInvalidOperation.Create('Cannot move past end'); raise EInvalidOperation.Create('Cannot move past end');
end; end;
var
Node: TAvgLvlTreeNode;
begin begin
if FInvalid if FInvalid
then begin then begin
@ -562,8 +561,6 @@ procedure TBaseMapIterator.Previous;
begin begin
raise EInvalidOperation.Create('Cannot move before start'); raise EInvalidOperation.Create('Cannot move before start');
end; end;
var
Node: TAvgLvlTreeNode;
begin begin
if FBOM then Error; if FBOM then Error;
FInvalid := False; FInvalid := False;