godot/thirdparty/basis_universal/patches/0004-ambiguous-calls.patch

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

23 lines
1 KiB
Diff
Raw Normal View History

2025-03-11 10:51:10 +01:00
diff --git a/thirdparty/basis_universal/transcoder/basisu_containers.h b/thirdparty/basis_universal/transcoder/basisu_containers.h
index 03fae33974..7fff4c243e 100644
--- a/thirdparty/basis_universal/transcoder/basisu_containers.h
+++ b/thirdparty/basis_universal/transcoder/basisu_containers.h
@@ -3349,7 +3349,7 @@ namespace basisu
inline size_t hash_key(const Key& k) const
{
- assert((safe_shift_left(1ULL, (SIZE_T_BITS - m_hash_shift))) == m_values.size());
+ assert((safe_shift_left(static_cast<uint64_t>(1), (SIZE_T_BITS - m_hash_shift))) == m_values.size());
// Fibonacci hashing
if (SIZE_T_BITS == 32)
@@ -3433,7 +3433,7 @@ namespace basisu
return false;
new_map.m_hash_shift = SIZE_T_BITS - helpers::floor_log2i((uint64_t)new_hash_size);
- assert(new_hash_size == safe_shift_left(1ULL, SIZE_T_BITS - new_map.m_hash_shift));
+ assert(new_hash_size == safe_shift_left(static_cast<uint64_t>(1), SIZE_T_BITS - new_map.m_hash_shift));
new_map.m_grow_threshold = std::numeric_limits<size_t>::max();