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/core/tools/freezer.cpp | |
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/core/tools/freezer.cpp')
-rw-r--r-- | src/core/tools/freezer.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/core/tools/freezer.cpp b/src/core/tools/freezer.cpp index 27b894b51..2003e096f 100644 --- a/src/core/tools/freezer.cpp +++ b/src/core/tools/freezer.cpp @@ -55,10 +55,11 @@ void MemoryWriteWidth(Core::Memory::Memory& memory, u32 width, VAddr addr, u64 v Freezer::Freezer(Core::Timing::CoreTiming& core_timing_, Core::Memory::Memory& memory_) : core_timing{core_timing_}, memory{memory_} { - event = Core::Timing::CreateEvent("MemoryFreezer::FrameCallback", - [this](u64 userdata, std::chrono::nanoseconds ns_late) { - FrameCallback(userdata, ns_late); - }); + event = Core::Timing::CreateEvent( + "MemoryFreezer::FrameCallback", + [this](std::uintptr_t user_data, std::chrono::nanoseconds ns_late) { + FrameCallback(user_data, ns_late); + }); core_timing.ScheduleEvent(memory_freezer_ns, event); } @@ -159,7 +160,7 @@ std::vector<Freezer::Entry> Freezer::GetEntries() const { return entries; } -void Freezer::FrameCallback(u64, std::chrono::nanoseconds ns_late) { +void Freezer::FrameCallback(std::uintptr_t, std::chrono::nanoseconds ns_late) { if (!IsActive()) { LOG_DEBUG(Common_Memory, "Memory freezer has been deactivated, ending callback events."); return; |