diff options
| author | Ignacio Etcheverry <neikeq@users.noreply.github.com> | 2018-09-12 22:08:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-12 22:08:54 +0200 |
| commit | 8704b7787624da98cece35c1b8b8e51bde709488 (patch) | |
| tree | 398ab2ee1e88e3b853c6157458362dced14d64da /modules/mono/csharp_script.cpp | |
| parent | 4cd3dd821932660a7d89d90da7626fa46c07ac39 (diff) | |
| parent | 995a40e8efa9f7a868a6706e30c476305e16180b (diff) | |
| download | redot-engine-8704b7787624da98cece35c1b8b8e51bde709488.tar.gz | |
Merge pull request #22007 from neikeq/<name_of_your_new_branch>
Move modules/mono/glue/cs_files to modules/mono/glue/Managed/Files
Diffstat (limited to 'modules/mono/csharp_script.cpp')
| -rw-r--r-- | modules/mono/csharp_script.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/mono/csharp_script.cpp b/modules/mono/csharp_script.cpp index ec7d700bca..b9209fce92 100644 --- a/modules/mono/csharp_script.cpp +++ b/modules/mono/csharp_script.cpp @@ -1456,7 +1456,7 @@ MonoObject *CSharpInstance::_internal_new_managed() { return mono_object; } -bool CSharpInstance::mono_object_disposed(MonoObject *p_obj) { +void CSharpInstance::mono_object_disposed(MonoObject *p_obj) { #ifdef DEBUG_ENABLED CRASH_COND(base_ref == true); @@ -1465,7 +1465,7 @@ bool CSharpInstance::mono_object_disposed(MonoObject *p_obj) { CSharpLanguage::get_singleton()->release_script_gchandle(p_obj, gchandle); } -bool CSharpInstance::mono_object_disposed_baseref(MonoObject *p_obj, bool p_is_finalizer, bool &r_owner_deleted) { +void CSharpInstance::mono_object_disposed_baseref(MonoObject *p_obj, bool p_is_finalizer, bool &r_owner_deleted) { #ifdef DEBUG_ENABLED CRASH_COND(base_ref == false); |