mirror of https://github.com/stella-emu/stella.git
Merge branch 'master' into elf
This commit is contained in:
commit
bf8648679c
|
@ -169,7 +169,7 @@ namespace BSPF
|
||||||
// if it is outside the specified range
|
// if it is outside the specified range
|
||||||
template<typename T> inline constexpr T clamp(T val, T lower, T upper)
|
template<typename T> inline constexpr T clamp(T val, T lower, T upper)
|
||||||
{
|
{
|
||||||
return (val < lower) ? lower : (val > upper) ? upper : val;
|
return std::clamp<T>(val, lower, upper);
|
||||||
}
|
}
|
||||||
template<typename T> inline constexpr void clamp(T& val, T lower, T upper, T setVal)
|
template<typename T> inline constexpr void clamp(T& val, T lower, T upper, T setVal)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue