diff options
| author | bunnei <bunneidev@gmail.com> | 2018-04-20 14:18:03 -0400 | 
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-20 14:18:03 -0400 | 
| commit | 326b044c19df0b1a342acf87f2ba7cd06e9a1e97 (patch) | |
| tree | d815c707b437b3685e8ba188bbf0940d4205de2a /src/core | |
| parent | 87f89ac82dae33f7ce4cd6a3b5e492510e8cf961 (diff) | |
| parent | fae2dd034462c5a6b086e46b3437ea6e2456d5eb (diff) | |
Merge pull request #367 from lioncash/clamp
math_util: Remove the Clamp() function
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/perf_stats.cpp | 3 | 
1 files changed, 2 insertions, 1 deletions
| diff --git a/src/core/perf_stats.cpp b/src/core/perf_stats.cpp index ad3b56fcc..5f53b16d3 100644 --- a/src/core/perf_stats.cpp +++ b/src/core/perf_stats.cpp @@ -2,6 +2,7 @@  // Licensed under GPLv2 or any later version  // Refer to the license.txt file included. +#include <algorithm>  #include <chrono>  #include <mutex>  #include <thread> @@ -87,7 +88,7 @@ void FrameLimiter::DoFrameLimiting(u64 current_system_time_us) {      frame_limiting_delta_err += microseconds(current_system_time_us - previous_system_time_us);      frame_limiting_delta_err -= duration_cast<microseconds>(now - previous_walltime);      frame_limiting_delta_err = -        MathUtil::Clamp(frame_limiting_delta_err, -MAX_LAG_TIME_US, MAX_LAG_TIME_US); +        std::clamp(frame_limiting_delta_err, -MAX_LAG_TIME_US, MAX_LAG_TIME_US);      if (frame_limiting_delta_err > microseconds::zero()) {          std::this_thread::sleep_for(frame_limiting_delta_err); | 
