diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-11-24 07:59:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-24 07:59:56 +0100 |
| commit | 96e70ac5f4f477eee3866ea788389a87d0dbd086 (patch) | |
| tree | 21fb39b40de2674a99018d88e142e6f0196c68b0 /core/variant/variant_setget.cpp | |
| parent | 5efe80f3085c8c6451363fe4c743bf3d7fc20b6c (diff) | |
| parent | e078f970db0e72bcc665d714416e6fc74e8434a6 (diff) | |
Merge pull request #50139 from LightningAA/rename-remove-to-remove-at
Rename `remove()` to `remove_at()` when removing by index
Diffstat (limited to 'core/variant/variant_setget.cpp')
| -rw-r--r-- | core/variant/variant_setget.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/variant/variant_setget.cpp b/core/variant/variant_setget.cpp index 2530d77c62..b6ad2d870e 100644 --- a/core/variant/variant_setget.cpp +++ b/core/variant/variant_setget.cpp @@ -704,7 +704,7 @@ struct VariantIndexedSetGet_String { String *b = VariantGetInternalPtr<String>::get_ptr(base); const String *v = VariantInternal::get_string(value); if (v->length() == 0) { - b->remove(index); + b->remove_at(index); } else { b->set(index, v->get(0)); } @@ -723,7 +723,7 @@ struct VariantIndexedSetGet_String { String *b = VariantGetInternalPtr<String>::get_ptr(base); const String *v = VariantInternal::get_string(value); if (v->length() == 0) { - b->remove(index); + b->remove_at(index); } else { b->set(index, v->get(0)); } @@ -738,7 +738,7 @@ struct VariantIndexedSetGet_String { OOB_TEST(index, v.length()); const String &m = *reinterpret_cast<const String *>(member); if (unlikely(m.length() == 0)) { - v.remove(index); + v.remove_at(index); } else { v.set(index, m.unicode_at(0)); } |