Merge pull request #64762 from neikeq/csharp-dangling-callable-code

2 files changed, 0 insertions, 85 deletions

diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/Callable.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/Callable.cs
index 8d0e77d171..1b7f5158fd 100644
--- a/modules/mono/glue/GodotSharp/GodotSharp/Core/Callable.cs
+++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/Callable.cs
@@ -149,11 +149,5 @@ namespace Godot
                 NativeFuncs.godotsharp_callable_call_deferred(callable, (godot_variant**)argsPtr, argc);
             }
         }
-
-        [MethodImpl(MethodImplOptions.InternalCall)]
-        internal static extern object godot_icall_Callable_Call(ref Callable callable, object[] args);
-
-        [MethodImpl(MethodImplOptions.InternalCall)]
-        internal static extern void godot_icall_Callable_CallDeferred(ref Callable callable, object[] args);
     }
 }
diff --git a/modules/mono/glue/callable_glue.cpp b/modules/mono/glue/callable_glue.cpp
deleted file mode 100644
index 521dc3dff7..0000000000
--- a/modules/mono/glue/callable_glue.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-/*************************************************************************/
-/*  callable_glue.cpp                                                    */
-/*************************************************************************/
-/*                       This file is part of:                           */
-/*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
-/*************************************************************************/
-/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md).   */
-/*                                                                       */
-/* Permission is hereby granted, free of charge, to any person obtaining */
-/* a copy of this software and associated documentation files (the       */
-/* "Software"), to deal in the Software without restriction, including   */
-/* without limitation the rights to use, copy, modify, merge, publish,   */
-/* distribute, sublicense, and/or sell copies of the Software, and to    */
-/* permit persons to whom the Software is furnished to do so, subject to */
-/* the following conditions:                                             */
-/*                                                                       */
-/* The above copyright notice and this permission notice shall be        */
-/* included in all copies or substantial portions of the Software.       */
-/*                                                                       */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
-/*************************************************************************/
-
-#ifdef MONO_GLUE_ENABLED
-
-#include "../mono_gd/gd_mono_marshal.h"
-#include "arguments_vector.h"
-
-MonoObject *godot_icall_Callable_Call(GDMonoMarshal::M_Callable *p_callable, MonoArray *p_args) {
-	Callable callable = GDMonoMarshal::managed_to_callable(*p_callable);
-
-	int argc = mono_array_length(p_args);
-
-	ArgumentsVector<Variant> arg_store(argc);
-	ArgumentsVector<const Variant *> args(argc);
-
-	for (int i = 0; i < argc; i++) {
-		MonoObject *elem = mono_array_get(p_args, MonoObject *, i);
-		arg_store.set(i, GDMonoMarshal::mono_object_to_variant(elem));
-		args.set(i, &arg_store.get(i));
-	}
-
-	Variant result;
-	Callable::CallError error;
-	callable.callp(args.ptr(), argc, result, error);
-
-	return GDMonoMarshal::variant_to_mono_object(result);
-}
-
-void godot_icall_Callable_CallDeferred(GDMonoMarshal::M_Callable *p_callable, MonoArray *p_args) {
-	Callable callable = GDMonoMarshal::managed_to_callable(*p_callable);
-
-	int argc = mono_array_length(p_args);
-
-	ArgumentsVector<Variant> arg_store(argc);
-	ArgumentsVector<const Variant *> args(argc);
-
-	for (int i = 0; i < argc; i++) {
-		MonoObject *elem = mono_array_get(p_args, MonoObject *, i);
-		arg_store.set(i, GDMonoMarshal::mono_object_to_variant(elem));
-		args.set(i, &arg_store.get(i));
-	}
-
-	callable.call_deferredp(args.ptr(), argc);
-}
-
-void godot_register_callable_icalls() {
-	GDMonoUtils::add_internal_call("Godot.Callable::godot_icall_Callable_Call", godot_icall_Callable_Call);
-	GDMonoUtils::add_internal_call("Godot.Callable::godot_icall_Callable_CallDeferred", godot_icall_Callable_CallDeferred);
-}
-
-#endif // MONO_GLUE_ENABLED