diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-05-14 23:09:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-14 23:09:03 +0200 |
| commit | 00949f0c5fcc6a4f8382a4a97d5591fd9ec380f8 (patch) | |
| tree | 2b1c31f45add24085b64425ce440f577424c16a1 /core/callable_method_pointer.h | |
| parent | 5046f666a1181675b39f156c38346525dc1c444e (diff) | |
| parent | 0ee0fa42e6639b6fa474b7cf6afc6b1a78142185 (diff) | |
Merge pull request #38738 from akien-mga/cause-we-never-go-out-of-style
Style: Remove new line at block start, enforce line between functions, enforce braces in if and loop blocks
Diffstat (limited to 'core/callable_method_pointer.h')
| -rw-r--r-- | core/callable_method_pointer.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/core/callable_method_pointer.h b/core/callable_method_pointer.h index fb809c2b44..3b0503e259 100644 --- a/core/callable_method_pointer.h +++ b/core/callable_method_pointer.h @@ -38,7 +38,6 @@ #include "core/simple_type.h" class CallableCustomMethodPointerBase : public CallableCustom { - uint32_t *comp_ptr; uint32_t comp_size; uint32_t h; @@ -74,7 +73,6 @@ public: template <class T> struct VariantCasterAndValidate { - static _FORCE_INLINE_ T cast(const Variant **p_args, uint32_t p_arg_idx, Callable::CallError &r_error) { Variant::Type argtype = GetTypeInfo<T>::VARIANT_TYPE; if (!Variant::can_convert_strict(p_args[p_arg_idx]->get_type(), argtype)) { @@ -89,7 +87,6 @@ struct VariantCasterAndValidate { template <class T> struct VariantCasterAndValidate<T &> { - static _FORCE_INLINE_ T cast(const Variant **p_args, uint32_t p_arg_idx, Callable::CallError &r_error) { Variant::Type argtype = GetTypeInfo<T>::VARIANT_TYPE; if (!Variant::can_convert_strict(p_args[p_arg_idx]->get_type(), argtype)) { @@ -104,7 +101,6 @@ struct VariantCasterAndValidate<T &> { template <class T> struct VariantCasterAndValidate<const T &> { - static _FORCE_INLINE_ T cast(const Variant **p_args, uint32_t p_arg_idx, Callable::CallError &r_error) { Variant::Type argtype = GetTypeInfo<T>::VARIANT_TYPE; if (!Variant::can_convert_strict(p_args[p_arg_idx]->get_type(), argtype)) { @@ -163,7 +159,6 @@ void call_with_variant_args(T *p_instance, void (T::*p_method)(P...), const Vari template <class T, class... P> class CallableCustomMethodPointer : public CallableCustomMethodPointerBase { - struct Data { T *instance; void (T::*method)(P...); @@ -173,7 +168,6 @@ public: virtual ObjectID get_object() const { return data.instance->get_instance_id(); } virtual void call(const Variant **p_arguments, int p_argcount, Variant &r_return_value, Callable::CallError &r_call_error) const { - call_with_variant_args(data.instance, data.method, p_arguments, p_argcount, r_call_error); } @@ -246,7 +240,6 @@ void call_with_variant_args_ret(T *p_instance, R (T::*p_method)(P...), const Var template <class T, class R, class... P> class CallableCustomMethodPointerRet : public CallableCustomMethodPointerBase { - struct Data { T *instance; R(T::*method) @@ -257,7 +250,6 @@ public: virtual ObjectID get_object() const { return data.instance->get_instance_id(); } virtual void call(const Variant **p_arguments, int p_argcount, Variant &r_return_value, Callable::CallError &r_call_error) const { - call_with_variant_args_ret(data.instance, data.method, p_arguments, p_argcount, r_return_value, r_call_error); } |