Inline methods inside classes unit protected by {$ifdef classesinline}

git-svn-id: trunk@10945 -

rtl/objpas/classes/classes.inc

@@ -663,7 +663,7 @@ end;
 
 Function FindNestedComponent(Root : TComponent; APath : String; CStyle : Boolean = True) : TComponent;
 
-  Function GetNextName : String; inline;
+  Function GetNextName : String; {$ifdef CLASSESINLINE} inline; {$endif CLASSESINLINE}
   
   Var
     P : Integer;

rtl/objpas/classes/classesh.inc

@@ -1316,13 +1316,13 @@ type
     fLastTokenWStr : widestring;
     function GetTokenName(aTok : char) : string;
     procedure LoadBuffer;
-    procedure CheckLoadBuffer; inline;
-    procedure ProcessChar; inline;
-    function IsNumber : boolean; inline;
-    function IsHexNum : boolean; inline;
-    function IsAlpha : boolean; inline;
-    function IsAlphaNum : boolean; inline;
-    function GetHexValue(c : char) : byte; inline;
+    procedure CheckLoadBuffer; {$ifdef CLASSESINLINE} inline; {$endif CLASSESINLINE}
+    procedure ProcessChar; {$ifdef CLASSESINLINE} inline; {$endif CLASSESINLINE}
+    function IsNumber : boolean; {$ifdef CLASSESINLINE} inline; {$endif CLASSESINLINE}
+    function IsHexNum : boolean; {$ifdef CLASSESINLINE} inline; {$endif CLASSESINLINE}
+    function IsAlpha : boolean; {$ifdef CLASSESINLINE} inline; {$endif CLASSESINLINE}
+    function IsAlphaNum : boolean; {$ifdef CLASSESINLINE} inline; {$endif CLASSESINLINE}
+    function GetHexValue(c : char) : byte; {$ifdef CLASSESINLINE} inline; {$endif CLASSESINLINE}
     function GetAlphaNum : string;
     procedure HandleNewLine;
     procedure SkipSpaces;

rtl/objpas/classes/parser.inc

@@ -53,39 +53,39 @@ begin
   fBufLen:=toread;
 end;
 
-procedure TParser.CheckLoadBuffer; inline;
+procedure TParser.CheckLoadBuffer; {$ifdef CLASSESINLINE} inline; {$endif CLASSESINLINE}
 begin
   if fBuf[fPos]=#0 then LoadBuffer;
 end;
 
-procedure TParser.ProcessChar; inline;
+procedure TParser.ProcessChar; {$ifdef CLASSESINLINE} inline; {$endif CLASSESINLINE}
 begin
   fLastTokenStr:=fLastTokenStr+fBuf[fPos];
   inc(fPos);
   CheckLoadBuffer;
 end;
 
-function TParser.IsNumber: boolean; inline;
+function TParser.IsNumber: boolean; {$ifdef CLASSESINLINE} inline; {$endif CLASSESINLINE}
 begin
   Result:=fBuf[fPos] in ['0'..'9'];
 end;
 
-function TParser.IsHexNum: boolean; inline;
+function TParser.IsHexNum: boolean; {$ifdef CLASSESINLINE} inline; {$endif CLASSESINLINE}
 begin
   Result:=fBuf[fPos] in ['0'..'9','A'..'F','a'..'f'];
 end;
 
-function TParser.IsAlpha: boolean; inline;
+function TParser.IsAlpha: boolean; {$ifdef CLASSESINLINE} inline; {$endif CLASSESINLINE}
 begin
   Result:=fBuf[fPos] in ['_','A'..'Z','a'..'z'];
 end;
 
-function TParser.IsAlphaNum: boolean; inline;
+function TParser.IsAlphaNum: boolean; {$ifdef CLASSESINLINE} inline; {$endif CLASSESINLINE}
 begin
   Result:=IsAlpha or IsNumber;
 end;
 
-function TParser.GetHexValue(c: char): byte; inline;
+function TParser.GetHexValue(c: char): byte; {$ifdef CLASSESINLINE} inline; {$endif CLASSESINLINE}
 begin
   case c of
     '0'..'9' : Result:=ord(c)-$30;

rtl/objpas/classes/resref.inc

@@ -12,8 +12,8 @@ type
     FGlobal,               // Global component.
     FRelative : string;    // Path relative to global component.
     Function Resolve(Instance : TPersistent) : Boolean; // Resolve this reference
-    Function RootMatches(ARoot : TComponent) : Boolean; Inline; // True if Froot matches or ARoot is nil.
-    Function NextRef : TUnresolvedReference; inline;
+    Function RootMatches(ARoot : TComponent) : Boolean; {$ifdef CLASSESINLINE} inline; {$endif CLASSESINLINE} // True if Froot matches or ARoot is nil.
+    Function NextRef : TUnresolvedReference; {$ifdef CLASSESINLINE} inline; {$endif CLASSESINLINE}
   end;
   
   TLocalUnResolvedReference = class(TUnresolvedReference)
@@ -29,7 +29,7 @@ type
     FUnresolved : TLinkedList; // The list
     Destructor Destroy; override;
     Function AddReference(ARoot : TComponent; APropInfo : PPropInfo; AGlobal,ARelative : String) : TUnresolvedReference;
-    Function RootUnresolved : TUnresolvedReference; inline; // Return root element in list.
+    Function RootUnresolved : TUnresolvedReference; {$ifdef CLASSESINLINE} inline; {$endif CLASSESINLINE} // Return root element in list.
     Function ResolveReferences : Boolean; // Return true if all unresolveds were resolved.
   end;
 
@@ -226,7 +226,7 @@ begin
     end;
 end; 
 
-Function TUnresolvedReference.RootMatches(ARoot : TComponent) : Boolean; Inline;
+Function TUnresolvedReference.RootMatches(ARoot : TComponent) : Boolean; {$ifdef CLASSESINLINE} inline; {$endif CLASSESINLINE}
 
 begin
   Result:=(ARoot=Nil) or (ARoot=FRoot);