diff options
author | Ignacio Roldán Etcheverry <neikeq@users.noreply.github.com> | 2020-03-17 18:38:44 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-17 18:38:44 +0100 |
commit | 989a223c5a6d6ba5b1b098be8983888cb49b2525 (patch) | |
tree | c711ecab3dd3cf03c6305af491194284735871ec /modules/mono/mono_gd/gd_mono_field.h | |
parent | 6c74f38f0b79930ede23d3c15423f17947757534 (diff) | |
parent | 6a85cdf640d735b1ca8216b4c6e16fb949f4d183 (diff) |
Merge pull request #37050 from neikeq/fix-mono-after-vulkan-merge
Fix C# bindings after recent breaking changes
Diffstat (limited to 'modules/mono/mono_gd/gd_mono_field.h')
-rw-r--r-- | modules/mono/mono_gd/gd_mono_field.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/modules/mono/mono_gd/gd_mono_field.h b/modules/mono/mono_gd/gd_mono_field.h index 76ee0963c4..61f2c8f071 100644 --- a/modules/mono/mono_gd/gd_mono_field.h +++ b/modules/mono/mono_gd/gd_mono_field.h @@ -47,21 +47,22 @@ class GDMonoField : public IMonoClassMember { MonoCustomAttrInfo *attributes; public: - virtual GDMonoClass *get_enclosing_class() const GD_FINAL { return owner; } + virtual GDMonoClass *get_enclosing_class() const final { return owner; } - virtual MemberType get_member_type() const GD_FINAL { return MEMBER_TYPE_FIELD; } + virtual MemberType get_member_type() const final { return MEMBER_TYPE_FIELD; } - virtual StringName get_name() const GD_FINAL { return name; } + virtual StringName get_name() const final { return name; } - virtual bool is_static() GD_FINAL; - virtual Visibility get_visibility() GD_FINAL; + virtual bool is_static() final; + virtual Visibility get_visibility() final; - virtual bool has_attribute(GDMonoClass *p_attr_class) GD_FINAL; - virtual MonoObject *get_attribute(GDMonoClass *p_attr_class) GD_FINAL; + virtual bool has_attribute(GDMonoClass *p_attr_class) final; + virtual MonoObject *get_attribute(GDMonoClass *p_attr_class) final; void fetch_attributes(); _FORCE_INLINE_ ManagedType get_type() const { return type; } + void set_value(MonoObject *p_object, MonoObject *p_value); void set_value_raw(MonoObject *p_object, void *p_ptr); void set_value_from_variant(MonoObject *p_object, const Variant &p_value); |