summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Wiederhake <BenWiederhake.GitHub@gmx.de>2021-02-28 00:01:47 +0100
committerAndreas Kling <kling@serenityos.org>2021-03-02 08:36:08 +0100
commit65b36e42b8dc92a2be7324b38a19956da110b7f1 (patch)
tree8115731ea61032d988d9111ffa9a4c7c876153f7
parent94e0a603f2fc0f26798a208bd9e50448c08c1d9f (diff)
downloadserenity-65b36e42b8dc92a2be7324b38a19956da110b7f1.zip
Kernel: Make TimerId a distinct type
Well, that was easy\! :^)
-rw-r--r--Kernel/TimerQueue.cpp2
-rw-r--r--Kernel/TimerQueue.h2
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)
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> 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<Timer>
, public InlineLinkedListNode<Timer> {