Browse Source

Merge pull request #33012 from madmiraal/vmap-array-operator

Initialise VMap and HashMap values to the default when they are created.
Rémi Verschelde 5 years ago
parent
commit
31ca1f5aa1
2 changed files with 2 additions and 2 deletions
  1. 1 0
      core/hash_map.h
  2. 1 2
      core/vmap.h

+ 1 - 0
core/hash_map.h

@@ -210,6 +210,7 @@ private:
 		e->next = hash_table[index];
 		e->next = hash_table[index];
 		e->hash = hash;
 		e->hash = hash;
 		e->pair.key = p_key;
 		e->pair.key = p_key;
+		e->pair.data = TData();
 
 
 		hash_table[index] = e;
 		hash_table[index] = e;
 		elements++;
 		elements++;

+ 1 - 2
core/vmap.h

@@ -196,8 +196,7 @@ public:
 
 
 		int pos = _find_exact(p_key);
 		int pos = _find_exact(p_key);
 		if (pos < 0) {
 		if (pos < 0) {
-			V val;
-			pos = insert(p_key, val);
+			pos = insert(p_key, V());
 		}
 		}
 
 
 		return _cowdata.get_m(pos).value;
 		return _cowdata.get_m(pos).value;