Book a Demo!
CoCalc Logo Icon
StoreFeaturesDocsShareSupportNewsAboutPoliciesSign UpSign In
godotengine
GitHub Repository: godotengine/godot
 Path: blob/master/thirdparty/basis_universal/patches/0004-ambiguous-calls.patch
9904 views
1
diff --git a/thirdparty/basis_universal/transcoder/basisu_containers.h b/thirdparty/basis_universal/transcoder/basisu_containers.h

2
index 03fae33974..7fff4c243e 100644

3
--- a/thirdparty/basis_universal/transcoder/basisu_containers.h

4
+++ b/thirdparty/basis_universal/transcoder/basisu_containers.h

5
@@ -3349,7 +3349,7 @@ namespace basisu

6
 

7
 		inline size_t hash_key(const Key& k) const

8
 		{

9
-			assert((safe_shift_left(1ULL, (SIZE_T_BITS - m_hash_shift))) == m_values.size());

10
+			assert((safe_shift_left(static_cast<uint64_t>(1), (SIZE_T_BITS - m_hash_shift))) == m_values.size());

11
 

12
 			// Fibonacci hashing

13
 			if (SIZE_T_BITS == 32)

14
@@ -3433,7 +3433,7 @@ namespace basisu

15
 				return false;

16
 

17
 			new_map.m_hash_shift = SIZE_T_BITS - helpers::floor_log2i((uint64_t)new_hash_size);

18
-			assert(new_hash_size == safe_shift_left(1ULL, SIZE_T_BITS - new_map.m_hash_shift));

19
+			assert(new_hash_size == safe_shift_left(static_cast<uint64_t>(1), SIZE_T_BITS - new_map.m_hash_shift));

20
 

21
 			new_map.m_grow_threshold = std::numeric_limits<size_t>::max();

22
 

23


24