From cec5843f9596750f75516b1833b9bf1974548f2f Mon Sep 17 00:00:00 2001
From: Jonas Maebe <jonas@freepascal.org>
Date: Sun, 19 Dec 2010 19:37:47 +0000
Subject: [PATCH]   * renamed objcdef.addencodedtype to objcaddencodedtype for
 consistency     reasons, and to prevent name clashes

git-svn-id: trunk@16598 -
---
 compiler/objcdef.pas  | 12 ++++++------
 compiler/objcutil.pas |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/compiler/objcdef.pas b/compiler/objcdef.pas
index ad02a075a8..5fb800b1cb 100644
--- a/compiler/objcdef.pas
+++ b/compiler/objcdef.pas
@@ -48,7 +48,7 @@ interface
     type
       trecordinfostate = (ris_initial, ris_afterpointer, ris_dontprint);
 
-    function addencodedtype(def: tdef; recordinfostate: trecordinfostate; bpacked: boolean; var encodedstr: ansistring; out founderror: tdef): boolean;
+    function objcaddencodedtype(def: tdef; recordinfostate: trecordinfostate; bpacked: boolean; var encodedstr: ansistring; out founderror: tdef): boolean;
 
 implementation
 
@@ -137,7 +137,7 @@ implementation
                     encodedstr:=encodedstr+'}{?=';
                   end
               end;
-            if not addencodedtype(field.vardef,ris_afterpointer,bpacked,encodedstr,founderror) then
+            if not objcaddencodedtype(field.vardef,ris_afterpointer,bpacked,encodedstr,founderror) then
               exit;
           end;
         for i:=0 to variantstarts.count-1 do
@@ -148,7 +148,7 @@ implementation
       end;
 
 
-    function addencodedtype(def: tdef; recordinfostate: trecordinfostate; bpacked: boolean; var encodedstr: ansistring; out founderror: tdef): boolean;
+    function objcaddencodedtype(def: tdef; recordinfostate: trecordinfostate; bpacked: boolean; var encodedstr: ansistring; out founderror: tdef): boolean;
       var
         recname: ansistring;
         recdef: trecorddef;
@@ -226,7 +226,7 @@ implementation
                   newstate:=recordinfostate;
                   if (recordinfostate<ris_dontprint) then
                     newstate:=succ(newstate);
-                  if not addencodedtype(tpointerdef(def).pointeddef,newstate,false,encodedstr,founderror) then
+                  if not objcaddencodedtype(tpointerdef(def).pointeddef,newstate,false,encodedstr,founderror) then
                     begin
                       result:=false;
                       { report the exact (nested) error defintion }
@@ -360,7 +360,7 @@ implementation
                       encodedstr:=encodedstr+'['+tostr(len);
                       { Embedded structured types in the array are printed
                         in full regardless of the current recordinfostate.  }
-                      if not addencodedtype(tarraydef(def).elementdef,ris_initial,false,encodedstr,founderror) then
+                      if not objcaddencodedtype(tarraydef(def).elementdef,ris_initial,false,encodedstr,founderror) then
                         begin
                           result:=false;
                           { report the exact (nested) error defintion }
@@ -435,7 +435,7 @@ implementation
 
     function objctryencodetype(def: tdef; out encodedtype: ansistring; out founderror: tdef): boolean;
       begin
-        result:=addencodedtype(def,ris_initial,false,encodedtype,founderror);
+        result:=objcaddencodedtype(def,ris_initial,false,encodedtype,founderror);
       end;
 
 
diff --git a/compiler/objcutil.pas b/compiler/objcutil.pas
index 418da12b2c..23b1bfafd6 100644
--- a/compiler/objcutil.pas
+++ b/compiler/objcutil.pas
@@ -222,13 +222,13 @@ end;
             vs:=tparavarsym(pd.paras[i]);
             if (vo_is_funcret in vs.varoptions) then
               continue;
-            { addencodedtype always assumes a value parameter, so add
+            { objcaddencodedtype always assumes a value parameter, so add
               a pointer indirection for var/out parameters.  }
             if not paramanager.push_addr_param(vs_value,vs.vardef,pocall_cdecl) and
                (vs.varspez in [vs_var,vs_out,vs_constref]) then
               result:=result+'^';
             { Add the parameter type.  }
-            if not addencodedtype(vs.vardef,ris_initial,false,result,founderror) then
+            if not objcaddencodedtype(vs.vardef,ris_initial,false,result,founderror) then
               { should be checked earlier on }
               internalerror(2009081701);
             { And the total size of the parameters coming before this one
@@ -242,7 +242,7 @@ end;
         result:=tostr(totalsize)+result;
         { And the type of the function result (void in case of a procedure).  }
         temp:='';
-        if not addencodedtype(pd.returndef,ris_initial,false,temp,founderror) then
+        if not objcaddencodedtype(pd.returndef,ris_initial,false,temp,founderror) then
           internalerror(2009081801);
         result:=temp+result;
       end;