One common hash function for enums.

Author: kovacsv

Sources/NodeUIEngine/NUIE_FeatureToggle.cpp

@@ -1,20 +1,9 @@
 #include "NUIE_FeatureToggle.hpp"
+#include "NUIE_HashUtils.hpp"
 
 #include <unordered_map>
 #include <functional>
 
-namespace std
-{
-	template <>
-	struct hash<NUIE::Feature>
-	{
-		size_t operator() (const NUIE::Feature& featureId) const noexcept
-		{
-			return (size_t) featureId;
-		}
-	};
-}
-
 namespace NUIE
 {
 
@@ -30,7 +19,7 @@ FeatureEnableGuard::~FeatureEnableGuard ()
 	EnableFeature (featureId, oldEnabled);
 }
 
-static std::unordered_map<Feature, bool> features;
+static std::unordered_map<Feature, bool, EnumHash> features;
 
 void EnableFeature (Feature featureId, bool enabled)
 {

Sources/NodeUIEngine/NUIE_HashUtils.hpp

@@ -0,0 +1,13 @@
+#ifndef NUIE_HASHUTILS_HPP
+#define NUIE_HASHUTILS_HPP
+
+struct EnumHash
+{
+	template <typename EnumType>
+	size_t operator() (EnumType enumVal) const
+	{
+		return static_cast<size_t> (enumVal);
+	}
+};
+
+#endif

Sources/NodeUIEngine/NUIE_InputEventHandler.cpp

@@ -13,8 +13,8 @@ ModifierKeys::ModifierKeys () :
 
 }
 
-ModifierKeys::ModifierKeys (const std::unordered_set<ModifierKeyCode>& keys) :
-	keys (keys)
+ModifierKeys::ModifierKeys (const std::initializer_list<ModifierKeyCode>& keyCodes) :
+	keys (keyCodes)
 {
 
 }

Sources/NodeUIEngine/NUIE_InputEventHandler.hpp

@@ -1,6 +1,7 @@
 #ifndef NUIE_INPUTEVENTHANDLER_HPP
 #define NUIE_INPUTEVENTHANDLER_HPP
 
+#include "NUIE_HashUtils.hpp"
 #include "NUIE_Geometry.hpp"
 #include "NUIE_NodeUIEnvironment.hpp"
 
@@ -34,44 +35,18 @@ enum class KeyCode
 	Escape
 };
 
-}
-
-namespace std
-{
-	template <>
-	struct hash<NUIE::MouseButton>
-	{
-		size_t operator() (const NUIE::MouseButton& button) const noexcept
-		{
-			return (size_t) button;
-		}
-	};
-
-	template <>
-	struct hash<NUIE::ModifierKeyCode>
-	{
-		size_t operator() (const NUIE::ModifierKeyCode& keyCode) const noexcept
-		{
-			return (size_t) keyCode;
-		}
-	};
-}
-
-namespace NUIE
-{
-
 class ModifierKeys
 {
 public:
 	ModifierKeys ();
-	ModifierKeys (const std::unordered_set<ModifierKeyCode>& keys);
+	ModifierKeys (const std::initializer_list<ModifierKeyCode>& keyCodes);
 	~ModifierKeys ();
 
 	void	Insert (ModifierKeyCode keyCode);
 	bool	Contains (ModifierKeyCode keyCode) const;
 
 private:
-	std::unordered_set<ModifierKeyCode> keys;
+	std::unordered_set<ModifierKeyCode, EnumHash> keys;
 };
 
 extern const ModifierKeys EmptyModifierKeys;
@@ -109,9 +84,9 @@ class MouseEventTranslator
 	void	OnMouseMove (NodeUIEnvironment& env, const ModifierKeys& modifierKeys, const Point& position);
 
 private:
-	InputEventHandler&						handler;
-	std::unordered_map<MouseButton, Point>	downMouseButtons;
-	std::unordered_set<MouseButton>			movingMouseButtons;
+	InputEventHandler&									handler;
+	std::unordered_map<MouseButton, Point, EnumHash>	downMouseButtons;
+	std::unordered_set<MouseButton, EnumHash>			movingMouseButtons;
 };
 
 }