mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-04-17 11:29:27 +02:00
LCL: add all needed variants of CompareValue to prevent overloading problems (bug #8448)
git-svn-id: trunk@10868 -
This commit is contained in:
parent
f2b307fcaa
commit
e1b7c150ae
@ -26,6 +26,9 @@ unit FPCAdds;
|
||||
{$IFDEF VER2_3}
|
||||
{$DEFINE FPC_HAS_QWORDCOMPAREVALUE}
|
||||
{$ENDIF}
|
||||
{$IFNDEF VER2_0}
|
||||
{$DEFINE FPC_HAS_COMPAREVALUE}
|
||||
{$ENDIF}
|
||||
|
||||
interface
|
||||
|
||||
@ -41,6 +44,10 @@ type
|
||||
|
||||
{$IFNDEF FPC_HAS_QWORDCOMPAREVALUE}
|
||||
function CompareValue ( const A, B : QWord) : TValueRelationship; inline;
|
||||
// other CompareValue functions have to be declare too, otherwise fpc
|
||||
// doesn't find them: http://www.freepascal.org/mantis/view.php?id=8620
|
||||
function CompareValue ( const A, B : Integer) : TValueRelationship; inline;
|
||||
function CompareValue ( const A, B : Int64) : TValueRelationship; inline;
|
||||
{$ENDIF}
|
||||
function StrToWord(const s: string): word;
|
||||
|
||||
@ -59,7 +66,7 @@ begin
|
||||
end;
|
||||
|
||||
{$IFNDEF FPC_HAS_QWORDCOMPAREVALUE}
|
||||
function CompareValue ( const A, B : QWord) : TValueRelationship;
|
||||
function CompareValue (const A, B : QWord) : TValueRelationship;
|
||||
begin
|
||||
result:=GreaterThanValue;
|
||||
if a=b then
|
||||
@ -68,6 +75,34 @@ begin
|
||||
if a<b then
|
||||
result:=LessThanValue;
|
||||
end;
|
||||
|
||||
function CompareValue(const A, B: Integer): TValueRelationship; inline;
|
||||
begin
|
||||
{$IFDEF FPC_HAS_COMPAREVALUE}
|
||||
Result := Math.CompareValue(A, B);
|
||||
{$ELSE}
|
||||
result:=GreaterThanValue;
|
||||
if a=b then
|
||||
result:=EqualsValue
|
||||
else
|
||||
if a<b then
|
||||
result:=LessThanValue;
|
||||
{$ENDIF}
|
||||
end;
|
||||
|
||||
function CompareValue(const A, B: Int64): TValueRelationship; inline;
|
||||
begin
|
||||
{$IFDEF FPC_HAS_COMPAREVALUE}
|
||||
Result := Math.CompareValue(A, B);
|
||||
{$ELSE}
|
||||
result:=GreaterThanValue;
|
||||
if a=b then
|
||||
result:=EqualsValue
|
||||
else
|
||||
if a<b then
|
||||
result:=LessThanValue;
|
||||
{$ENDIF}
|
||||
end;
|
||||
{$ENDIF}
|
||||
|
||||
end.
|
||||
|
Loading…
Reference in New Issue
Block a user