diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-05-16 11:59:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-16 11:59:38 +0200 |
| commit | c1277c2183eaacb9ae49f9fef0c57443b934b72b (patch) | |
| tree | 434b526eb286850ebccc6d2c998a7d90fdb8b5e2 /core/variant/variant_call.cpp | |
| parent | 396def9b66c476f7834604adb7136ca903ed01be (diff) | |
| parent | 746dddc0673d7261f19b1e056e90e6e3a49ef33a (diff) | |
Merge pull request #60999 from reduz/replace-rbhash-by-hashmap
Diffstat (limited to 'core/variant/variant_call.cpp')
| -rw-r--r-- | core/variant/variant_call.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/core/variant/variant_call.cpp b/core/variant/variant_call.cpp index 882a89b8ba..a3568a8d6a 100644 --- a/core/variant/variant_call.cpp +++ b/core/variant/variant_call.cpp @@ -919,11 +919,11 @@ struct _VariantCall { } struct ConstantData { - Map<StringName, int> value; + HashMap<StringName, int> value; #ifdef DEBUG_ENABLED List<StringName> value_ordered; #endif - Map<StringName, Variant> variant_value; + HashMap<StringName, Variant> variant_value; #ifdef DEBUG_ENABLED List<StringName> variant_value_ordered; #endif @@ -1281,14 +1281,14 @@ Variant Variant::get_constant_value(Variant::Type p_type, const StringName &p_va ERR_FAIL_INDEX_V(p_type, Variant::VARIANT_MAX, 0); _VariantCall::ConstantData &cd = _VariantCall::constant_data[p_type]; - Map<StringName, int>::Element *E = cd.value.find(p_value); + HashMap<StringName, int>::Iterator E = cd.value.find(p_value); if (!E) { - Map<StringName, Variant>::Element *F = cd.variant_value.find(p_value); + HashMap<StringName, Variant>::Iterator F = cd.variant_value.find(p_value); if (F) { if (r_valid) { *r_valid = true; } - return F->get(); + return F->value; } else { return -1; } @@ -1297,7 +1297,7 @@ Variant Variant::get_constant_value(Variant::Type p_type, const StringName &p_va *r_valid = true; } - return E->get(); + return E->value; } #ifdef DEBUG_METHODS_ENABLED |