Browse Source

* Remove more ptrint usage.'

git-svn-id: trunk@7909 -
daniel 18 years ago
parent
commit
296501f036
1 changed files with 4 additions and 4 deletions
  1. 4 4
      rtl/inc/objects.pp

+ 4 - 4
rtl/inc/objects.pp

@@ -962,8 +962,8 @@ TYPE
 CONSTRUCTOR TObject.Init;
 CONSTRUCTOR TObject.Init;
 VAR LinkSize: LongInt; Dummy: DummyObject;
 VAR LinkSize: LongInt; Dummy: DummyObject;
 BEGIN
 BEGIN
-   LinkSize := PtrInt(@Dummy.Data)-PtrInt(@Dummy);  { Calc VMT link size }
-   FillChar(Pointer(PtrInt(@Self)+LinkSize)^,
+   LinkSize := Pbyte(@Dummy.Data)-Pbyte(@Dummy);  { Calc VMT link size }
+   FillChar((Pbyte(@Self)+LinkSize)^,
      SizeOf(Self)-LinkSize, #0);                      { Clear data fields }
      SizeOf(Self)-LinkSize, #0);                      { Clear data fields }
 END;
 END;
 
 
@@ -1914,7 +1914,7 @@ VAR I: LongInt;
 BEGIN
 BEGIN
    For I := Count DownTo 1 Do
    For I := Count DownTo 1 Do
      Begin                   { Down from last item }
      Begin                   { Down from last item }
-       IF Boolean(Byte(ptrint(CallPointerLocal(Test,get_caller_frame(get_frame),Items^[I-1])))) THEN
+       IF Boolean(Byte(ptruint(CallPointerLocal(Test,get_caller_frame(get_frame),Items^[I-1])))) THEN
        Begin          { Test each item }
        Begin          { Test each item }
          LastThat := Items^[I-1];                     { Return item }
          LastThat := Items^[I-1];                     { Return item }
          Exit;                                        { Now exit }
          Exit;                                        { Now exit }
@@ -1931,7 +1931,7 @@ FUNCTION TCollection.FirstThat (Test: Pointer): Pointer;
 VAR I: LongInt;
 VAR I: LongInt;
 BEGIN
 BEGIN
    For I := 1 To Count Do Begin                       { Up from first item }
    For I := 1 To Count Do Begin                       { Up from first item }
-     IF Boolean(Byte(ptrint(CallPointerLocal(Test,get_caller_frame(get_frame),Items^[I-1])))) THEN
+     IF Boolean(Byte(ptruint(CallPointerLocal(Test,get_caller_frame(get_frame),Items^[I-1])))) THEN
        Begin          { Test each item }
        Begin          { Test each item }
        FirstThat := Items^[I-1];                      { Return item }
        FirstThat := Items^[I-1];                      { Return item }
        Exit;                                          { Now exit }
        Exit;                                          { Now exit }