summaryrefslogtreecommitdiffstats
path: root/modules/mono/mono_gd/gd_mono.h
diff options
context:
space:
mode:
authorIgnacio Etcheverry <neikeq@users.noreply.github.com>2018-10-25 18:18:40 +0200
committerGitHub <noreply@github.com>2018-10-25 18:18:40 +0200
commitd47cec43f2f4ef2cd6d1a0acf6e99a9dd8d31eef (patch)
tree5dd8beb564a74a8fd52d98f4ca727077532bfad2 /modules/mono/mono_gd/gd_mono.h
parentdbaa22329761ce7a4d8bab291871b5b5ba359cbe (diff)
parent1aac95a7375e58bacade69ed12f9dade484a03a8 (diff)
downloadredot-engine-d47cec43f2f4ef2cd6d1a0acf6e99a9dd8d31eef.tar.gz
Merge pull request #23162 from neikeq/cc
Proper support for namespaces and other enhancement/fixes
Diffstat (limited to 'modules/mono/mono_gd/gd_mono.h')
-rw-r--r--modules/mono/mono_gd/gd_mono.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/modules/mono/mono_gd/gd_mono.h b/modules/mono/mono_gd/gd_mono.h
index 745dcc34eb..fd9551b6de 100644
--- a/modules/mono/mono_gd/gd_mono.h
+++ b/modules/mono/mono_gd/gd_mono.h
@@ -199,8 +199,7 @@ public:
bool load_assembly(const String &p_name, GDMonoAssembly **r_assembly, bool p_refonly = false);
bool load_assembly(const String &p_name, MonoAssemblyName *p_aname, GDMonoAssembly **r_assembly, bool p_refonly = false);
- bool load_assembly_from(const String &p_name, const String &p_basedir, GDMonoAssembly **r_assembly, bool p_refonly = false);
- bool load_assembly_from(const String &p_name, const String &p_basedir, MonoAssemblyName *p_aname, GDMonoAssembly **r_assembly, bool p_refonly = false);
+ bool load_assembly_from(const String &p_name, const String &p_path, GDMonoAssembly **r_assembly, bool p_refonly = false);
Error finalize_and_unload_domain(MonoDomain *p_domain);