Non const value access for ordered map.

Author: kovacsv

Sources/NodeEngine/NE_OrderedMap.hpp

@@ -26,9 +26,11 @@ class OrderedMap
 
 	bool			IsEmpty () const;
 	bool			Contains (const Key& key) const;
-	const Value&	GetValue (const Key& key) const;
 	size_t			Count () const;
 
+	Value&			GetValue (const Key& key);
+	const Value&	GetValue (const Key& key) const;
+
 	bool			Insert (const Key& key, const Value& value);
 	bool			InsertBefore (const Key& key, const Value& value, const Key& nextKey);
 	bool			InsertAfter (const Key& key, const Value& value, const Key& prevKey);
@@ -117,17 +119,25 @@ bool OrderedMap<Key, Value>::Contains (const Key& key) const
 }
 
 template <typename Key, typename Value>
-const Value& OrderedMap<Key, Value>::GetValue (const Key& key) const
+size_t OrderedMap<Key, Value>::Count () const
 {
-	const Iterator& iterator = keyToValueMap.at (key);
-	const KeyValue& keyValue = *iterator;
+	return keyToValueMap.size ();
+}
+
+template <typename Key, typename Value>
+Value& OrderedMap<Key, Value>::GetValue (const Key& key)
+{
+	Iterator& iterator = keyToValueMap.at (key);
+	KeyValue& keyValue = *iterator;
 	return keyValue.second;
 }
 
 template <typename Key, typename Value>
-size_t OrderedMap<Key, Value>::Count () const
+const Value& OrderedMap<Key, Value>::GetValue (const Key& key) const
 {
-	return keyToValueMap.size ();
+	const Iterator& iterator = keyToValueMap.at (key);
+	const KeyValue& keyValue = *iterator;
+	return keyValue.second;
 }
 
 template <typename Key, typename Value>

Sources/NodeEngineTest/OrderedMapTest.cpp

@@ -80,7 +80,7 @@ TEST (OrderedMapConstEnumerateTest)
 	ASSERT (numbers == enumeratedNumbers);
 }
 
-TEST (OrderedMapNonConstEnumerateTest)
+TEST (OrderedMapNonConstTest)
 {
 	OrderedMap<int, std::string> map;
 	std::vector<std::string> numbers = { "one", "two", "three", "four", "five" };
@@ -105,6 +105,16 @@ TEST (OrderedMapNonConstEnumerateTest)
 	});
 
 	ASSERT (enumeratedNumbers == std::vector<std::string> ({ "reset", "reset", "reset", "reset", "reset" }));
+
+	std::string& threeVal = map.GetValue (3);
+	threeVal = "newThreeVal";
+	ASSERT (map.GetValue (3) == "newThreeVal");
+	enumeratedNumbers.clear ();
+	map.Enumerate ([&] (const std::string& number) {
+		enumeratedNumbers.push_back (number);
+		return true;
+	});
+	ASSERT (enumeratedNumbers == std::vector<std::string> ({ "reset", "reset", "newThreeVal", "reset", "reset" }));
 }
 
 TEST (OrderedMapOrderAfterDeleteTest)