Bläddra i källkod

--- Merging r17211 into '.':
U rtl/objpas/cvarutil.inc

# revisions: 17211
------------------------------------------------------------------------
r17211 | sergei | 2011-04-01 07:45:12 +0200 (Fri, 01 Apr 2011) | 1 line
Changed paths:
M /trunk/rtl/objpas/cvarutil.inc

* Fixed pointer to cardinal typecasts, which are wrong for 64-bit platforms (significance is low, because these are in debug code).
------------------------------------------------------------------------

git-svn-id: branches/fixes_2_4@17636 -

marco 14 år sedan
förälder
incheckning
71b96eee45
1 ändrade filer med 4 tillägg och 4 borttagningar
  1. 4 4
      rtl/objpas/cvarutil.inc

+ 4 - 4
rtl/objpas/cvarutil.inc

@@ -1345,7 +1345,7 @@ Var
   i: Integer;
   i: Integer;
 
 
 begin
 begin
-  Writeln(F,'---> ', aName, ' at $', IntToHex(Cardinal(@VargSrc), 8), ' <----------------');
+  Writeln(F,'---> ', aName, ' at $', HexStr(@VargSrc), ' <----------------');
   with VargSrc do begin
   with VargSrc do begin
 
 
     if vType and varByRef = varByRef then
     if vType and varByRef = varByRef then
@@ -1371,7 +1371,7 @@ begin
     WriteLn;
     WriteLn;
 
 
     if vType and varArray = varArray then begin
     if vType and varArray = varArray then begin
-      Writeln(F,'---< ', aName, ' at $', IntToHex(Cardinal(@VargSrc), 8), ' >----------------');
+      Writeln(F,'---< ', aName, ' at $', HexStr(@VargSrc), ' >----------------');
       Writeln(F);
       Writeln(F);
       Exit;
       Exit;
     end;
     end;
@@ -1382,7 +1382,7 @@ begin
       if (vType and varByRef = varByRef) or (vType and varTypeMask = varVariant) then
       if (vType and varByRef = varByRef) or (vType and varTypeMask = varVariant) then
         if not Assigned(vPointer) then begin
         if not Assigned(vPointer) then begin
           WriteLn(F, 'nil]');
           WriteLn(F, 'nil]');
-          Writeln(F,'---< ', aName, ' at $', IntToHex(Cardinal(@VargSrc), 8), ' >----------------');
+          Writeln(F,'---< ', aName, ' at $', HexStr(@VargSrc), ' >----------------');
           Writeln(F);
           Writeln(F);
           Exit;
           Exit;
         end;
         end;
@@ -1438,7 +1438,7 @@ begin
     end;
     end;
   end;
   end;
 
 
-  Writeln(F,'---< ', aName, ' at $', IntToHex(Cardinal(@VargSrc), 8), ' >----------------');
+  Writeln(F,'---< ', aName, ' at $', HexStr(@VargSrc), ' >----------------');
   Writeln(F);
   Writeln(F);
 end;
 end;