RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 22:57:44 +00:00
Code Issues Activity Actions

Revert "AK: Disallow constness laundering in RefPtr and NonnullRefPtr"

Browse source 
This reverts commit 3c7a0ef1ac.

This broke Jakt, which will need some adjustments to its code generation
before we can commit to being this strict.
This commit is contained in:
Andreas Kling 2023-02-21 09:22:18 +01:00
parent f6eb155167
commit 7ac7a73758
2 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

16
AK/NonnullRefPtr.h
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2018-2023, Andreas Kling <kling@serenityos.org>
* Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
@ -47,16 +47,16 @@ public:
enum AdoptTag { Adopt };
ALWAYS_INLINE NonnullRefPtr(T& object)
: m_ptr(&object)
ALWAYS_INLINE NonnullRefPtr(T const& object)
: m_ptr(const_cast<T*>(&object))
{
m_ptr->ref();
}
template<typename U>
ALWAYS_INLINE NonnullRefPtr(U& object)
ALWAYS_INLINE NonnullRefPtr(U const& object)
requires(IsConvertible<U*, T*>)
: m_ptr(static_cast<T*>(&object))
: m_ptr(const_cast<T*>(static_cast<T const*>(&object)))
{
m_ptr->ref();
}
@ -79,7 +79,7 @@ public:
}
ALWAYS_INLINE NonnullRefPtr(NonnullRefPtr const& other)
: m_ptr(other.ptr())
: m_ptr(const_cast<T*>(other.ptr()))
{
m_ptr->ref();
}
@ -87,7 +87,7 @@ public:
template<typename U>
ALWAYS_INLINE NonnullRefPtr(NonnullRefPtr<U> const& other)
requires(IsConvertible<U*, T*>)
: m_ptr(static_cast<T*>(other.ptr()))
: m_ptr(const_cast<T*>(static_cast<T const*>(other.ptr())))
{
m_ptr->ref();
}
@ -145,7 +145,7 @@ public:
return *this;
}
NonnullRefPtr& operator=(T& object)
NonnullRefPtr& operator=(T const& object)
{
NonnullRefPtr tmp { object };
swap(tmp);