diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-07-27 08:05:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-27 08:05:15 +0200 |
| commit | 7cbdb9b4c36dfd44ab120d5bce37f0a27439ca6b (patch) | |
| tree | 5cee0ad9c78b8abff48bfff6280fa055d352d998 /modules/mono/mono_gd | |
| parent | ae1b124e1432beb8d25ee4a89f6a5c9af2876ea8 (diff) | |
| parent | 3fe67fb5ad1b8fd7c5e099190de31e9d9e08d0d2 (diff) | |
Merge pull request #50917 from raulsntos/more-iterators
Diffstat (limited to 'modules/mono/mono_gd')
| -rw-r--r-- | modules/mono/mono_gd/gd_mono_assembly.cpp | 4 | ||||
| -rw-r--r-- | modules/mono/mono_gd/gd_mono_class.cpp | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/modules/mono/mono_gd/gd_mono_assembly.cpp b/modules/mono/mono_gd/gd_mono_assembly.cpp index 67d6f3ef29..67f38bf127 100644 --- a/modules/mono/mono_gd/gd_mono_assembly.cpp +++ b/modules/mono/mono_gd/gd_mono_assembly.cpp @@ -330,8 +330,8 @@ no_pdb: void GDMonoAssembly::unload() { ERR_FAIL_NULL(image); // Should not be called if already unloaded - for (Map<MonoClass *, GDMonoClass *>::Element *E = cached_raw.front(); E; E = E->next()) { - memdelete(E->value()); + for (const KeyValue<MonoClass *, GDMonoClass *> &E : cached_raw) { + memdelete(E.value); } cached_classes.clear(); diff --git a/modules/mono/mono_gd/gd_mono_class.cpp b/modules/mono/mono_gd/gd_mono_class.cpp index f9fddd931b..27b4ac7fa7 100644 --- a/modules/mono/mono_gd/gd_mono_class.cpp +++ b/modules/mono/mono_gd/gd_mono_class.cpp @@ -522,12 +522,12 @@ GDMonoClass::~GDMonoClass() { mono_custom_attrs_free(attributes); } - for (Map<StringName, GDMonoField *>::Element *E = fields.front(); E; E = E->next()) { - memdelete(E->value()); + for (const KeyValue<StringName, GDMonoField *> &E : fields) { + memdelete(E.value); } - for (Map<StringName, GDMonoProperty *>::Element *E = properties.front(); E; E = E->next()) { - memdelete(E->value()); + for (const KeyValue<StringName, GDMonoProperty *> &E : properties) { + memdelete(E.value); } { |