asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid the need for copy assignment in HashMap key/data types

Browse source
This commit is contained in:
Pedro J. Estébanez 2021-02-17 13:12:38 +01:00
parent 58aa020a19
commit 73697d4de6
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
core/templates/hash_map.h
View file

@ -62,7 +62,9 @@ public:
TKey key;
TData data;
Pair() {}
Pair(const TKey &p_key) :
key(p_key),
data() {}
Pair(const TKey &p_key, const TData &p_data) :
key(p_key),
data(p_data) {
@ -90,6 +92,11 @@ public:
const TData &value() const {
return pair.value();
}
Element(const TKey &p_key) :
pair(p_key) {}
Element(const Element &p_other) :
pair(p_other.pair.key, p_other.pair.data) {}
};
private:
@ -192,14 +199,12 @@ private:
Element *create_element(const TKey &p_key) {
/* if element doesn't exist, create it */
Element *e = memnew(Element);
Element *e = memnew(Element(p_key));
ERR_FAIL_COND_V_MSG(!e, nullptr, "Out of memory.");
uint32_t hash = Hasher::hash(p_key);
uint32_t index = hash & ((1 << hash_table_power) - 1);
e->next = hash_table[index];
e->hash = hash;
e->pair.key = p_key;
e->pair.data = TData();
hash_table[index] = e;
elements++;
@ -228,9 +233,7 @@ private:
const Element *e = p_t.hash_table[i];
while (e) {
Element *le = memnew(Element); /* local element */
*le = *e; /* copy data */
Element *le = memnew(Element(*e)); /* local element */
/* add to list and reassign pointers */
le->next = hash_table[i];