Selaa lähdekoodia

* require overload for cross object overloading

peter 24 vuotta sitten
vanhempi
commit
f20cbc5edf
2 muutettua tiedostoa jossa 10 lisäystä ja 9 poistoa
  1. 5 6
      compiler/ncal.pas
  2. 5 3
      compiler/nobj.pas

+ 5 - 6
compiler/ncal.pas

@@ -864,11 +864,7 @@ implementation
                    { when the definition has overload directive set, we search for
                       overloaded definitions }
                    if (not symtableprocentry.overloadchecked) and
-                      (
-                       (m_fpc in aktmodeswitches) or
-                       ((po_overload in symtableprocentry.defs^.def.procoptions) and
-                        (m_delphi in aktmodeswitches))
-                      ) then
+                      (po_overload in symtableprocentry.defs^.def.procoptions) then
                     begin
                       { for methods search in the class tree }
                       if (symtableprocentry.owner.symtabletype=objectsymtable) then
@@ -1767,7 +1763,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.57  2001-11-18 20:18:54  peter
+  Revision 1.58  2001-11-20 18:49:43  peter
+    * require overload for cross object overloading
+
+  Revision 1.57  2001/11/18 20:18:54  peter
     * use cp_value_equal_const instead of cp_all
 
   Revision 1.56  2001/11/18 18:43:13  peter

+ 5 - 3
compiler/nobj.pas

@@ -579,8 +579,7 @@ implementation
                        pd:=hp^.def;
                        if pd.procsym=sym then
                         begin
-                          pdoverload:=(po_overload in pd.procoptions) or
-                                      (m_fpc in aktmodeswitches);
+                          pdoverload:=(po_overload in pd.procoptions);
 
                           { compare with all stored definitions }
                           procdefcoll:=symcoll^.data;
@@ -1276,7 +1275,10 @@ initialization
 end.
 {
   $Log$
-  Revision 1.10  2001-11-18 20:18:54  peter
+  Revision 1.11  2001-11-20 18:49:43  peter
+    * require overload for cross object overloading
+
+  Revision 1.10  2001/11/18 20:18:54  peter
     * use cp_value_equal_const instead of cp_all
 
   Revision 1.9  2001/11/18 18:43:14  peter