diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-06-11 19:46:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-11 19:46:25 +0200 |
| commit | 530e069bc3efef4de535a1973aa016698ffbe334 (patch) | |
| tree | 19d1bf18c36af394a7a2111ec94c633617ea7118 /core/object/object.h | |
| parent | 50d1e0ea99dfa9a127cf99029cd71a1b0931c617 (diff) | |
| parent | 04688b92fff1d6bbec9335b354f3751ddc473379 (diff) | |
Merge pull request #49312 from RandomShaper/reference_to_ref_count
Rename `Reference` to `RefCounted`
Diffstat (limited to 'core/object/object.h')
| -rw-r--r-- | core/object/object.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/object/object.h b/core/object/object.h index 137025f323..37b2e61dfe 100644 --- a/core/object/object.h +++ b/core/object/object.h @@ -545,7 +545,7 @@ private: _FORCE_INLINE_ void _construct_object(bool p_reference); - friend class Reference; + friend class RefCounted; bool type_is_reference = false; SafeNumeric<uint32_t> instance_binding_count; void *_script_instance_bindings[MAX_SCRIPT_INSTANCE_BINDINGS]; @@ -795,7 +795,7 @@ public: void clear_internal_resource_paths(); - _ALWAYS_INLINE_ bool is_reference() const { return type_is_reference; } + _ALWAYS_INLINE_ bool is_ref_counted() const { return type_is_reference; } Object(); virtual ~Object(); @@ -815,7 +815,7 @@ class ObjectDB { struct ObjectSlot { //128 bits per slot uint64_t validator : OBJECTDB_VALIDATOR_BITS; uint64_t next_free : OBJECTDB_SLOT_MAX_COUNT_BITS; - uint64_t is_reference : 1; + uint64_t is_ref_counted : 1; Object *object; }; |