Revert "Try to fix build error on clang 16"

This reverts commit 84b23b2.
danielkrupinski · Oct 28, 2024 · f8d711f · f8d711f
1 parent ec8c5b1
commit f8d711f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/Source/MemorySearch/PatternPool.h b/Source/MemorySearch/PatternPool.h
@@ -44,7 +44,7 @@ class PatternPool {
     static consteval void copyPatterns(const auto& tempPatternPool, auto& pool, TypeList<SourceTypes...>, TypeList<DestTypes...>) noexcept
     {
         std::size_t outPatternIndex{0}, outBufferIndex{0};
-        (copyPattern(TypeList<SourceTypes...>::template indexOf<DestTypes>, outPatternIndex, outBufferIndex, tempPatternPool, pool), ...);
+        (copyPattern(TypeList<SourceTypes...>::template indexOf<DestTypes>(), outPatternIndex, outBufferIndex, tempPatternPool, pool), ...);
     }
 
     static consteval void copyPattern(std::size_t patternIndex, std::size_t& outIndex, std::size_t& outBuffer, const auto& tempPool, auto& pool) noexcept

diff --git a/Source/MemorySearch/PatternSearchResults.h b/Source/MemorySearch/PatternSearchResults.h
@@ -21,11 +21,11 @@ class PatternSearchResults {
     {
         using UnpackedType = UnpackStrongTypeAliasT<T>;
         if constexpr (OneBytePatternTypes::template contains<T>())
-            return utils::fromBytes<UnpackedType>(oneByteResults[OneBytePatternTypes::template indexOf<T>]);
+            return utils::fromBytes<UnpackedType>(oneByteResults[OneBytePatternTypes::template indexOf<T>()]);
         else if constexpr (FourBytePatternTypes::template contains<T>())
-            return utils::fromBytes<UnpackedType>(fourByteResults[FourBytePatternTypes::template indexOf<T>]);
+            return utils::fromBytes<UnpackedType>(fourByteResults[FourBytePatternTypes::template indexOf<T>()]);
         else if constexpr (EightBytePatternTypes::template contains<T>())
-            return utils::fromBytes<UnpackedType>(eightByteResults[EightBytePatternTypes::template indexOf<T>]);
+            return utils::fromBytes<UnpackedType>(eightByteResults[EightBytePatternTypes::template indexOf<T>()]);
         else
             static_assert(!std::is_same_v<T, T>, "Unknown type");
     }

diff --git a/Source/Utils/TypeList.h b/Source/Utils/TypeList.h
@@ -18,7 +18,10 @@ struct TypeList {
     }
 
     template <typename T>
-    static constexpr std::size_t indexOf = utils::typeIndex<T, std::tuple<Types...>>();
+    static constexpr std::size_t indexOf() noexcept
+    {
+        return utils::typeIndex<T, std::tuple<Types...>>();
+    }
 
     template <typename T>
     static constexpr bool contains() noexcept