Explorar el Código

* fixed typecast error in last char/widechar/widestring patch

git-svn-id: trunk@8358 -
Jonas Maebe hace 18 años
padre
commit
30e618ccb6
Se han modificado 1 ficheros con 2 adiciones y 1 borrados
  1. 2 1
      compiler/ncnv.pas

+ 2 - 1
compiler/ncnv.pas

@@ -893,7 +893,8 @@ implementation
       begin
       begin
          result:=nil;
          result:=nil;
          if (left.nodetype=stringconstn) and
          if (left.nodetype=stringconstn) and
-            ((tstringdef(left.resultdef).stringtype<>st_widestring) or
+            ((not is_widechararray(left.resultdef) and
+              not is_widestring(left.resultdef)) or
              (tstringdef(resultdef).stringtype=st_widestring) or
              (tstringdef(resultdef).stringtype=st_widestring) or
              { non-ascii chars would be replaced with '?' -> loses info }
              { non-ascii chars would be replaced with '?' -> loses info }
              not hasnonasciichars(pcompilerwidestring(tstringconstnode(left).value_str))) then
              not hasnonasciichars(pcompilerwidestring(tstringconstnode(left).value_str))) then