From 1be92bc750896665c33cf038819653c26f3975bd Mon Sep 17 00:00:00 2001 From: paul Date: Sat, 27 Mar 2010 13:40:36 +0000 Subject: [PATCH] compiler: allow inline static methods + test (moreover static inline was supported) git-svn-id: trunk@15076 - --- compiler/pdecsub.pas | 2 +- tests/test/tstatic1.pp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/pdecsub.pas b/compiler/pdecsub.pas index 3589ff0555..34341a452f 100644 --- a/compiler/pdecsub.pas +++ b/compiler/pdecsub.pas @@ -2115,7 +2115,7 @@ const pooption : [po_staticmethod]; mutexclpocall : [pocall_internproc]; mutexclpotype : [potype_constructor,potype_destructor]; - mutexclpo : [po_external,po_interrupt,po_exports,po_inline] + mutexclpo : [po_external,po_interrupt,po_exports] ),( idtok:_STDCALL; pd_flags : [pd_interface,pd_implemen,pd_body,pd_procvar]; diff --git a/tests/test/tstatic1.pp b/tests/test/tstatic1.pp index 1ceba408b3..283642a722 100644 --- a/tests/test/tstatic1.pp +++ b/tests/test/tstatic1.pp @@ -11,7 +11,7 @@ type FSomethingStatic: Integer; public class procedure SomeClassMethod(A: Integer); - class procedure SomeStaticMethod(A: Integer); static; + class procedure SomeStaticMethod(A: Integer); inline; static; end; { TSomeClass }