Просмотр исходного кода

* declare math.pinteger as an alias of objpas.pinteger to avoid type
masking errors (mantis #10540)

git-svn-id: trunk@9617 -

Jonas Maebe 17 лет назад
Родитель
Сommit
edffeac316
3 измененных файлов с 27 добавлено и 1 удалено
  1. 1 0
      .gitattributes
  2. 1 1
      rtl/objpas/math.pp
  3. 25 0
      tests/webtbs/tw10540.pp

+ 1 - 0
.gitattributes

@@ -7804,6 +7804,7 @@ tests/webtbs/tw1044.pp svneol=native#text/plain
 tests/webtbs/tw10454.pp svneol=native#text/plain
 tests/webtbs/tw1046.pp svneol=native#text/plain
 tests/webtbs/tw1050.pp svneol=native#text/plain
+tests/webtbs/tw10540.pp svneol=native#text/plain
 tests/webtbs/tw1061.pp svneol=native#text/plain
 tests/webtbs/tw1066a.pp svneol=native#text/plain
 tests/webtbs/tw1066b.pp svneol=native#text/plain

+ 1 - 1
rtl/objpas/math.pp

@@ -96,7 +96,7 @@ interface
 
     type
        PFloat = ^Float;
-       PInteger = ^Integer;
+       PInteger = ObjPas.PInteger;
 
        tpaymenttime = (ptendofperiod,ptstartofperiod);
 

+ 25 - 0
tests/webtbs/tw10540.pp

@@ -0,0 +1,25 @@
+{ %norun }
+
+unit tw10540;
+{$mode objfpc}{$H+}
+
+interface
+
+function s(l: PChar; r: PPChar; rn: PInteger; var np: Integer; ll: Integer):Integer;
+
+function x(M: PChar; N1, N2, L: PInteger; len: Integer): Integer;
+
+implementation
+
+uses Math;
+
+function s(l: PChar; r: PPChar; rn: PInteger; var np: Integer; ll: Integer):Integer;
+begin
+end;
+
+function x(M: PChar; N1, N2, L: PInteger; len: Integer): Integer;
+begin
+end;
+
+end.
+