diff options
author | bunnei <bunneidev@gmail.com> | 2020-07-28 04:29:22 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-28 04:29:22 +0200 |
commit | 05781ce8c4dd4d4150185effac56ef9a71ae2705 (patch) | |
tree | 12d41a29b43577b95b158bc033aadc3957bde3d7 /src/tests | |
parent | Merge pull request #4420 from lat9nq/fix-themed-label-bg (diff) | |
parent | core_timing: Make use of uintptr_t to represent user_data (diff) | |
download | yuzu-05781ce8c4dd4d4150185effac56ef9a71ae2705.tar yuzu-05781ce8c4dd4d4150185effac56ef9a71ae2705.tar.gz yuzu-05781ce8c4dd4d4150185effac56ef9a71ae2705.tar.bz2 yuzu-05781ce8c4dd4d4150185effac56ef9a71ae2705.tar.lz yuzu-05781ce8c4dd4d4150185effac56ef9a71ae2705.tar.xz yuzu-05781ce8c4dd4d4150185effac56ef9a71ae2705.tar.zst yuzu-05781ce8c4dd4d4150185effac56ef9a71ae2705.zip |
Diffstat (limited to '')
-rw-r--r-- | src/tests/core/core_timing.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tests/core/core_timing.cpp b/src/tests/core/core_timing.cpp index 244463a47..022b26e6d 100644 --- a/src/tests/core/core_timing.cpp +++ b/src/tests/core/core_timing.cpp @@ -25,10 +25,10 @@ std::bitset<CB_IDS.size()> callbacks_ran_flags; u64 expected_callback = 0; template <unsigned int IDX> -void HostCallbackTemplate(u64 userdata, std::chrono::nanoseconds ns_late) { +void HostCallbackTemplate(std::uintptr_t user_data, std::chrono::nanoseconds ns_late) { static_assert(IDX < CB_IDS.size(), "IDX out of range"); callbacks_ran_flags.set(IDX); - REQUIRE(CB_IDS[IDX] == userdata); + REQUIRE(CB_IDS[IDX] == user_data); REQUIRE(CB_IDS[IDX] == CB_IDS[calls_order[expected_callback]]); delays[IDX] = ns_late.count(); ++expected_callback; |