diff options
| author |  bunnei | 2020-12-02 23:08:43 -0800 |
|---|---|---|
| committer |  GitHub | 2020-12-02 23:08:43 -0800 |
| commit | 88089c87546b62536a27738f5ee03dff52fa76e9 (patch) | |
| tree | 5221c80d0ac3e7bbdb0c342098378e6c84951658 /src/common/wall_clock.h | |
| parent | Merge pull request #5002 from ameerj/nvdec-frameskip (diff) | |
| parent | audio_core: Make shadowing and unused parameters errors (diff) | |
| download | yuzu-88089c87546b62536a27738f5ee03dff52fa76e9.tar.gz yuzu-88089c87546b62536a27738f5ee03dff52fa76e9.tar.xz yuzu-88089c87546b62536a27738f5ee03dff52fa76e9.zip | |
Merge pull request #5000 from lioncash/audio-error
audio_core: Make shadowing and unused parameters errors
Diffstat (limited to 'src/common/wall_clock.h')
| -rw-r--r-- | src/common/wall_clock.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/common/wall_clock.h b/src/common/wall_clock.h index bc7adfbf8..cef3e9499 100644 --- a/src/common/wall_clock.h +++ b/src/common/wall_clock.h | |||
| @@ -38,9 +38,9 @@ public: | |||
| 38 | } | 38 | } |
| 39 | 39 | ||
| 40 | protected: | 40 | protected: |
| 41 | WallClock(u64 emulated_cpu_frequency, u64 emulated_clock_frequency, bool is_native) | 41 | explicit WallClock(u64 emulated_cpu_frequency_, u64 emulated_clock_frequency_, bool is_native_) |
| 42 | : emulated_cpu_frequency{emulated_cpu_frequency}, | 42 | : emulated_cpu_frequency{emulated_cpu_frequency_}, |
| 43 | emulated_clock_frequency{emulated_clock_frequency}, is_native{is_native} {} | 43 | emulated_clock_frequency{emulated_clock_frequency_}, is_native{is_native_} {} |
| 44 | 44 | ||
| 45 | u64 emulated_cpu_frequency; | 45 | u64 emulated_cpu_frequency; |
| 46 | u64 emulated_clock_frequency; | 46 | u64 emulated_clock_frequency; |