diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-05-12 12:36:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-12 12:36:43 +0200 |
| commit | edda6ee9f82ec94f993ebf44486ab7d8abcef193 (patch) | |
| tree | 691c51ea7516990b94303afa334d70c66c512cc4 /core/object/object.h | |
| parent | 9b7e16a6b8b80fe61881e8f4df28550e18050dd2 (diff) | |
| parent | 8b7c7f5a753b43cec10f72b274bb1d70c253652b (diff) | |
Merge pull request #60881 from reduz/new-hash-map
Diffstat (limited to 'core/object/object.h')
| -rw-r--r-- | core/object/object.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/core/object/object.h b/core/object/object.h index c3e3c68b59..00cb73593b 100644 --- a/core/object/object.h +++ b/core/object/object.h @@ -39,7 +39,6 @@ #include "core/templates/hash_map.h" #include "core/templates/list.h" #include "core/templates/map.h" -#include "core/templates/ordered_hash_map.h" #include "core/templates/safe_refcount.h" #include "core/templates/set.h" #include "core/templates/vmap.h" @@ -515,8 +514,8 @@ private: #endif ScriptInstance *script_instance = nullptr; Variant script; // Reference does not exist yet, store it in a Variant. - OrderedHashMap<StringName, Variant> metadata; - HashMap<StringName, OrderedHashMap<StringName, Variant>::Element> metadata_properties; + HashMap<StringName, Variant> metadata; + HashMap<StringName, Variant *> metadata_properties; mutable StringName _class_name; mutable const StringName *_class_ptr = nullptr; |