Merge pull request #1422 from AThousandShips/utility_fix

dsnopek · web-flow · commit b02124595f46 · 2024-04-03T08:56:20.000-05:00
Fix incorrect utility call signature
diff --git a/include/godot_cpp/core/engine_ptrcall.hpp b/include/godot_cpp/core/engine_ptrcall.hpp
@@ -77,7 +77,7 @@ R _call_utility_ret(GDExtensionPtrUtilityFunction func, const Args &...args) {
 }
 
 template <typename... Args>
-Object *_call_utility_ret_obj(const GDExtensionPtrUtilityFunction func, void *instance, const Args &...args) {
+Object *_call_utility_ret_obj(const GDExtensionPtrUtilityFunction func, const Args &...args) {
 	GodotObject *ret = nullptr;
 	std::array<GDExtensionConstTypePtr, sizeof...(Args)> mb_args = { { (GDExtensionConstTypePtr)args... } };
 	func(&ret, mb_args.data(), mb_args.size());

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ R _call_utility_ret(GDExtensionPtrUtilityFunction func, const Args &...args) {`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`template <typename... Args>`
`80`		`-Object _call_utility_ret_obj(const GDExtensionPtrUtilityFunction func, void instance, const Args &...args) {`
	`80`	`+Object *_call_utility_ret_obj(const GDExtensionPtrUtilityFunction func, const Args &...args) {`
`81`	`81`	`GodotObject *ret = nullptr;`
`82`	`82`	`std::array<GDExtensionConstTypePtr, sizeof...(Args)> mb_args = { { (GDExtensionConstTypePtr)args... } };`
`83`	`83`	`func(&ret, mb_args.data(), mb_args.size());`