Remove VARIANT_ARG* macros #58929
Merged
Remove VARIANT_ARG* macros #58929
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Member
reduz
commented
Mar 9, 2022
reduz
commented
- Very old macros from the time Godot was created.
- Limited arguments to 5 (then later changed to 8) in many places.
- They were replaced by C++11 Variadic Templates.
- Renamed methods that take argument pointers to have a "p" suffix. This was used in some places and not in others, so made it standard.
- Also added a dereference check for Variant*. Helped catch a couple of bugs.
akien-mga
reviewed
Mar 9, 2022
| @@ -125,7 +111,7 @@ Error MessageQueue::push_set(Object *p_object, const StringName &p_prop, const V | |||
| return push_set(p_object->get_instance_id(), p_prop, p_value); | |||
| } | |||
|
|
|||
| Error MessageQueue::push_callable(const Callable &p_callable, const Variant **p_args, int p_argcount, bool p_show_error) { | |||
| Error MessageQueue::push_callablep(const Callable &p_callable, const Variant **p_args, int p_argcount, bool p_show_error) { | |||
There was a problem hiding this comment.
For now it's fine for compatibility, but eventually we could likely remove the args pointer and just make it push_callable(const Callable &p_callable, bool p_show_error). We can pass args via Callable::bind.
There was a problem hiding this comment.
Yeah I am honestly not sure how it is supposed to be used, although the unlimited varargs now should resolve most of the original need for it.
akien-mga
reviewed
Mar 9, 2022
akien-mga
reviewed
Mar 9, 2022
reduz
force-pushed
the
remove-variant-arg-macros
branch
from
4577d69
to
933a77a
Compare
akien-mga
reviewed
Mar 9, 2022
reduz
force-pushed
the
remove-variant-arg-macros
branch
from
933a77a
to
7bbac9a
Compare
akien-mga
reviewed
Mar 9, 2022
reduz
force-pushed
the
remove-variant-arg-macros
branch
from
7bbac9a
to
58360b8
Compare
akien-mga
approved these changes
Mar 9, 2022
* Very old macros from the time Godot was created. * Limited arguments to 5 (then later changed to 8) in many places. * They were replaced by C++11 Variadic Templates. * Renamed methods that take argument pointers to have a "p" suffix. This was used in some places and not in others, so made it standard. * Also added a dereference check for Variant*. Helped catch a couple of bugs.
reduz
force-pushed
the
remove-variant-arg-macros
branch
from
58360b8
to
21637df
Compare
|
Thanks! |
akien-mga
reviewed
Mar 9, 2022
| argptrs.write[i] = &op.args[i]; | ||
| argc++; |
There was a problem hiding this comment.
Bug here, argc is now always 0. I'll make a PR.
akien-mga
added a commit
to akien-mga/godot
that referenced
this pull request
Mar 9, 2022
gaudecker
pushed a commit
to gaudecker/godot
that referenced
this pull request
Apr 3, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.