Browse Source

* manual merge of svn r17800 (open array overload choosing)

git-svn-id: branches/jvmbackend@18606 -
Jonas Maebe 14 years ago
parent
commit
9aae0c47bd
1 changed files with 3 additions and 1 deletions
  1. 3 1
      compiler/defcmp.pas

+ 3 - 1
compiler/defcmp.pas

@@ -1285,7 +1285,9 @@ implementation
                   (tobjectdef(def_from).is_related(tobjectdef(def_to))) then
                   (tobjectdef(def_from).is_related(tobjectdef(def_to))) then
                 begin
                 begin
                   doconv:=tc_equal;
                   doconv:=tc_equal;
-                  eq:=te_convert_l1;
+                  { also update in htypechk.pas/var_para_allowed if changed
+                    here }
+                  eq:=te_convert_l3;
                 end
                 end
                { java.lang.string -> unicodestring }
                { java.lang.string -> unicodestring }
                else if (def_to=java_jlstring) and
                else if (def_to=java_jlstring) and