* Renamed "fieldoffset" to "iioffset" to avoid confusion with fieldvarsym.fieldoffset

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@6214 3ad0048d-3df7-0310-abae-a5850022a9f2

2 files changed, 6 insertions, 8 deletions

diff --git a/compiler/nobj.pas b/compiler/nobj.pas
index 5f330ddc00..bf872924c1 100644
--- a/compiler/nobj.pas
+++ b/compiler/nobj.pas
@@ -521,7 +521,7 @@ implementation
                     ImplIntf.AddImplProc(implprocdef)
                   end
                 else
-                  if ImplIntf.iitype = etStandard then
+                  if ImplIntf.itype = etStandard then
                     Message1(sym_e_no_matching_implementation_found,tprocdef(def).fullprocname(false));
               end;
           end;
@@ -1224,7 +1224,7 @@ implementation
         if AImplIntf.VtblImplIntf.itype = etStandard then
           current_asmdata.asmlists[al_globals].concat(Tai_const.Create_aint(AImplIntf.VtblImplIntf.ioffset))
         else
-          current_asmdata.asmlists[al_globals].concat(Tai_const.Create_aint(AImplIntf.VtblImplIntf.fieldoffset));
+          current_asmdata.asmlists[al_globals].concat(Tai_const.Create_aint(AImplIntf.VtblImplIntf.iioffset));
         { IIDStr }
         current_asmdata.getdatalabel(iidlabel);
         rawdata.concat(cai_align.create(const_align(sizeof(aint))));
@@ -1235,8 +1235,8 @@ implementation
         else
           rawdata.concat(Tai_string.Create(AImplIntf.IntfDef.iidstr^));
         current_asmdata.asmlists[al_globals].concat(Tai_const.Create_sym(iidlabel));
-        { IIType }
-        current_asmdata.asmlists[al_globals].concat(Tai_const.Create_aint(aint(AImplIntf.iitype)));
+        { IType }
+        current_asmdata.asmlists[al_globals].concat(Tai_const.Create_aint(aint(AImplIntf.itype)));
       end;
 
 
diff --git a/compiler/symdef.pas b/compiler/symdef.pas
index f37eb61bd9..3e84a0076d 100644
--- a/compiler/symdef.pas
+++ b/compiler/symdef.pas
@@ -204,7 +204,6 @@ interface
          VtblImplIntf : TImplementedInterface;
          NameMappings : TFPHashList;
          ProcDefs     : TFPObjectList;
-         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)
          // - Ivo Steinmann
@@ -4031,10 +4030,9 @@ implementation
         intfdef:=aintf;
         ioffset:=-1;
         itype:=etStandard;
-        fieldoffset:=-1;
+        iioffset:=-1;
         NameMappings:=nil;
         procdefs:=nil;
-        iitype := etStandard;
         iioffset := 0;
       end;
 
@@ -4046,7 +4044,7 @@ implementation
         intfdefderef:=d;
         ioffset:=-1;
         itype:=etStandard;
-        fieldoffset:=-1;
+        iioffset:=-1;
         NameMappings:=nil;
         procdefs:=nil;
       end;