AnarchistGamers/openmw
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-08-03 15:27:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '32bitfixes' into 'master'

Browse Source 
fix 32bit builds. closes #8625

Closes #8625

See merge request OpenMW/openmw!4791
This commit is contained in:
zlice 2025-08-02 04:39:27 -04:00
commit 00b2cd0031
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/esm/formid.hpp
View File

@ -51,10 +51,10 @@ namespace std
{
size_t operator()(const ESM::FormId& formId) const
{
static_assert(sizeof(ESM::FormId) == sizeof(size_t));
size_t s;
memcpy(&s, &formId, sizeof(size_t));
return hash<size_t>()(s);
static_assert(sizeof(ESM::FormId) == sizeof(uint64_t));
uint64_t s;
memcpy(&s, &formId, sizeof(ESM::FormId));
return hash<uint64_t>()(s);
}
};

18
components/misc/strings/algorithm.hpp
View File

@ -4,6 +4,7 @@
#include "lower.hpp"
#include <algorithm>
#include <cstdint>
#include <functional>
#include <string>
#include <string_view>
@ -88,14 +89,23 @@ namespace Misc::StringUtils
constexpr std::size_t operator()(std::string_view str) const
{
// FNV-1a
std::size_t hash{ 0xcbf29ce484222325ull };
constexpr std::size_t prime{ 0x00000100000001B3ull };
std::uint64_t hash{ 0xcbf29ce484222325ull };
constexpr std::uint64_t prime{ 0x00000100000001B3ull };
for (char c : str)
{
hash ^= static_cast<std::size_t>(toLower(c));
hash ^= static_cast<std::uint64_t>(toLower(c));
hash *= prime;
}
return hash;
if constexpr (sizeof(std::uint64_t) <= sizeof(std::size_t))
return hash;
else if constexpr (sizeof(std::uint32_t) == sizeof(std::size_t))
{
std::uint32_t low = hash & 0xFFFFFFFF;
std::uint32_t high = hash >> 32;
return low ^ high;
}
static_assert(sizeof(std::uint64_t) <= sizeof(std::size_t) || sizeof(std::uint32_t) == sizeof(std::size_t));
return {};
}
};