system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-07-22 02:26:11 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

AK: Add basic Traits for RefPtr

Browse source 
This allows RefPtr to be stored in a HashTable<RefPtr<T>> :^)

It's unfortunate about the const_casts. We'll need to fix HashMap::get
to play nice with non-const Traits<T>::PeekType at some point.
This commit is contained in:
Andreas Kling 2020-02-16 19:36:15 +01:00
parent 9794e18a20
commit a6e69bda71
5 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
AK/RefPtr.h
View file

@ -29,6 +29,7 @@
#include <AK/LogStream.h>
#include <AK/NonnullRefPtr.h>
#include <AK/StdLibExtras.h>
#include <AK/Traits.h>
#include <AK/Types.h>
namespace AK {
@ -274,6 +275,13 @@ inline const LogStream& operator<<(const LogStream& stream, const RefPtr<T>& val
return stream << value.ptr();
}
template<typename T>
struct Traits<RefPtr<T>> : public GenericTraits<RefPtr<T>> {
using PeekType = const T*;
static unsigned hash(const RefPtr<T>& p) { return int_hash((u32)p.ptr()); }
static bool equals(const RefPtr<T>& a, const RefPtr<T>& b) { return a.ptr() == b.ptr(); }
};
}
using AK::RefPtr;

2
Applications/IRCClient/IRCClient.cpp
View file

@ -436,7 +436,7 @@ void IRCClient::handle_privmsg_or_notice(const Message& msg, PrivmsgOrNotice typ
IRCQuery* IRCClient::query_with_name(const String& name)
{
return m_queries.get(name).value_or(nullptr);
return const_cast<IRCQuery*>(m_queries.get(name).value_or(nullptr));
}
IRCQuery& IRCClient::ensure_query(const String& name)

5
Libraries/LibC/dlfcn.cpp
View file

@ -74,8 +74,7 @@ void* dlopen(const char* filename, int flags)
auto existing_elf_object = g_elf_objects.get(file_path.basename());
if (existing_elf_object.has_value()) {
void* referenced_object = existing_elf_object.value().leak_ref();
return referenced_object;
return const_cast<ELFDynamicLoader*>(existing_elf_object.value());
}
int fd = open(filename, O_RDONLY);
@ -110,7 +109,7 @@ void* dlopen(const char* filename, int flags)
g_dlerror_msg = "Successfully loaded ELF object.";
// we have one refcount already
return g_elf_objects.get(file_path.basename()).value().ptr();
return const_cast<ELFDynamicLoader*>(g_elf_objects.get(file_path.basename()).value());
}
void* dlsym(void* handle, const char* symbol_name)

2
Libraries/LibProtocol/Client.cpp
View file

@ -74,7 +74,7 @@ void Client::handle(const Messages::ProtocolClient::DownloadFinished& message)
void Client::handle(const Messages::ProtocolClient::DownloadProgress& message)
{
if (auto download = m_downloads.get(message.download_id()).value_or(nullptr)) {
if (auto download = const_cast<Download*>(m_downloads.get(message.download_id()).value_or(nullptr))) {
download->did_progress({}, message.total_size(), message.downloaded_size());
}
}

2
Servers/ProtocolServer/Download.cpp
View file

@ -39,7 +39,7 @@ static HashMap<i32, RefPtr<Download>>& all_downloads()
Download* Download::find_by_id(i32 id)
{
return all_downloads().get(id).value_or(nullptr);
return const_cast<Download*>(all_downloads().get(id).value_or(nullptr));
}
Download::Download(PSClientConnection& client)