diff options
Diffstat (limited to 'core/callable.h')
| -rw-r--r-- | core/callable.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/core/callable.h b/core/callable.h index 7fa024dccd..7fd6b54cf7 100644 --- a/core/callable.h +++ b/core/callable.h @@ -45,11 +45,10 @@ class CallableCustom; // but can be optimized or customized. class Callable { - //needs to be max 16 bytes in 64 bits StringName method; union { - uint64_t object; + uint64_t object = 0; CallableCustom *custom; }; @@ -75,7 +74,7 @@ public: return method == StringName() && object == 0; } _FORCE_INLINE_ bool is_custom() const { - return method == StringName() && custom != 0; + return method == StringName() && custom != nullptr; } _FORCE_INLINE_ bool is_standard() const { return method != StringName(); @@ -100,14 +99,14 @@ public: Callable(ObjectID p_object, const StringName &p_method); Callable(CallableCustom *p_custom); Callable(const Callable &p_callable); - Callable(); + Callable() {} ~Callable(); }; class CallableCustom { friend class Callable; SafeRefCount ref_count; - bool referenced; + bool referenced = false; public: typedef bool (*CompareEqualFunc)(const CallableCustom *p_a, const CallableCustom *p_b); @@ -156,7 +155,7 @@ public: Array get_connections() const; Signal(const Object *p_object, const StringName &p_name); Signal(ObjectID p_object, const StringName &p_name); - Signal(); + Signal() {} }; #endif // CALLABLE_H |