Sara.Sync
/
godot-cpp
mirror of https://github.com/godotengine/godot-cpp
0
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix CallableCustom comparison function handling 

In the GDExtension API the CallableCustom interface defines the
`hash_func`, `equal_func`, and `less_than_func` methods as optional.

However, in godot-cpp a custom handler was always provided to Godot.
This custom provider then failed if both Callables had specified nullptr as their
equal or less_than_equal comparison function.

This commit fixes this, and only sets the custom handler, when a custom handler
is actually specified by the developer.

Also, if the hash() function returns 0, then no hash function is
provided to Godot, so it falls back to its default hash function.
pull/1612/head
Gergely Kis 2024-10-04 11:09:03 +02:00
parent 6facde3c29
commit 4d6f40a906
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/variant/callable_custom.cpp
View File

@ -110,9 +110,9 @@ Callable::Callable(CallableCustom *p_callable_custom) {
info.call_func = &callable_custom_call; info.call_func = &callable_custom_call;
info.is_valid_func = &callable_custom_is_valid; info.is_valid_func = &callable_custom_is_valid;
info.free_func = &callable_custom_free; info.free_func = &callable_custom_free;
info.hash_func = &callable_custom_hash; info.hash_func = p_callable_custom->hash() != 0 ? &callable_custom_hash : nullptr;
info.equal_func = &callable_custom_equal_func; info.equal_func = p_callable_custom->get_compare_equal_func() ? &callable_custom_equal_func : nullptr;
info.less_than_func = &callable_custom_less_than_func; info.less_than_func = p_callable_custom->get_compare_less_func() ? &callable_custom_less_than_func : nullptr;
info.to_string_func = &callable_custom_to_string; info.to_string_func = &callable_custom_to_string;
info.get_argument_count_func = &custom_callable_get_argument_count_func; info.get_argument_count_func = &custom_callable_get_argument_count_func;