@@ -641,7 +641,7 @@ end;
destructor TFieldMap.Destroy;
begin
if FFreeDataset then
- FreeAndNil(FFreeDataset);
+ FreeAndNil(FDataset);
inherited Destroy;
end;
@@ -348,7 +348,7 @@ Type
{ Type Helpers}
{$i syshelph.inc}
- procedure FreeAndNil(var obj);
+ procedure FreeAndNil(constref obj : TObject);
procedure FreeMemAndNil(var p);
{ interface handling }
@@ -157,12 +157,14 @@ end;
{ OS utility code }
{$i osutil.inc}
+ procedure FreeAndNil(constref obj: TObject);
+ type
+ PObject = ^TObject;
var
temp: tobject;
- temp:=tobject(obj);
- pointer(obj):=nil;
+ temp:=obj;
+ PObject(@obj)^:=nil;
temp.free;