Browse Source

Rename ARC related methods of TObject so that they conflict less with existing methods/fields (in this case the "refcount" field of TSymtable in the compiler)

rtl/inc/objpash.inc & objpas.inc:
  * prefix methods IncRef, DecRef, RefCount, IsRefCount and RefCountOffset with 'ARC'

git-svn-id: branches/svenbarth/arc@28908 -
svenbarth 10 years ago
parent
commit
9868b82f64
2 changed files with 13 additions and 13 deletions
  1. 8 8
      rtl/inc/objpas.inc
  2. 5 5
      rtl/inc/objpash.inc

+ 8 - 8
rtl/inc/objpas.inc

@@ -986,36 +986,36 @@
           result:=ClassName;
         end;
 
-      procedure TObject.IncRef;
+      procedure TObject.ARCIncRef;
         var
           offset: LongInt;
         begin
-          offset := RefCountOffset;
+          offset := ARCRefCountOffset;
           if offset > 0 then
             refcountclass_incr_ref(Pointer(Self), offset);
         end;
 
-      procedure TObject.DecRef;
+      procedure TObject.ARCDecRef;
         var
           offset: LongInt;
         begin
-          offset := RefCountOffset;
+          offset := ARCRefCountOffset;
           if offset > 0 then
             refcountclass_decr_ref(Pointer(Self), offset);
         end;
 
-      function TObject.RefCount: LongInt;
+      function TObject.ARCRefCount: LongInt;
         var
           offset: LongInt;
         begin
-          offset := RefCountOffset;
+          offset := ARCRefCountOffset;
           if offset > 0 then
             Result := PLongInt(Pointer(Self) + offset)^
           else
             Result := -1;
         end;
 
-      function TObject.IsRefCounted: Boolean;
+      function TObject.ARCIsRefCounted: Boolean;
         begin
           {$ifdef VER2_6}
           Result := False;
@@ -1024,7 +1024,7 @@
           {$endif}
         end;
 
-      function TObject.RefCountOffset: LongInt;
+      function TObject.ARCRefCountOffset: LongInt;
         begin
           {$ifdef VER2_6}
           Result := 0;

+ 5 - 5
rtl/inc/objpash.inc

@@ -245,12 +245,12 @@
           function ToString: ansistring;virtual;
 
           { methods for reference counting }
-          procedure IncRef;inline;
-          procedure DecRef;inline;
-          function RefCount: LongInt;inline;
-          function IsRefCounted: Boolean;inline;
+          procedure ARCIncRef;inline;
+          procedure ARCDecRef;inline;
+          function ARCRefCount: LongInt;inline;
+          function ARCIsRefCounted: Boolean;inline;
        private
-          function RefCountOffset: LongInt;inline;
+          function ARCRefCountOffset: LongInt;inline;
        end;
 
        IUnknown = interface