AK: Make (Nonnull)OwnPtr work with abstract classes

Clang produced a compile error at this requires statement if `T` was an abstract class.
fleximus · Jul 2, 2021 · 3162c9e · 3162c9e
1 parent b97a00d
commit 3162c9e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/AK/NonnullOwnPtr.h b/AK/NonnullOwnPtr.h
@@ -33,7 +33,7 @@ class NonnullOwnPtr {
  : m_ptr(&ptr)
  {
  static_assert(
- requires { requires typename T::AllowOwnPtr()(); } || !requires(T obj) { requires !typename T::AllowOwnPtr()(); obj.ref(); obj.unref(); },
+ requires { requires typename T::AllowOwnPtr()(); } || !requires { requires !typename T::AllowOwnPtr()(); declval<T>().ref(); declval<T>().unref(); },
  "Use NonnullRefPtr<> for RefCounted types");
  }
  NonnullOwnPtr(NonnullOwnPtr&& other)

diff --git a/AK/OwnPtr.h b/AK/OwnPtr.h
@@ -184,8 +184,7 @@ class OwnPtr {
  : m_ptr(ptr)
  {
  static_assert(
- requires { requires typename T::AllowOwnPtr()(); } || !requires(T obj) { requires !typename T::AllowOwnPtr()(); obj.ref(); obj.unref(); },
- "Use RefPtr<> for RefCounted types");
+ requires { requires typename T::AllowOwnPtr()(); } || !requires { requires !typename T::AllowOwnPtr()(); declval<T>().ref(); declval<T>().unref(); }, "Use RefPtr<> for RefCounted types");
  }
 
 private: