From 0712dbe25d3aaad3c3dcecbef99316562cb991a7 Mon Sep 17 00:00:00 2001 From: florian Date: Thu, 5 Aug 2010 19:11:25 +0000 Subject: [PATCH] * white space fixes git-svn-id: trunk@15709 - --- compiler/ncgutil.pas | 18 +++++++++--------- compiler/nobj.pas | 2 +- compiler/ptconst.pas | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/compiler/ncgutil.pas b/compiler/ncgutil.pas index 8b664ecd8b..40985db710 100644 --- a/compiler/ncgutil.pas +++ b/compiler/ncgutil.pas @@ -1473,15 +1473,15 @@ implementation (is_managed_type(tabstractvarsym(p).vardef) or ((m_iso in current_settings.modeswitches) and (tabstractvarsym(p).vardef.typ=filedef)) ) then - begin - OldAsmList:=current_asmdata.CurrAsmList; - current_asmdata.CurrAsmList:=TAsmList(arg); - hp:=initialize_data_node(cloadnode.create(tsym(p),tsym(p).owner)); - firstpass(hp); - secondpass(hp); - hp.free; - current_asmdata.CurrAsmList:=OldAsmList; - end; + begin + OldAsmList:=current_asmdata.CurrAsmList; + current_asmdata.CurrAsmList:=TAsmList(arg); + hp:=initialize_data_node(cloadnode.create(tsym(p),tsym(p).owner)); + firstpass(hp); + secondpass(hp); + hp.free; + current_asmdata.CurrAsmList:=OldAsmList; + end; end; diff --git a/compiler/nobj.pas b/compiler/nobj.pas index 851a1c5757..0a42bab601 100644 --- a/compiler/nobj.pas +++ b/compiler/nobj.pas @@ -272,7 +272,7 @@ implementation hasequalpara:=(compare_paras(vmtpd.paras,pd.paras,cp_none,[cpo_ignoreuniv])>=te_equal); { check that we are not trying to override a final method } - if (po_finalmethod in vmtpd.procoptions) and + if (po_finalmethod in vmtpd.procoptions) and hasequalpara and (po_overridingmethod in pd.procoptions) and is_class(_class) then MessagePos1(pd.fileinfo,parser_e_final_can_no_be_overridden,pd.fullprocname(false)) else diff --git a/compiler/ptconst.pas b/compiler/ptconst.pas index 56322b0684..ca74ea64e9 100644 --- a/compiler/ptconst.pas +++ b/compiler/ptconst.pas @@ -1056,7 +1056,7 @@ implementation end; var - i : longint; + i : longint; begin { GUID }