ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8615 from jordan-woyak/std-abs 

Cleanup: Use std::abs instead of abs.
This commit is contained in:
Tilka 2020-02-09 00:39:30 +00:00 committed by GitHub
parent 6a857df219 4f47cccd9f
commit 0043a2cf3c
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Common/MathUtil.h
View File

@ -70,8 +70,8 @@ struct Rectangle
return left == r.left && top == r.top && right == r.right && bottom == r.bottom; return left == r.left && top == r.top && right == r.right && bottom == r.bottom;
} }
T GetWidth() const { return abs(right - left); } T GetWidth() const { return std::abs(right - left); }
T GetHeight() const { return abs(bottom - top); } T GetHeight() const { return std::abs(bottom - top); }
// If the rectangle is in a coordinate system with a lower-left origin, use // If the rectangle is in a coordinate system with a lower-left origin, use
// this Clamp. // this Clamp.
void ClampLL(T x1, T y1, T x2, T y2) void ClampLL(T x1, T y1, T x2, T y2)

4
Source/Core/Core/HW/SystemTimers.cpp
View File

@ -191,10 +191,10 @@ void ThrottleCallback(u64 last_time, s64 cyclesLate)
if (config.m_EmulationSpeed != 1.0f) if (config.m_EmulationSpeed != 1.0f)
next_event = u32(next_event * config.m_EmulationSpeed); next_event = u32(next_event * config.m_EmulationSpeed);
const s64 max_fallback = config.iTimingVariance * 1000; const s64 max_fallback = config.iTimingVariance * 1000;
if (abs(diff) > max_fallback) if (std::abs(diff) > max_fallback)
{ {
DEBUG_LOG(COMMON, "system too %s, %" PRIi64 " ms skipped", diff < 0 ? "slow" : "fast", DEBUG_LOG(COMMON, "system too %s, %" PRIi64 " ms skipped", diff < 0 ? "slow" : "fast",
abs(diff) - max_fallback); std::abs(diff) - max_fallback);
last_time = time - max_fallback; last_time = time - max_fallback;
} }
else if (diff > 1000) else if (diff > 1000)

2
Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp
View File

@ -310,6 +310,6 @@ ControlState Joystick::Hat::GetState() const
if (is_centered) if (is_centered)
return 0; return 0;
return (abs((int)(m_hat / 4500 - m_direction * 2 + 8) % 8 - 4) > 2); return (std::abs(int(m_hat / 4500 - m_direction * 2 + 8) % 8 - 4) > 2);
} }
} // namespace ciface::DInput } // namespace ciface::DInput