Ver código fonte

* declared CharInSet(ansichar,tsyscharset) as inline
* moved the inclusion of sysansi.inc to before the inclusion of all other
sysutils include files so the inline body of CharInSet is available

git-svn-id: branches/cpstrrtl@25000 -

Jonas Maebe 12 anos atrás
pai
commit
1da05d1553

+ 1 - 1
rtl/objpas/sysutils/sysansi.inc

@@ -100,7 +100,7 @@ begin
   Result[0]:=Byte(Val);
 end;
 
-Function CharInSet(Ch:AnsiChar;Const CSet : TSysCharSet) : Boolean;
+Function CharInSet(Ch:AnsiChar;Const CSet : TSysCharSet) : Boolean; inline;
 begin
   result:=ch in CSet;
 end;

+ 1 - 1
rtl/objpas/sysutils/sysansih.inc

@@ -24,4 +24,4 @@ function HashName(Name: PAnsiChar): LongWord;
 function BytesOf(const Val: RawByteString): TBytes;
 function BytesOf(const Val: AnsiChar): TBytes;
 
-Function CharInSet(Ch: AnsiChar;Const CSet : TSysCharSet) : Boolean;
+Function CharInSet(Ch: AnsiChar;Const CSet : TSysCharSet) : Boolean; inline;

+ 4 - 4
rtl/objpas/sysutils/sysutils.inc

@@ -12,6 +12,10 @@
 
  **********************************************************************}
 
+  { MCBS functions }
+  {$i sysansi.inc}
+  {$i syscodepages.inc}
+
 {$macro on}
 {$define PathStr:=UnicodeString}
 {$define PathPChar:=PWideChar}
@@ -161,10 +165,6 @@ end;
   { generic internationalisation code }
   {$i sysint.inc}
 
-  { MCBS functions }
-  {$i sysansi.inc}
-  {$i syscodepages.inc}
-
   { wide string functions }
   {$i syswide.inc}