소스 검색

* fixed merging of identical ansi/widestrings

git-svn-id: trunk@4552 -
Jonas Maebe 19 년 전
부모
커밋
af538ebde8
1개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  1. 2 2
      compiler/ncgcon.pas

+ 2 - 2
compiler/ncgcon.pas

@@ -338,11 +338,11 @@ implementation
                                        if assigned(hp2) and
                                           (hp2.typ=ait_const) and
                                           (tai_const(hp2).consttype=aitconst_aint) and
-                                          (tai_const(hp2).value=-1) and
+                                          (tai_const(hp2).value=len) and
                                           assigned(hp2.previous) and
                                           (tai(hp2.previous).typ=ait_const) and
                                           (tai_const(hp2.previous).consttype=aitconst_aint) and
-                                          (tai_const(hp2.previous).value=len) and
+                                          (tai_const(hp2.previous).value=-1) and
                                           assigned(hp2.previous.previous) and
                                           (tai(hp2.previous.previous).typ=ait_const) and
                                           (tai_const(hp2.previous.previous).consttype=aitconst_ptr) and