godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-06 12:20:30 +00:00
Code Releases Wiki Activity

Mono: Fix compiler error with Variant::operator AABB()

Browse Source
This commit is contained in:
Ignacio Etcheverry
2017-11-18 18:13:57 +01:00
parent 63283eca55
commit b51b3dc030
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/mono/mono_gd/gd_mono_field.cpp
View File

@@ -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) { void GDMonoField::set_value(MonoObject *p_object, const Variant &p_value) {
#define SET_FROM_STRUCT_AND_BREAK(m_type) \ #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); \ MARSHALLED_OUT(m_type, val, raw); \
mono_field_set_value(p_object, mono_field, raw); \ mono_field_set_value(p_object, mono_field, raw); \
break; \ break; \

2
modules/mono/mono_gd/gd_mono_marshal.cpp
View File

@@ -36,7 +36,7 @@ namespace GDMonoMarshal {
#define RETURN_BOXED_STRUCT(m_t, m_var_in) \ #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); \ MARSHALLED_OUT(m_t, m_in, raw); \
return mono_value_box(mono_domain_get(), CACHED_CLASS_RAW(m_t), raw); \ return mono_value_box(mono_domain_get(), CACHED_CLASS_RAW(m_t), raw); \
} }