From 9aae0c47bda639d22d4d1d2f9eb721d279c62762 Mon Sep 17 00:00:00 2001
From: Jonas Maebe <jonas@freepascal.org>
Date: Sat, 20 Aug 2011 08:14:36 +0000
Subject: [PATCH]   * manual merge of svn r17800 (open array overload choosing)

git-svn-id: branches/jvmbackend@18606 -
---
 compiler/defcmp.pas | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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