Merge pull request godotengine#118027 from zhehangd/constexpr_math_funcs_binary

Repiteo · Repiteo · commit 4a919adccf8e · 2026-03-31T10:46:58.000-05:00
Mark template function in math_funcs_binary constexpr
diff --git a/core/math/math_funcs_binary.h b/core/math/math_funcs_binary.h
@@ -38,7 +38,7 @@ namespace Math {
 
 // Returns `true` if a positive integer is a power of 2, `false` otherwise.
 template <typename T>
-inline bool is_power_of_2(const T x) {
+constexpr bool is_power_of_2(const T x) {
 	return x && ((x & (x - 1)) == 0);
 }
 
@@ -129,7 +129,7 @@ constexpr int32_t get_shift_from_power_of_2(uint32_t p_bits) {
 }
 
 template <typename T>
-_FORCE_INLINE_ T nearest_power_of_2_templated(T p_number) {
+constexpr T nearest_power_of_2_templated(T p_number) {
 	--p_number;
 
 	// The number of operations on x is the base two logarithm

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ namespace Math {`
`38`	`38`
`39`	`39`	// Returns `true` if a positive integer is a power of 2, `false` otherwise.
`40`	`40`	`template <typename T>`
`41`		`-inline bool is_power_of_2(const T x) {`
	`41`	`+constexpr bool is_power_of_2(const T x) {`
`42`	`42`	`return x && ((x & (x - 1)) == 0);`
`43`	`43`	`}`
`44`	`44`
`@@ -129,7 +129,7 @@ constexpr int32_t get_shift_from_power_of_2(uint32_t p_bits) {`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`template <typename T>`
`132`		`-_FORCE_INLINE_ T nearest_power_of_2_templated(T p_number) {`
	`132`	`+constexpr T nearest_power_of_2_templated(T p_number) {`
`133`	`133`	`--p_number;`
`134`	`134`
`135`	`135`	`// The number of operations on x is the base two logarithm`