From 65b36e42b8dc92a2be7324b38a19956da110b7f1 Mon Sep 17 00:00:00 2001 From: Ben Wiederhake Date: Sun, 28 Feb 2021 00:01:47 +0100 Subject: [PATCH] Kernel: Make TimerId a distinct type Well, that was easy\! :^) --- Kernel/TimerQueue.cpp | 2 +- Kernel/TimerQueue.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Kernel/TimerQueue.cpp b/Kernel/TimerQueue.cpp index 8c0da10c14..3edd86f46b 100644 --- a/Kernel/TimerQueue.cpp +++ b/Kernel/TimerQueue.cpp @@ -104,7 +104,7 @@ TimerId TimerQueue::add_timer(NonnullRefPtr&& timer) timer->m_id = ++m_timer_id_count; VERIFY(timer->m_id != 0); // wrapped add_timer_locked(move(timer)); - return m_timer_id_count; + return timer->m_id; } void TimerQueue::add_timer_locked(NonnullRefPtr timer) diff --git a/Kernel/TimerQueue.h b/Kernel/TimerQueue.h index 2e897eb0ca..9d8f87701d 100644 --- a/Kernel/TimerQueue.h +++ b/Kernel/TimerQueue.h @@ -36,7 +36,7 @@ namespace Kernel { -typedef u64 TimerId; +TYPEDEF_DISTINCT_ORDERED_ID(u64, TimerId); class Timer : public RefCounted , public InlineLinkedListNode {