Browse Source

* Moved iitype iioffset from tobjectdef to TImplementedInterface

git-svn-id: trunk@6211 -
chrivers 18 years ago
parent
commit
cf04dc0fa1
1 changed files with 6 additions and 2 deletions
  1. 6 2
      compiler/symdef.pas

+ 6 - 2
compiler/symdef.pas

@@ -204,9 +204,11 @@ interface
          VtblImplIntf : TImplementedInterface;
          VtblImplIntf : TImplementedInterface;
          NameMappings : TFPHashList;
          NameMappings : TFPHashList;
          ProcDefs     : TFPObjectList;
          ProcDefs     : TFPObjectList;
-         FieldOffset  : longint;
-         // FieldOffset can be merged with IOffset. But then, fpc is not allowed to genrate a vmtentry.
+         iitype       : tinterfaceentrytype;
+         // IIOffset can be merged with IOffset. But then, fpc is not allowed to genrate a vmtentry.
          // Right now, fpc generate an entry for all implemented interfaces (but it should just for etStandard ones)
          // Right now, fpc generate an entry for all implemented interfaces (but it should just for etStandard ones)
+         // - Ivo Steinmann
+         iioffset     : longint;
          constructor create(aintf: tobjectdef);
          constructor create(aintf: tobjectdef);
          constructor create_deref(d:tderef);
          constructor create_deref(d:tderef);
          destructor  destroy; override;
          destructor  destroy; override;
@@ -4032,6 +4034,8 @@ implementation
         fieldoffset:=-1;
         fieldoffset:=-1;
         NameMappings:=nil;
         NameMappings:=nil;
         procdefs:=nil;
         procdefs:=nil;
+        iitype := etStandard;
+        iioffset := 0;
       end;
       end;