Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-07 22:00:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #113211 from aaronp64/type_by_name_map

Browse source 
Make `Variant::get_type_by_name` `HashMap` initialization thread-safe
This commit is contained in:
Rémi Verschelde 2025-12-02 14:16:41 +01:00
commit 6d4ad21903
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
core/variant/variant.cpp
View file

@ -174,13 +174,16 @@ String Variant::get_type_name(Variant::Type p_type) {
return "";
}
Variant::Type Variant::get_type_by_name(const String &p_type_name) {
static HashMap<String, Type> type_names;
if (unlikely(type_names.is_empty())) {
for (int i = 0; i < VARIANT_MAX; i++) {
type_names[get_type_name((Type)i)] = (Type)i;
}
static HashMap<String, Variant::Type> _init_type_name_map() {
HashMap<String, Variant::Type> type_names;
for (int i = 0; i < Variant::VARIANT_MAX; i++) {
type_names[Variant::get_type_name((Variant::Type)i)] = (Variant::Type)i;
}
return type_names;
}
Variant::Type Variant::get_type_by_name(const String &p_type_name) {
static HashMap<String, Type> type_names = _init_type_name_map();
const Type *ptr = type_names.getptr(p_type_name);
return (ptr == nullptr) ? VARIANT_MAX : *ptr;