From 1e3f44965f9dca1afef94d89d50b6b7fbefc59ea Mon Sep 17 00:00:00 2001 From: michael Date: Sun, 29 Jul 2018 09:35:54 +0000 Subject: [PATCH] * Added generic IfThen, as proposed by Thaddy de Koning, bug id #34012 git-svn-id: trunk@39521 - --- rtl/objpas/sysutils/sysutilh.inc | 2 ++ rtl/objpas/sysutils/sysutils.inc | 11 +++++++++++ 2 files changed, 13 insertions(+) diff --git a/rtl/objpas/sysutils/sysutilh.inc b/rtl/objpas/sysutils/sysutilh.inc index 014cfa76f3..2ba781e7e1 100644 --- a/rtl/objpas/sysutils/sysutilh.inc +++ b/rtl/objpas/sysutils/sysutilh.inc @@ -266,6 +266,8 @@ type procedure AddTerminateProc(TermProc: TTerminateProc); function CallTerminateProcs: Boolean; +generic function IfThen(val:boolean;const iftrue:T; const iffalse:T) :T; inline; overload; + Var OnShowException : Procedure (Msg : ShortString); diff --git a/rtl/objpas/sysutils/sysutils.inc b/rtl/objpas/sysutils/sysutils.inc index ae674fc898..fb4bb7f7c4 100644 --- a/rtl/objpas/sysutils/sysutils.inc +++ b/rtl/objpas/sysutils/sysutils.inc @@ -801,3 +801,14 @@ begin result:=ExecuteProcess(ToSingleByteFileSystemEncodedFileName(Path),ComLineA); end; {$endif} + + +// generic ifthen.. + +generic function IfThen(val:boolean;const iftrue:T; const iffalse:T) :T; inline; overload; +begin + if val then + Result := ifTrue + else + Result:=ifFalse; +end;