diff options
| author | bunnei <bunneidev@gmail.com> | 2020-07-27 19:29:22 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-27 19:29:22 -0700 |
| commit | 05781ce8c4dd4d4150185effac56ef9a71ae2705 (patch) | |
| tree | 12d41a29b43577b95b158bc033aadc3957bde3d7 /src/tests/core | |
| parent | 312c3788df6274d5bc39d7d0606fd0d90e65d698 (diff) | |
| parent | a7af349daee85237384dba07533c9a407cf15592 (diff) | |
Merge pull request #4437 from lioncash/ptr
core_timing: Make use of uintptr_t to represent user_data
Diffstat (limited to 'src/tests/core')
| -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; |