Quellcode durchsuchen

Use non-templated nearest_power_of_2

Works around #4262 and likely #4190.

(cherry picked from commit 3a390e9b44cb196aa4b4843dd8b3a7875bbc3a3f)
punto- vor 9 Jahren
Ursprung
Commit
e8a0b2462b
1 geänderte Dateien mit 3 neuen und 2 gelöschten Zeilen
  1. 3 2
      core/vector.h

+ 3 - 2
core/vector.h

@@ -70,7 +70,8 @@ class Vector {
  	}
 
 	_FORCE_INLINE_ size_t _get_alloc_size(size_t p_elements) const {
-		return nearest_power_of_2_templated(p_elements*sizeof(T)+sizeof(SafeRefCount)+sizeof(int));
+		//return nearest_power_of_2_templated(p_elements*sizeof(T)+sizeof(SafeRefCount)+sizeof(int));
+		return nearest_power_of_2(p_elements*sizeof(T)+sizeof(SafeRefCount)+sizeof(int));
 	}
 
 	_FORCE_INLINE_ bool _get_alloc_size_checked(size_t p_elements, size_t *out) const {
@@ -79,7 +80,7 @@ class Vector {
 		size_t p;
 		if (_mul_overflow(p_elements, sizeof(T), &o)) return false;
 		if (_add_overflow(o, sizeof(SafeRefCount)+sizeof(int), &p)) return false;
-		*out = nearest_power_of_2_templated(p);
+		*out = nearest_power_of_2(p);
 		return true;
 #else
 		// Speed is more important than correctness here, do the operations unchecked