diff options
| author | Matthew Murphy <mashumafi@users.noreply.github.com> | 2023-01-27 23:43:01 -0500 |
|---|---|---|
| committer | David Snopek <dsnopek@gmail.com> | 2023-09-09 11:30:29 -0500 |
| commit | ca3e25de040c87de1a9bb332c62cfaef0d44fe75 (patch) | |
| tree | 0bb7bee521c1cdc93649f97fcf9f0b954d7197b3 /include/godot_cpp | |
| parent | 82e960a810257b4502603a3541ec5e0921129150 (diff) | |
| download | redot-cpp-ca3e25de040c87de1a9bb332c62cfaef0d44fe75.tar.gz | |
Fix variant call compiler error
Co-authored-by: David Snopek <dsnopek@gmail.com>
Diffstat (limited to 'include/godot_cpp')
| -rw-r--r-- | include/godot_cpp/variant/variant.hpp | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/include/godot_cpp/variant/variant.hpp b/include/godot_cpp/variant/variant.hpp index 3b5ca56..3e8738c 100644 --- a/include/godot_cpp/variant/variant.hpp +++ b/include/godot_cpp/variant/variant.hpp @@ -255,25 +255,33 @@ public: bool operator!=(const Variant &other) const; bool operator<(const Variant &other) const; - void call(const StringName &method, const Variant **args, int argcount, Variant &r_ret, GDExtensionCallError &r_error); + void callp(const StringName &method, const Variant **args, int argcount, Variant &r_ret, GDExtensionCallError &r_error); template <class... Args> Variant call(const StringName &method, Args... args) { + std::array<Variant, sizeof...(args)> vargs = { args... }; + std::array<const Variant *, sizeof...(args)> argptrs; + for (size_t i = 0; i < vargs.size(); i++) { + argptrs[i] = &vargs[i]; + } Variant result; GDExtensionCallError error; - std::array<GDExtensionConstVariantPtr, sizeof...(Args)> call_args = { Variant(args)... }; - call(method, call_args.data(), call_args.size(), result, error); + callp(method, argptrs.data(), argptrs.size(), result, error); return result; } - static void call_static(Variant::Type type, const StringName &method, const Variant **args, int argcount, Variant &r_ret, GDExtensionCallError &r_error); + static void callp_static(Variant::Type type, const StringName &method, const Variant **args, int argcount, Variant &r_ret, GDExtensionCallError &r_error); template <class... Args> static Variant call_static(Variant::Type type, const StringName &method, Args... args) { + std::array<Variant, sizeof...(args)> vargs = { args... }; + std::array<const Variant *, sizeof...(args)> argptrs; + for (size_t i = 0; i < vargs.size(); i++) { + argptrs[i] = &vargs[i]; + } Variant result; GDExtensionCallError error; - std::array<GDExtensionConstVariantPtr, sizeof...(Args)> call_args = { Variant(args)... }; - call_static(type, method, call_args.data(), call_args.size(), result, error); + callp_static(type, method, argptrs.data(), argptrs.size(), sizeof...(args), result, error); return result; } |