From 309291452711de03b3051fa2ded14dcaff4099ba Mon Sep 17 00:00:00 2001
From: Nekotekina <nekotekina@gmail.com>
Date: Wed, 18 Sep 2019 15:40:13 +0300
Subject: [PATCH] typeindices.hpp: add typeindex() helper

---
 Utilities/typemap.h          | 2 +-
 rpcs3/util/fixed_typemap.hpp | 4 ++--
 rpcs3/util/typeindices.hpp   | 7 +++++++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Utilities/typemap.h b/Utilities/typemap.h
index a725138c27..4a2edeb296 100644
--- a/Utilities/typemap.h
+++ b/Utilities/typemap.h
@@ -506,7 +506,7 @@ namespace utils
 		template <typename T>
 		typemap_head* get_head() const
 		{
-			return &m_map[stx::type_counter<typeinfo_base>::type<std::decay_t<T>>.index()];
+			return &m_map[stx::typeindex<typeinfo_base, std::decay_t<T>>()];
 		}
 
 	public:
diff --git a/rpcs3/util/fixed_typemap.hpp b/rpcs3/util/fixed_typemap.hpp
index 81739fbf1f..01c8526111 100644
--- a/rpcs3/util/fixed_typemap.hpp
+++ b/rpcs3/util/fixed_typemap.hpp
@@ -96,7 +96,7 @@ namespace stx
 		template <typename T, typename As = T, typename... Args>
 		As* init(Args&&... args) noexcept
 		{
-			auto& ptr = m_list[stx::type_counter<typeinfo>::template type<std::decay_t<T>>.index()];
+			auto& ptr = m_list[stx::typeindex<typeinfo, std::decay_t<T>>()];
 
 			if (ptr)
 			{
@@ -112,7 +112,7 @@ namespace stx
 		template <typename T>
 		T* get() const noexcept
 		{
-			return static_cast<T*>(m_list[stx::type_counter<typeinfo>::template type<std::decay_t<T>>.index()]);
+			return static_cast<T*>(m_list[stx::typeindex<typeinfo, std::decay_t<T>>()]);
 		}
 	};
 }
diff --git a/rpcs3/util/typeindices.hpp b/rpcs3/util/typeindices.hpp
index f8ae73dec2..1e2443d306 100644
--- a/rpcs3/util/typeindices.hpp
+++ b/rpcs3/util/typeindices.hpp
@@ -123,4 +123,11 @@ namespace stx
 		typelist_v<Info>.next->next = this;
 		typelist_v<Info>.next       = this;
 	}
+
+	// Type index accessor
+	template <typename Info, typename T>
+	inline unsigned typeindex() noexcept
+	{
+		return type_counter<Info>::template type<T>.index();
+	}
 }