From b32cf33a23064394fc0bd694262fee523cd98b58 Mon Sep 17 00:00:00 2001 From: Idan Horowitz Date: Sun, 13 Feb 2022 21:34:11 +0200 Subject: [PATCH] Kernel: Remove make_weak_ptr() New users of WeakPtr in the kernel should use try_make_weak_ptr instead --- AK/Weakable.h | 7 ++++++- Kernel/Library/ThreadSafeWeakPtr.h | 6 ------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/AK/Weakable.h b/AK/Weakable.h index c800be92059..0aad3cb4365 100644 --- a/AK/Weakable.h +++ b/AK/Weakable.h @@ -105,8 +105,13 @@ private: class Link; public: +#ifndef KERNEL template - WeakPtr make_weak_ptr() const { return MUST(try_make_weak_ptr()); } + WeakPtr make_weak_ptr() const + { + return MUST(try_make_weak_ptr()); + } +#endif template ErrorOr> try_make_weak_ptr() const; diff --git a/Kernel/Library/ThreadSafeWeakPtr.h b/Kernel/Library/ThreadSafeWeakPtr.h index ad11e082bbd..46e0b44d280 100644 --- a/Kernel/Library/ThreadSafeWeakPtr.h +++ b/Kernel/Library/ThreadSafeWeakPtr.h @@ -237,12 +237,6 @@ ErrorOr> try_make_weak_ptr_if_nonnull(T const* ptr) return WeakPtr {}; } -template -WeakPtr make_weak_ptr_if_nonnull(T const* ptr) -{ - return MUST(try_make_weak_ptr_if_nonnull(ptr)); -} - } using AK::WeakPtr;