diff options
Diffstat (limited to 'Source/Core/InputCommon')
| -rw-r--r-- | Source/Core/InputCommon/ControllerEmu/ControllerEmu.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/Core/InputCommon/ControllerEmu/ControllerEmu.h b/Source/Core/InputCommon/ControllerEmu/ControllerEmu.h index 104240023d..32b755eb30 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControllerEmu.h +++ b/Source/Core/InputCommon/ControllerEmu/ControllerEmu.h @@ -206,9 +206,9 @@ public: static_assert(std::is_integral<T>(), "T is only sane for int types."); static_assert(std::is_floating_point<F>(), "F is only sane for float types."); - static_assert(std::numeric_limits<long>::min() <= std::numeric_limits<T>::min() && - std::numeric_limits<long>::max() >= std::numeric_limits<T>::max(), - "long is not a superset of T. use of std::lround is not sane."); + static_assert(std::numeric_limits<long long>::min() <= std::numeric_limits<T>::min() && + std::numeric_limits<long long>::max() >= std::numeric_limits<T>::max(), + "long long is not a superset of T. use of std::llround is not sane."); // Here we round when converting from float to int. // After applying our deadzone, resizing, and reshaping math @@ -216,9 +216,9 @@ public: // Casting would round down but rounding will yield our "zero_value". if (input_value > 0) - return T(std::lround((pos_1_value - zero_value) * input_value + zero_value)); + return T(std::llround((pos_1_value - zero_value) * input_value + zero_value)); else - return T(std::lround((zero_value - neg_1_value) * input_value + zero_value)); + return T(std::llround((zero_value - neg_1_value) * input_value + zero_value)); } protected: |