浏览代码

+ handle also widestring constants in constant string expressions

git-svn-id: trunk@10927 -
florian 17 年之前
父节点
当前提交
ae836f878f
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      compiler/ptconst.pas

+ 1 - 1
compiler/ptconst.pas

@@ -640,7 +640,7 @@ implementation
         begin
         begin
           n:=comp_expr(true);
           n:=comp_expr(true);
           { load strval and strlength of the constant tree }
           { load strval and strlength of the constant tree }
-          if (n.nodetype=stringconstn) or is_widestring(def) then
+          if (n.nodetype=stringconstn) or is_widestring(def) or is_constwidecharnode(n) then
             begin
             begin
               { convert to the expected string type so that
               { convert to the expected string type so that
                 for widestrings strval is a pcompilerwidestring }
                 for widestrings strval is a pcompilerwidestring }