diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-07-26 11:18:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-26 11:18:01 +0200 |
| commit | 9856c8fda45c080886603515320faec4858d46dd (patch) | |
| tree | 12f2082979e41fc102d3a21596f5a8c7c5f4c350 /core | |
| parent | 44c90e66d07f87ef5d0fb7c7f5e6a0b2a35c7e0c (diff) | |
| parent | bf257adbf5808cfe3b0f9399442d8acd1e218760 (diff) | |
Merge pull request #40434 from naithar/feature/ios-moltenVK
[iOS] Basic Vulkan/Metal Support
Diffstat (limited to 'core')
| -rw-r--r-- | core/callable_method_pointer.h | 4 | ||||
| -rw-r--r-- | core/variant.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/core/callable_method_pointer.h b/core/callable_method_pointer.h index 22db7d1c82..1bb89e53e1 100644 --- a/core/callable_method_pointer.h +++ b/core/callable_method_pointer.h @@ -131,7 +131,7 @@ void call_with_variant_args_helper(T *p_instance, void (T::*p_method)(P...), con #ifdef DEBUG_METHODS_ENABLED (p_instance->*p_method)(VariantCasterAndValidate<P>::cast(p_args, Is, r_error)...); #else - (p_instance->*p_method)(VariantCaster<P>::cast(p_args[Is])...); + (p_instance->*p_method)(VariantCaster<P>::cast(*p_args[Is])...); #endif } @@ -228,7 +228,7 @@ void call_with_variant_args_ret_helper(T *p_instance, R (T::*p_method)(P...), co #ifdef DEBUG_METHODS_ENABLED r_ret = (p_instance->*p_method)(VariantCasterAndValidate<P>::cast(p_args, Is, r_error)...); #else - (p_instance->*p_method)(VariantCaster<P>::cast(p_args[Is])...); + (p_instance->*p_method)(VariantCaster<P>::cast(*p_args[Is])...); #endif } diff --git a/core/variant.cpp b/core/variant.cpp index f6b7e2821a..afd01b3359 100644 --- a/core/variant.cpp +++ b/core/variant.cpp @@ -1454,7 +1454,7 @@ Variant::operator signed long() const { case INT: return _data._int; case FLOAT: - return _data._real; + return _data._float; case STRING: return operator String().to_int(); default: { @@ -1474,7 +1474,7 @@ Variant::operator unsigned long() const { case INT: return _data._int; case FLOAT: - return _data._real; + return _data._float; case STRING: return operator String().to_int(); default: { |