diff --git a/AK/NonnullOwnPtr.h b/AK/NonnullOwnPtr.h index 2fc212bad72..a87ce319559 100644 --- a/AK/NonnullOwnPtr.h +++ b/AK/NonnullOwnPtr.h @@ -148,15 +148,6 @@ requires(IsConstructible) inline NonnullOwnPtr make(Args&&... arg return NonnullOwnPtr(NonnullOwnPtr::Adopt, *new T(forward(args)...)); } -#ifdef AK_COMPILER_APPLE_CLANG -// FIXME: Remove once P0960R3 is available in Apple Clang. -template -inline NonnullOwnPtr make(Args&&... args) -{ - return NonnullOwnPtr(NonnullOwnPtr::Adopt, *new T { forward(args)... }); -} -#endif - // Use like `adopt_nonnull_own_or_enomem(new (nothrow) T(args...))`. template inline ErrorOr> adopt_nonnull_own_or_enomem(T* object) @@ -172,16 +163,6 @@ requires(IsConstructible) inline ErrorOr> try_make( return adopt_nonnull_own_or_enomem(new (nothrow) T(forward(args)...)); } -#ifdef AK_COMPILER_APPLE_CLANG -// FIXME: Remove once P0960R3 is available in Apple Clang. -template -inline ErrorOr> try_make(Args&&... args) - -{ - return adopt_nonnull_own_or_enomem(new (nothrow) T { forward(args)... }); -} -#endif - template struct Traits> : public DefaultTraits> { using PeekType = T*; diff --git a/AK/NonnullRefPtr.h b/AK/NonnullRefPtr.h index 62a049c134f..92df14c462c 100644 --- a/AK/NonnullRefPtr.h +++ b/AK/NonnullRefPtr.h @@ -240,15 +240,6 @@ requires(IsConstructible) inline ErrorOr> try_make_ return adopt_nonnull_ref_or_enomem(new (nothrow) T(forward(args)...)); } -#ifdef AK_COMPILER_APPLE_CLANG -// FIXME: Remove once P0960R3 is available in Apple Clang. -template -inline ErrorOr> try_make_ref_counted(Args&&... args) -{ - return adopt_nonnull_ref_or_enomem(new (nothrow) T { forward(args)... }); -} -#endif - template struct Formatter> : Formatter { ErrorOr format(FormatBuilder& builder, NonnullRefPtr const& value) @@ -279,15 +270,6 @@ requires(IsConstructible) inline NonnullRefPtr make_ref_counted(A return NonnullRefPtr(NonnullRefPtr::Adopt, *new T(forward(args)...)); } -#ifdef AK_COMPILER_APPLE_CLANG -// FIXME: Remove once P0960R3 is available in Apple Clang. -template -inline NonnullRefPtr make_ref_counted(Args&&... args) -{ - return NonnullRefPtr(NonnullRefPtr::Adopt, *new T { forward(args)... }); -} -#endif - template struct Traits> : public DefaultTraits> { using PeekType = T*;