diff options
author | Emmanuel Leblond <emmanuel.leblond@gmail.com> | 2022-12-03 11:13:23 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-12-03 11:13:23 +0100 |
commit | 32859ea25c31ae596535d6bf0178a6e01f45a001 (patch) | |
tree | de338d0fd68e5fbe4067b8faeeb338f40e66ff4e /include/godot_cpp/core/engine_ptrcall.hpp | |
parent | f1d501f97749fd70f590a3e82b81e55d6cf1d2d7 (diff) | |
parent | fe86a94dcf996e6262d788028e7efd1f50267e20 (diff) | |
download | redot-cpp-32859ea25c31ae596535d6bf0178a6e01f45a001.tar.gz |
Merge pull request #897 from touilleMan/gdextension-fix-gdnative-types-const-qualifier
Fix const qualifier for parameters in GDExtension api functions
Diffstat (limited to 'include/godot_cpp/core/engine_ptrcall.hpp')
-rw-r--r-- | include/godot_cpp/core/engine_ptrcall.hpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/godot_cpp/core/engine_ptrcall.hpp b/include/godot_cpp/core/engine_ptrcall.hpp index d6de1eb..09e2fe1 100644 --- a/include/godot_cpp/core/engine_ptrcall.hpp +++ b/include/godot_cpp/core/engine_ptrcall.hpp @@ -46,7 +46,7 @@ namespace internal { template <class O, class... Args> O *_call_native_mb_ret_obj(const GDNativeMethodBindPtr mb, void *instance, const Args &...args) { GodotObject *ret = nullptr; - std::array<const GDNativeTypePtr, sizeof...(Args)> mb_args = { { (const GDNativeTypePtr)args... } }; + std::array<GDNativeConstTypePtr, sizeof...(Args)> mb_args = { { (GDNativeConstTypePtr)args... } }; internal::gdn_interface->object_method_bind_ptrcall(mb, instance, mb_args.data(), &ret); if (ret == nullptr) { return nullptr; @@ -57,21 +57,21 @@ O *_call_native_mb_ret_obj(const GDNativeMethodBindPtr mb, void *instance, const template <class R, class... Args> R _call_native_mb_ret(const GDNativeMethodBindPtr mb, void *instance, const Args &...args) { R ret; - std::array<const GDNativeTypePtr, sizeof...(Args)> mb_args = { { (const GDNativeTypePtr)args... } }; + std::array<GDNativeConstTypePtr, sizeof...(Args)> mb_args = { { (GDNativeConstTypePtr)args... } }; internal::gdn_interface->object_method_bind_ptrcall(mb, instance, mb_args.data(), &ret); return ret; } template <class... Args> void _call_native_mb_no_ret(const GDNativeMethodBindPtr mb, void *instance, const Args &...args) { - std::array<const GDNativeTypePtr, sizeof...(Args)> mb_args = { { (const GDNativeTypePtr)args... } }; + std::array<GDNativeConstTypePtr, sizeof...(Args)> mb_args = { { (GDNativeConstTypePtr)args... } }; internal::gdn_interface->object_method_bind_ptrcall(mb, instance, mb_args.data(), nullptr); } template <class R, class... Args> R _call_utility_ret(GDNativePtrUtilityFunction func, const Args &...args) { R ret; - std::array<const GDNativeTypePtr, sizeof...(Args)> mb_args = { { (const GDNativeTypePtr)args... } }; + std::array<GDNativeConstTypePtr, sizeof...(Args)> mb_args = { { (GDNativeConstTypePtr)args... } }; func(&ret, mb_args.data(), mb_args.size()); return ret; } @@ -79,14 +79,14 @@ R _call_utility_ret(GDNativePtrUtilityFunction func, const Args &...args) { template <class... Args> Object *_call_utility_ret_obj(const GDNativePtrUtilityFunction func, void *instance, const Args &...args) { GodotObject *ret = nullptr; - std::array<const GDNativeTypePtr, sizeof...(Args)> mb_args = { { (const GDNativeTypePtr)args... } }; + std::array<GDNativeConstTypePtr, sizeof...(Args)> mb_args = { { (GDNativeConstTypePtr)args... } }; func(&ret, mb_args.data(), mb_args.size()); return (Object *)internal::gdn_interface->object_get_instance_binding(ret, internal::token, &Object::___binding_callbacks); } template <class... Args> void _call_utility_no_ret(const GDNativePtrUtilityFunction func, const Args &...args) { - std::array<const GDNativeTypePtr, sizeof...(Args)> mb_args = { { (const GDNativeTypePtr)args... } }; + std::array<GDNativeConstTypePtr, sizeof...(Args)> mb_args = { { (GDNativeConstTypePtr)args... } }; func(nullptr, mb_args.data(), mb_args.size()); } |