diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-11-19 16:43:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-19 16:43:20 +0100 |
| commit | 4a088879502a1ac80c6ab791d79b7a5482aef811 (patch) | |
| tree | 13fbce78ae209ae41ecb65dcdd3ff09805f513fc | |
| parent | 3b596cdbe046c4a4ed0cca51c5cd961e4c7dfeea (diff) | |
| parent | b51b3dc03088dba90ca6dae8b9ecd20dd7e96da2 (diff) | |
Merge pull request #13016 from neikeq/issue-13011
Mono: Fix compiler error with Variant::operator AABB()
| -rw-r--r-- | modules/mono/mono_gd/gd_mono_field.cpp | 2 | ||||
| -rw-r--r-- | modules/mono/mono_gd/gd_mono_marshal.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/mono/mono_gd/gd_mono_field.cpp b/modules/mono/mono_gd/gd_mono_field.cpp index 1bee1115a6..eb34f9dd3f 100644 --- a/modules/mono/mono_gd/gd_mono_field.cpp +++ b/modules/mono/mono_gd/gd_mono_field.cpp @@ -41,7 +41,7 @@ void GDMonoField::set_value_raw(MonoObject *p_object, void *p_ptr) { void GDMonoField::set_value(MonoObject *p_object, const Variant &p_value) { #define SET_FROM_STRUCT_AND_BREAK(m_type) \ { \ - const m_type &val = p_value.operator m_type(); \ + const m_type &val = p_value.operator ::m_type(); \ MARSHALLED_OUT(m_type, val, raw); \ mono_field_set_value(p_object, mono_field, raw); \ break; \ diff --git a/modules/mono/mono_gd/gd_mono_marshal.cpp b/modules/mono/mono_gd/gd_mono_marshal.cpp index 9c415951bb..8bc2bb5096 100644 --- a/modules/mono/mono_gd/gd_mono_marshal.cpp +++ b/modules/mono/mono_gd/gd_mono_marshal.cpp @@ -36,7 +36,7 @@ namespace GDMonoMarshal { #define RETURN_BOXED_STRUCT(m_t, m_var_in) \ { \ - const m_t &m_in = m_var_in->operator m_t(); \ + const m_t &m_in = m_var_in->operator ::m_t(); \ MARSHALLED_OUT(m_t, m_in, raw); \ return mono_value_box(mono_domain_get(), CACHED_CLASS_RAW(m_t), raw); \ } |