mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-23 15:52:55 +01:00
Code Issues Releases Wiki Activity

Enable the use of std::string_view for find in ObjectRepository

Browse Source
This commit is contained in:
ζeh Matt
2025-04-21 02:35:44 +03:00
parent 32f652e493
commit a22c041379
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/openrct2/core/String.hpp
View File

@@ -19,6 +19,24 @@
namespace OpenRCT2::String
{
struct Hash
{
using is_transparent = void;
size_t operator()(const char* txt) const
{
return std::hash<std::string_view>{}(txt);
}
size_t operator()(std::string_view txt) const
{
return std::hash<std::string_view>{}(txt);
}
size_t operator()(const std::string& txt) const
{
return std::hash<std::string>{}(txt);
}
};
std::string toStd(const utf8* str);
std::string toUtf8(std::wstring_view src);
std::wstring toWideChar(std::string_view src);

4
src/openrct2/object/ObjectRepository.cpp
View File

@@ -69,7 +69,7 @@ struct ObjectEntryEqual
}
};
using ObjectIdentifierMap = std::unordered_map<std::string, size_t>;
using ObjectIdentifierMap = std::unordered_map<std::string, size_t, String::Hash, std::equal_to<>>;
using ObjectEntryMap = std::unordered_map<RCTObjectEntry, size_t, ObjectEntryHash, ObjectEntryEqual>;
class ObjectFileIndex final : public FileIndex<ObjectRepositoryItem>
@@ -235,7 +235,7 @@ public:
const ObjectRepositoryItem* FindObject(std::string_view identifier) const override final
{
auto kvp = _newItemMap.find(std::string(identifier));
auto kvp = _newItemMap.find(identifier);
if (kvp != _newItemMap.end())
{
return &_items[kvp->second];