Pārlūkot izejas kodu

* Fix bug #39521. Generic functions only in trunk

git-svn-id: trunk@39525 -
michael 7 gadi atpakaļ
vecāks
revīzija
ab84f09591

+ 2 - 1
rtl/objpas/sysutils/sysutilh.inc

@@ -266,8 +266,9 @@ type
   procedure AddTerminateProc(TermProc: TTerminateProc);
   function CallTerminateProcs: Boolean;
 
+{$IFNDEF VER3_0}
 generic function IfThen<T>(val:boolean;const iftrue:T; const iffalse:T) :T; inline; overload;
-
+{$ENDIF}
 
 Var
    OnShowException : Procedure (Msg : ShortString);

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

@@ -804,7 +804,7 @@ end;
 
 
 // generic ifthen..
-
+{$IFNDEF VER3_0}
 generic function IfThen<T>(val:boolean;const iftrue:T; const iffalse:T) :T; inline; overload;
 begin
   if val then 
@@ -812,3 +812,4 @@ begin
   else
     Result:=ifFalse;  
 end;
+{$ENDIF}