From da8c55b0190af0669167c91bd6177b87507749de Mon Sep 17 00:00:00 2001 From: peter Date: Tue, 30 Aug 2005 05:42:11 +0000 Subject: [PATCH] * overload choosing for array of char to widestring fixed git-svn-id: trunk@979 - --- compiler/defcmp.pas | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/compiler/defcmp.pas b/compiler/defcmp.pas index d414931f79..14558b01cc 100644 --- a/compiler/defcmp.pas +++ b/compiler/defcmp.pas @@ -344,7 +344,7 @@ implementation if is_ansistring(def_to) then eq:=te_convert_l1 else if is_widestring(def_to) then - eq:=te_convert_l2 + eq:=te_convert_l3 else eq:=te_convert_l2; end @@ -364,6 +364,8 @@ implementation else eq:=te_convert_l2; end + else if is_widestring(def_to) then + eq:=te_convert_l3 else eq:=te_convert_l2; end; @@ -378,7 +380,9 @@ implementation else { size of widechar array is double due the sizeof a widechar } if not(is_shortstring(def_to) and (def_from.size>255*sizeof(widechar))) then - eq:=te_convert_l3; + eq:=te_convert_l3 + else + eq:=te_convert_l2; end; end; pointerdef :