From 00624ad7a30929fb94e9fb82883f84acfbb01703 Mon Sep 17 00:00:00 2001 From: paul Date: Fri, 8 Jan 2010 18:01:28 +0000 Subject: [PATCH] tests: remove {$STATIC ON} directive since it is not available anymore git-svn-id: trunk@14580 - --- tests/tbs/tb0156.pp | 2 -- tests/test/cg/tcalcla1.pp | 1 - tests/test/cg/tcalext.pp | 1 - tests/test/cg/tcalext2.pp | 1 - tests/test/cg/tcalobj1.pp | 1 - tests/test/cg/tcalobj2.pp | 1 - tests/test/cg/tcalobj3.pp | 1 - tests/test/cg/tcalobj4.pp | 3 +-- tests/test/cg/tcalobj6.pp | 1 - tests/test/cg/tcalobj7.pp | 1 - tests/test/cg/tcalobj8.pp | 1 - tests/test/cg/tcalpext.pp | 1 - tests/test/cg/tcalpvr1.pp | 1 - tests/test/cg/tcalpvr2.pp | 1 - tests/test/cg/tcalpvr3.pp | 3 +-- tests/test/cg/tcalpvr4.pp | 3 +-- tests/test/cg/tcalpvr6.pp | 3 +-- tests/test/cg/tcalpvr7.pp | 3 +-- tests/test/cg/tcalpvr8.pp | 3 +-- tests/test/cg/tobjsiz2.pp | 2 -- tests/webtbf/tw10998a.pp | 2 +- tests/webtbf/tw4529.pp | 2 +- tests/webtbs/tw10998.pp | 2 +- tests/webtbs/tw12242.pp | 2 +- tests/webtbs/tw12242a.pp | 1 - tests/webtbs/tw2259.pp | 1 - tests/webtbs/tw2274.pp | 2 -- tests/webtbs/tw2317.pp | 2 -- tests/webtbs/tw2318.pp | 2 -- tests/webtbs/tw2318b.pp | 2 -- tests/webtbs/tw2332.pp | 2 -- tests/webtbs/tw2480.pp | 1 - tests/webtbs/tw4529.pp | 2 +- tests/webtbs/tw6435.pp | 2 +- tests/webtbs/uw14124.pp | 1 - 35 files changed, 12 insertions(+), 48 deletions(-) diff --git a/tests/tbs/tb0156.pp b/tests/tbs/tb0156.pp index 56dcb96d8c..a326cc14c5 100644 --- a/tests/tbs/tb0156.pp +++ b/tests/tbs/tb0156.pp @@ -3,8 +3,6 @@ { Old file: tbs0187.pp } { constructor in a WIth statement isn't called correct. (works at lest in the case stated) OK 0.99.11 (PM) } -{$static on} - type Tbaseclass = object base_arg : longint; diff --git a/tests/test/cg/tcalcla1.pp b/tests/test/cg/tcalcla1.pp index d50ad23e4b..a92042fdd6 100644 --- a/tests/test/cg/tcalcla1.pp +++ b/tests/test/cg/tcalcla1.pp @@ -21,7 +21,6 @@ { generates the same code for both dynamic and virtual methods } {****************************************************************} program tcalcla1; -{$STATIC ON} {$mode objfpc} {$R+} diff --git a/tests/test/cg/tcalext.pp b/tests/test/cg/tcalext.pp index b89bc2780f..b4f3eaa57e 100644 --- a/tests/test/cg/tcalext.pp +++ b/tests/test/cg/tcalext.pp @@ -19,7 +19,6 @@ {$ifndef USE_PASCAL_OBJECT} {$MODE OBJFPC} -{$STATIC ON} {$R+} uses strings,ctypes; {$L ctest.o} diff --git a/tests/test/cg/tcalext2.pp b/tests/test/cg/tcalext2.pp index ef8ded3d26..8d42219570 100644 --- a/tests/test/cg/tcalext2.pp +++ b/tests/test/cg/tcalext2.pp @@ -21,7 +21,6 @@ {$ifndef USE_PASCAL_OBJECT} {$MODE OBJFPC} -{$STATIC ON} {$R+} uses strings; {$L ctest.o} diff --git a/tests/test/cg/tcalobj1.pp b/tests/test/cg/tcalobj1.pp index 13c69be21d..601fa6e100 100644 --- a/tests/test/cg/tcalobj1.pp +++ b/tests/test/cg/tcalobj1.pp @@ -18,7 +18,6 @@ { } {****************************************************************} program tcalobj1; -{$STATIC ON} {$R+} const diff --git a/tests/test/cg/tcalobj2.pp b/tests/test/cg/tcalobj2.pp index 40c6e9b5fa..62f0c0e258 100644 --- a/tests/test/cg/tcalobj2.pp +++ b/tests/test/cg/tcalobj2.pp @@ -18,7 +18,6 @@ { } {****************************************************************} program tcalobj2; -{$STATIC ON} {$R+} const diff --git a/tests/test/cg/tcalobj3.pp b/tests/test/cg/tcalobj3.pp index b483ef6b07..d7326f2b98 100644 --- a/tests/test/cg/tcalobj3.pp +++ b/tests/test/cg/tcalobj3.pp @@ -18,7 +18,6 @@ { } {****************************************************************} program tcalobj3; -{$STATIC ON} {$R+} const diff --git a/tests/test/cg/tcalobj4.pp b/tests/test/cg/tcalobj4.pp index 52e9f74ebd..034e7766f2 100644 --- a/tests/test/cg/tcalobj4.pp +++ b/tests/test/cg/tcalobj4.pp @@ -15,12 +15,11 @@ { FPC = Target is FreePascal compiler } {****************************************************************} { REMARKS: This tests secondcalln(), genentrycode() and } -{ genexitcode() for standard object with the oldfpccall } +{ genexitcode() for standard object with the oldfpccall } { calling convention. } { } {****************************************************************} program tcalobj4; -{$STATIC ON} {$R+} const diff --git a/tests/test/cg/tcalobj6.pp b/tests/test/cg/tcalobj6.pp index e85efa100e..53513f565b 100644 --- a/tests/test/cg/tcalobj6.pp +++ b/tests/test/cg/tcalobj6.pp @@ -18,7 +18,6 @@ { } {****************************************************************} program tcalobj6; -{$STATIC ON} {$R+} const diff --git a/tests/test/cg/tcalobj7.pp b/tests/test/cg/tcalobj7.pp index 93b7caa0ee..110cde9db0 100644 --- a/tests/test/cg/tcalobj7.pp +++ b/tests/test/cg/tcalobj7.pp @@ -18,7 +18,6 @@ { } {****************************************************************} program tcalobj7; -{$STATIC ON} {$R+} const diff --git a/tests/test/cg/tcalobj8.pp b/tests/test/cg/tcalobj8.pp index c025ef259b..52f3f067db 100644 --- a/tests/test/cg/tcalobj8.pp +++ b/tests/test/cg/tcalobj8.pp @@ -20,7 +20,6 @@ { } {****************************************************************} program tcalobj8; -{$STATIC ON} {$R+} const diff --git a/tests/test/cg/tcalpext.pp b/tests/test/cg/tcalpext.pp index 602f68e868..3503096d7d 100644 --- a/tests/test/cg/tcalpext.pp +++ b/tests/test/cg/tcalpext.pp @@ -19,7 +19,6 @@ {$define USE_PASCAL_OBJECT} {$MODE OBJFPC} -{$STATIC ON} {$R+} { Compile ptest.o } uses diff --git a/tests/test/cg/tcalpvr1.pp b/tests/test/cg/tcalpvr1.pp index 1db105a6ab..d428b247d0 100644 --- a/tests/test/cg/tcalpvr1.pp +++ b/tests/test/cg/tcalpvr1.pp @@ -17,7 +17,6 @@ {****************************************************************} program tcalpvr1; {$MODE OBJFPC} -{$STATIC ON} {$R+} const diff --git a/tests/test/cg/tcalpvr2.pp b/tests/test/cg/tcalpvr2.pp index fdc2b7e5e8..8a7bea1ba1 100644 --- a/tests/test/cg/tcalpvr2.pp +++ b/tests/test/cg/tcalpvr2.pp @@ -17,7 +17,6 @@ {****************************************************************} program tcalpvr2; {$MODE OBJFPC} -{$STATIC ON} {$R+} const diff --git a/tests/test/cg/tcalpvr3.pp b/tests/test/cg/tcalpvr3.pp index 5e40007abc..5cabc0bb8f 100644 --- a/tests/test/cg/tcalpvr3.pp +++ b/tests/test/cg/tcalpvr3.pp @@ -12,12 +12,11 @@ { DEFINES: } {****************************************************************} { REMARKS: This tests a subset of the secondcalln() , it } -{ verifies procedural variables for cdecl } +{ verifies procedural variables for cdecl } { calling conventions. } {****************************************************************} program tcalpvr3; {$MODE OBJFPC} -{$STATIC ON} {$R+} const diff --git a/tests/test/cg/tcalpvr4.pp b/tests/test/cg/tcalpvr4.pp index d105de6968..428f1cfade 100644 --- a/tests/test/cg/tcalpvr4.pp +++ b/tests/test/cg/tcalpvr4.pp @@ -14,12 +14,11 @@ { DEFINES: } {****************************************************************} { REMARKS: This tests a subset of the secondcalln() , it } -{ verifies procedural variables for oldfpccall } +{ verifies procedural variables for oldfpccall } { calling conventions. } {****************************************************************} program tcalpvr3; {$MODE OBJFPC} -{$STATIC ON} {$R+} const diff --git a/tests/test/cg/tcalpvr6.pp b/tests/test/cg/tcalpvr6.pp index 46a90d3664..c7dab1f9f2 100644 --- a/tests/test/cg/tcalpvr6.pp +++ b/tests/test/cg/tcalpvr6.pp @@ -12,12 +12,11 @@ { DEFINES: } {****************************************************************} { REMARKS: This tests a subset of the secondcalln() , it } -{ verifies procedural variables for register } +{ verifies procedural variables for register } { calling conventions. } {****************************************************************} program tcalpvr3; {$MODE OBJFPC} -{$STATIC ON} {$R+} const diff --git a/tests/test/cg/tcalpvr7.pp b/tests/test/cg/tcalpvr7.pp index bdd3a178de..75d27cda1d 100644 --- a/tests/test/cg/tcalpvr7.pp +++ b/tests/test/cg/tcalpvr7.pp @@ -12,12 +12,11 @@ { DEFINES: } {****************************************************************} { REMARKS: This tests a subset of the secondcalln() , it } -{ verifies procedural variables for stdcall } +{ verifies procedural variables for stdcall } { calling conventions. } {****************************************************************} program tcalpvr3; {$MODE OBJFPC} -{$STATIC ON} {$R+} const diff --git a/tests/test/cg/tcalpvr8.pp b/tests/test/cg/tcalpvr8.pp index 0639638c9c..702e709e43 100644 --- a/tests/test/cg/tcalpvr8.pp +++ b/tests/test/cg/tcalpvr8.pp @@ -14,12 +14,11 @@ { DEFINES: } {****************************************************************} { REMARKS: This tests a subset of the secondcalln() , it } -{ verifies procedural variables for saveregisters } +{ verifies procedural variables for saveregisters } { calling conventions. } {****************************************************************} program tcalpvr3; {$MODE OBJFPC} -{$STATIC ON} {$R+} const diff --git a/tests/test/cg/tobjsiz2.pp b/tests/test/cg/tobjsiz2.pp index 2a6876d212..817aaf8cb5 100644 --- a/tests/test/cg/tobjsiz2.pp +++ b/tests/test/cg/tobjsiz2.pp @@ -3,8 +3,6 @@ { here sizeof directly returns a constant value } -{$static on} - type pbaseclass = ^tbaseclass; pderivedclass = ^tderivedclass; diff --git a/tests/webtbf/tw10998a.pp b/tests/webtbf/tw10998a.pp index 6f896619f6..49d2d715cb 100644 --- a/tests/webtbf/tw10998a.pp +++ b/tests/webtbf/tw10998a.pp @@ -2,7 +2,7 @@ program statictest; -{$mode delphi}{$STATIC ON} +{$mode delphi} type TMyClass = class diff --git a/tests/webtbf/tw4529.pp b/tests/webtbf/tw4529.pp index 9b1f6bcf0e..eee1c6cea1 100644 --- a/tests/webtbf/tw4529.pp +++ b/tests/webtbf/tw4529.pp @@ -4,7 +4,7 @@ { e-mail: vsnijders@quicknet.nl } program Project1; -{$mode objfpc}{$H+}{$static on} +{$mode objfpc}{$H+} uses Classes diff --git a/tests/webtbs/tw10998.pp b/tests/webtbs/tw10998.pp index 244a65ac79..d991f4407f 100644 --- a/tests/webtbs/tw10998.pp +++ b/tests/webtbs/tw10998.pp @@ -1,6 +1,6 @@ program statictest; -{$mode delphi}{$STATIC ON} +{$mode delphi} type TMyClass = class diff --git a/tests/webtbs/tw12242.pp b/tests/webtbs/tw12242.pp index e2c207084b..35ece66e79 100644 --- a/tests/webtbs/tw12242.pp +++ b/tests/webtbs/tw12242.pp @@ -7,7 +7,7 @@ } program staticbug; -{$mode delphi}{$STATIC ON} +{$mode delphi} uses Classes, SysUtils; diff --git a/tests/webtbs/tw12242a.pp b/tests/webtbs/tw12242a.pp index c3736729aa..a2f4a8b59d 100644 --- a/tests/webtbs/tw12242a.pp +++ b/tests/webtbs/tw12242a.pp @@ -1,5 +1,4 @@ {$mode objfpc} -{$static on} type tc = class diff --git a/tests/webtbs/tw2259.pp b/tests/webtbs/tw2259.pp index 0cd444f7b8..96636fb531 100644 --- a/tests/webtbs/tw2259.pp +++ b/tests/webtbs/tw2259.pp @@ -1,7 +1,6 @@ { Source provided for Free Pascal Bug Report 2259 } { Submitted by "Sergey Kosarevsky" on 2002-12-14 } { e-mail: netsurfer@au.ru } -{$STATIC ON} Type tObject=Object ClassFlags:Longint;Static; diff --git a/tests/webtbs/tw2274.pp b/tests/webtbs/tw2274.pp index c365ee8035..3929aa4469 100644 --- a/tests/webtbs/tw2274.pp +++ b/tests/webtbs/tw2274.pp @@ -3,8 +3,6 @@ { e-mail: netsurfer@au.ru } Unit tw2274; -{$STATIC ON} - Interface Type Lfloat=Single; diff --git a/tests/webtbs/tw2317.pp b/tests/webtbs/tw2317.pp index cf020c3b66..80ed3f81da 100644 --- a/tests/webtbs/tw2317.pp +++ b/tests/webtbs/tw2317.pp @@ -2,8 +2,6 @@ { Submitted by "Sergey Kosarevsky" on 2003-01-09 } { e-mail: netsurfer@au.ru } -{$static on} - Type tObject=Object Function GetVMT:Pointer;Static; End; diff --git a/tests/webtbs/tw2318.pp b/tests/webtbs/tw2318.pp index 9e9ae8ecf8..2708189141 100644 --- a/tests/webtbs/tw2318.pp +++ b/tests/webtbs/tw2318.pp @@ -2,8 +2,6 @@ { Submitted by "Sergey Kosarevsky" on 2003-01-09 } { e-mail: netsurfer@au.ru } -{$static on} - Type tObject=Object Constructor Init; Function GetVMT:Pointer;Static; diff --git a/tests/webtbs/tw2318b.pp b/tests/webtbs/tw2318b.pp index b6c10509f2..31da0a4cd9 100644 --- a/tests/webtbs/tw2318b.pp +++ b/tests/webtbs/tw2318b.pp @@ -4,8 +4,6 @@ { Submitted by "Sergey Kosarevsky" on 2003-01-09 } { e-mail: netsurfer@au.ru } -{$static on} - {$R+} Type tObject=Object diff --git a/tests/webtbs/tw2332.pp b/tests/webtbs/tw2332.pp index baa10a8c26..65a9721e7c 100644 --- a/tests/webtbs/tw2332.pp +++ b/tests/webtbs/tw2332.pp @@ -2,8 +2,6 @@ { Submitted by "Sergey Kosarevsky" on 2003-01-21 } { e-mail: netsurfer@au.ru } -{$static on } - Type tObject=Object Constructor Init; Function GetVMT:Pointer;Static; diff --git a/tests/webtbs/tw2480.pp b/tests/webtbs/tw2480.pp index 9718a722c3..d2dde58a0e 100644 --- a/tests/webtbs/tw2480.pp +++ b/tests/webtbs/tw2480.pp @@ -2,7 +2,6 @@ { Submitted by "Sergey Kosarevsky" on 2003-05-01 } { e-mail: netsurfer@au.ru } {$mode objfpc} -{$static on} Type tSingleton=Class Private diff --git a/tests/webtbs/tw4529.pp b/tests/webtbs/tw4529.pp index 6540f58b1a..04ea0575c5 100644 --- a/tests/webtbs/tw4529.pp +++ b/tests/webtbs/tw4529.pp @@ -3,7 +3,7 @@ { e-mail: vsnijders@quicknet.nl } program Project1; -{$mode objfpc}{$H+}{$static on} +{$mode objfpc}{$H+} uses Classes diff --git a/tests/webtbs/tw6435.pp b/tests/webtbs/tw6435.pp index 05f3e7b386..6f8fb7a55d 100644 --- a/tests/webtbs/tw6435.pp +++ b/tests/webtbs/tw6435.pp @@ -1,7 +1,7 @@ { %OPT=-gl } program Project1; -{$mode objfpc}{$H+}{$static on} +{$mode objfpc}{$H+} type MyClass = class(TObject) diff --git a/tests/webtbs/uw14124.pp b/tests/webtbs/uw14124.pp index 88f7dd19b2..d8b6e04e7b 100644 --- a/tests/webtbs/uw14124.pp +++ b/tests/webtbs/uw14124.pp @@ -1,7 +1,6 @@ unit uw14124; {$mode objfpc}{$H+} -{$static on} interface