Browse Source

Mono: Fix build regression due to wrong return type

Ignacio Etcheverry 7 years ago
parent
commit
5e57beebb1
2 changed files with 4 additions and 4 deletions
  1. 2 2
      modules/mono/csharp_script.cpp
  2. 2 2
      modules/mono/csharp_script.h

+ 2 - 2
modules/mono/csharp_script.cpp

@@ -1456,7 +1456,7 @@ MonoObject *CSharpInstance::_internal_new_managed() {
 	return mono_object;
 	return mono_object;
 }
 }
 
 
-bool CSharpInstance::mono_object_disposed(MonoObject *p_obj) {
+void CSharpInstance::mono_object_disposed(MonoObject *p_obj) {
 
 
 #ifdef DEBUG_ENABLED
 #ifdef DEBUG_ENABLED
 	CRASH_COND(base_ref == true);
 	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);
 	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
 #ifdef DEBUG_ENABLED
 	CRASH_COND(base_ref == false);
 	CRASH_COND(base_ref == false);

+ 2 - 2
modules/mono/csharp_script.h

@@ -215,8 +215,8 @@ public:
 	virtual void call_multilevel(const StringName &p_method, const Variant **p_args, int p_argcount);
 	virtual void call_multilevel(const StringName &p_method, const Variant **p_args, int p_argcount);
 	virtual void call_multilevel_reversed(const StringName &p_method, const Variant **p_args, int p_argcount);
 	virtual void call_multilevel_reversed(const StringName &p_method, const Variant **p_args, int p_argcount);
 
 
-	bool mono_object_disposed(MonoObject *p_obj);
-	bool mono_object_disposed_baseref(MonoObject *p_obj, bool p_is_finalizer, bool &r_owner_deleted);
+	void mono_object_disposed(MonoObject *p_obj);
+	void mono_object_disposed_baseref(MonoObject *p_obj, bool p_is_finalizer, bool &r_owner_deleted);
 
 
 	virtual void refcount_incremented();
 	virtual void refcount_incremented();
 	virtual bool refcount_decremented();
 	virtual bool refcount_decremented();