From ce352ce5b4f0e4718ba3ecd1b12d59854b617182 Mon Sep 17 00:00:00 2001 From: Marcel Admiraal Date: Wed, 23 Oct 2019 14:52:29 +0200 Subject: [PATCH] Initialise VMap and HashMap values to the default when they are created. Assigns a default value in VMap and HashMap when new keys are created using the array operator so they are the same as the other Map classes. The non const version of the array operator can be used for both assigning a value and retrieving a writeable version. In the Map template classes the assign version is being used to create new keys, but sometimes not assigning a value when retrieving a writeable version. This does not address the problem that the default value may not be the correct one, and it does not address the problem that new keys probably should not be created when the array operator is used. These problems will be addressed in a separate commit. --- core/hash_map.h | 1 + core/vmap.h | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/hash_map.h b/core/hash_map.h index 38da1d59ab9..edc67e78062 100644 --- a/core/hash_map.h +++ b/core/hash_map.h @@ -210,6 +210,7 @@ private: e->next = hash_table[index]; e->hash = hash; e->pair.key = p_key; + e->pair.data = TData(); hash_table[index] = e; elements++; diff --git a/core/vmap.h b/core/vmap.h index fde9723d716..ed66b46993e 100644 --- a/core/vmap.h +++ b/core/vmap.h @@ -196,8 +196,7 @@ public: int pos = _find_exact(p_key); if (pos < 0) { - V val; - pos = insert(p_key, val); + pos = insert(p_key, V()); } return _cowdata.get_m(pos).value;