diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2018-08-15 01:08:23 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-15 01:08:23 +0200 |
commit | 4548ec4a492402402cb737e6abc17cb3c25672c4 (patch) | |
tree | c42ac12820158b8bca1dee1871be12e32b854036 /modules | |
parent | 5d86b1e1557500df787852849f7d853e3900b898 (diff) | |
parent | 21d285e30fac8753bf2e1422054907d6b9c21150 (diff) |
Merge pull request #20945 from neikeq/dict-erase-retbool
Dictionary: remove erase_checked(key), make erase(key) return bool
Diffstat (limited to 'modules')
-rw-r--r-- | modules/mono/glue/collections_glue.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/mono/glue/collections_glue.cpp b/modules/mono/glue/collections_glue.cpp index 0551c1991a..148bb32398 100644 --- a/modules/mono/glue/collections_glue.cpp +++ b/modules/mono/glue/collections_glue.cpp @@ -182,7 +182,7 @@ bool godot_icall_Dictionary_ContainsKey(Dictionary *ptr, MonoObject *key) { } bool godot_icall_Dictionary_RemoveKey(Dictionary *ptr, MonoObject *key) { - return ptr->erase_checked(GDMonoMarshal::mono_object_to_variant(key)); + return ptr->erase(GDMonoMarshal::mono_object_to_variant(key)); } bool godot_icall_Dictionary_Remove(Dictionary *ptr, MonoObject *key, MonoObject *value) { @@ -191,7 +191,7 @@ bool godot_icall_Dictionary_Remove(Dictionary *ptr, MonoObject *key, MonoObject // no dupes Variant *ret = ptr->getptr(varKey); if (ret != NULL && *ret == GDMonoMarshal::mono_object_to_variant(value)) { - ptr->erase_checked(varKey); + ptr->erase(varKey); return true; } |