From 963209e8af782fccb03643ac7365920faeda49ee Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Tue, 9 Jan 2024 16:47:24 +0100 Subject: [PATCH] removed external stuff from tarray.h --- src/common/textures/textureid.h | 3 +-- src/common/utility/tarray.h | 11 ----------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/src/common/textures/textureid.h b/src/common/textures/textureid.h index 49ff595a2..84ebb679e 100644 --- a/src/common/textures/textureid.h +++ b/src/common/textures/textureid.h @@ -2,6 +2,7 @@ #define TEXTUREID_H #include +#include "tarray.h" enum class ETextureType : uint8_t { @@ -67,7 +68,6 @@ public: constexpr FSetTextureID(int v) : FTextureID(v) {} }; -#ifdef TARRAY_H template<> struct THashTraits { @@ -76,4 +76,3 @@ template<> struct THashTraits // Compares two keys, returning zero if they are the same. int Compare(const FTextureID left, const FTextureID right) { return left != right; } }; -#endif \ No newline at end of file diff --git a/src/common/utility/tarray.h b/src/common/utility/tarray.h index 055229f2c..90cec1e58 100644 --- a/src/common/utility/tarray.h +++ b/src/common/utility/tarray.h @@ -944,17 +944,6 @@ template struct THashTraits int Compare(const KT left, const KT right) { return left != right; } }; -#ifdef TEXTUREID_H -template<> struct THashTraits -{ - - hash_t Hash(const FTextureID key) { return (hash_t)key.GetIndex(); } - - // Compares two keys, returning zero if they are the same. - int Compare(const FTextureID left, const FTextureID right) { return left != right; } -}; -#endif - template<> struct THashTraits { // Use all bits when hashing singles instead of converting them to ints.