From 3a390e9b44cb196aa4b4843dd8b3a7875bbc3a3f Mon Sep 17 00:00:00 2001 From: punto- Date: Mon, 11 Apr 2016 03:34:10 -0300 Subject: [PATCH] Update vector.h using non-templated neares_power_of_2 --- core/vector.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/vector.h b/core/vector.h index 16a09c1ddd1..87248ccf687 100644 --- a/core/vector.h +++ b/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