From f7d7136b3ea9dc98e8b715072210d1ab47d7e263 Mon Sep 17 00:00:00 2001 From: sabrina-shanman Date: Mon, 11 Feb 2019 09:06:26 -0800 Subject: [PATCH] Do not have hash specialization just for ColorChannelMapping --- .../src/model-networking/TextureCache.cpp | 2 +- libraries/shared/src/shared/ColorChannelMapping.h | 11 ----------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/libraries/model-networking/src/model-networking/TextureCache.cpp b/libraries/model-networking/src/model-networking/TextureCache.cpp index fe68c4ca6e..36893b4280 100644 --- a/libraries/model-networking/src/model-networking/TextureCache.cpp +++ b/libraries/model-networking/src/model-networking/TextureCache.cpp @@ -207,7 +207,7 @@ namespace std { struct hash { size_t operator()(const TextureExtra& a) const { size_t result = 0; - hash_combine(result, (int)a.type, a.content, a.maxNumPixels, a.channelMapping); + hash_combine(result, (int)a.type, a.content, a.maxNumPixels, (int)a.channelMapping); return result; } }; diff --git a/libraries/shared/src/shared/ColorChannelMapping.h b/libraries/shared/src/shared/ColorChannelMapping.h index c400ec1414..0f70b9d9f7 100644 --- a/libraries/shared/src/shared/ColorChannelMapping.h +++ b/libraries/shared/src/shared/ColorChannelMapping.h @@ -23,15 +23,4 @@ enum class ColorChannelMapping { COUNT }; -namespace std { - template <> - struct hash { - size_t operator()(const ColorChannelMapping& a) const { - size_t result = 0; - hash_combine(result, (int)a); - return result; - } - }; -}; - #endif // hifi_ColorChannelMapping_h