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 /modules/mono/mono_gd/gd_mono_utils.cpp | |
parent | 50d1e0ea99dfa9a127cf99029cd71a1b0931c617 (diff) | |
parent | 04688b92fff1d6bbec9335b354f3751ddc473379 (diff) |
Merge pull request #49312 from RandomShaper/reference_to_ref_count
Rename `Reference` to `RefCounted`
Diffstat (limited to 'modules/mono/mono_gd/gd_mono_utils.cpp')
-rw-r--r-- | modules/mono/mono_gd/gd_mono_utils.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/modules/mono/mono_gd/gd_mono_utils.cpp b/modules/mono/mono_gd/gd_mono_utils.cpp index 52bdc6ff01..cf2859c319 100644 --- a/modules/mono/mono_gd/gd_mono_utils.cpp +++ b/modules/mono/mono_gd/gd_mono_utils.cpp @@ -36,7 +36,7 @@ #include "core/debugger/engine_debugger.h" #include "core/debugger/script_debugger.h" #include "core/io/dir_access.h" -#include "core/object/reference.h" +#include "core/object/ref_counted.h" #include "core/os/mutex.h" #include "core/os/os.h" @@ -108,15 +108,15 @@ MonoObject *unmanaged_get_managed(Object *unmanaged) { gchandle = MonoGCHandleData::new_strong_handle(mono_object); // Tie managed to unmanaged - Reference *ref = Object::cast_to<Reference>(unmanaged); + RefCounted *rc = Object::cast_to<RefCounted>(unmanaged); - if (ref) { + if (rc) { // Unsafe refcount increment. The managed instance also counts as a reference. // This way if the unmanaged world has no references to our owner // but the managed instance is alive, the refcount will be 1 instead of 0. // See: godot_icall_Reference_Dtor(MonoObject *p_obj, Object *p_ptr) - ref->reference(); - CSharpLanguage::get_singleton()->post_unsafe_reference(ref); + rc->reference(); + CSharpLanguage::get_singleton()->post_unsafe_reference(rc); } return mono_object; |