X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fshared%2Futils.pas;h=09c03548a45b04a5bc8809e820fa9ec8b7aebcd2;hb=cb334f20fbb9203b8810b695ab7bd08f0bc1f9b2;hp=a4bfdfca4d17d75b93f30ce76db163744203f8bb;hpb=f4fc3b435118e5d9e4085da37014436d2e063259;p=d2df-sdl.git diff --git a/src/shared/utils.pas b/src/shared/utils.pas index a4bfdfc..09c0354 100644 --- a/src/shared/utils.pas +++ b/src/shared/utils.pas @@ -165,7 +165,7 @@ function nmin (a, b: Int64): Int64; inline; overload; function nmin (a, b: UInt64): UInt64; inline; overload; function nmin (a, b: Single): Single; inline; overload; function nmin (a, b: Double): Double; inline; overload; -{$IF DEFINED(CPU386) OR DEFINED(CPUAMD)} +{$IF DEFINED(CPU386) OR DEFINED(CPUAMD64)} function nmin (a, b: Extended): Extended; inline; overload; {$ENDIF} @@ -179,7 +179,7 @@ function nmax (a, b: Int64): Int64; inline; overload; function nmax (a, b: UInt64): UInt64; inline; overload; function nmax (a, b: Single): Single; inline; overload; function nmax (a, b: Double): Double; inline; overload; -{$IF DEFINED(CPU386) OR DEFINED(CPUAMD)} +{$IF DEFINED(CPU386) OR DEFINED(CPUAMD64)} function nmax (a, b: Extended): Extended; inline; overload; {$ENDIF} function nclamp (v, a, b: Byte): Byte; inline; overload; @@ -192,7 +192,7 @@ function nclamp (v, a, b: Int64): Int64; inline; overload; function nclamp (v, a, b: UInt64): UInt64; inline; overload; function nclamp (v, a, b: Single): Single; inline; overload; function nclamp (v, a, b: Double): Double; inline; overload; -{$IF DEFINED(CPU386) OR DEFINED(CPUAMD)} +{$IF DEFINED(CPU386) OR DEFINED(CPUAMD64)} function nclamp (v, a, b: Extended): Extended; inline; overload; {$ENDIF} @@ -1356,7 +1356,7 @@ function nmin (a, b: Int64): Int64; inline; overload; begin if (a < b) then resu function nmin (a, b: UInt64): UInt64; inline; overload; begin if (a < b) then result := a else result := b; end; function nmin (a, b: Single): Single; inline; overload; begin if (a < b) then result := a else result := b; end; function nmin (a, b: Double): Double; inline; overload; begin if (a < b) then result := a else result := b; end; -{$IF DEFINED(CPU386) OR DEFINED(CPUAMD)} +{$IF DEFINED(CPU386) OR DEFINED(CPUAMD64)} function nmin (a, b: Extended): Extended; inline; overload; begin if (a < b) then result := a else result := b; end; {$ENDIF} @@ -1370,7 +1370,7 @@ function nmax (a, b: Int64): Int64; inline; overload; begin if (a > b) then resu function nmax (a, b: UInt64): UInt64; inline; overload; begin if (a > b) then result := a else result := b; end; function nmax (a, b: Single): Single; inline; overload; begin if (a > b) then result := a else result := b; end; function nmax (a, b: Double): Double; inline; overload; begin if (a > b) then result := a else result := b; end; -{$IF DEFINED(CPU386) OR DEFINED(CPUAMD)} +{$IF DEFINED(CPU386) OR DEFINED(CPUAMD64)} function nmax (a, b: Extended): Extended; inline; overload; begin if (a > b) then result := a else result := b; end; {$ENDIF} @@ -1384,7 +1384,7 @@ function nclamp (v, a, b: Int64): Int64; inline; overload; begin if (v < a) then function nclamp (v, a, b: UInt64): UInt64; inline; overload; begin if (v < a) then result := a else if (v > b) then result := b else result := v; end; function nclamp (v, a, b: Single): Single; inline; overload; begin if (v < a) then result := a else if (v > b) then result := b else result := v; end; function nclamp (v, a, b: Double): Double; inline; overload; begin if (v < a) then result := a else if (v > b) then result := b else result := v; end; -{$IF DEFINED(CPU386) OR DEFINED(CPUAMD)} +{$IF DEFINED(CPU386) OR DEFINED(CPUAMD64)} function nclamp (v, a, b: Extended): Extended; inline; overload; begin if (v < a) then result := a else if (v > b) then result := b else result := v; end; {$ENDIF}