From a7af349daee85237384dba07533c9a407cf15592 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 27 Jul 2020 19:00:41 -0400 Subject: core_timing: Make use of uintptr_t to represent user_data Makes the interface future-proofed for supporting other platforms in the event we ever support platforms with differing pointer sizes. This way, we have a type in place that is always guaranteed to be able to represent a pointer exactly. --- src/tests/core/core_timing.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/tests/core') 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 callbacks_ran_flags; u64 expected_callback = 0; template -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; -- cgit v1.2.3