From 136d769895e369dc4565efdde7b35ca0542222a3 Mon Sep 17 00:00:00 2001
From: Nekotekina <nekotekina@gmail.com>
Date: Tue, 25 Feb 2020 14:31:26 +0300
Subject: [PATCH] Fix g_fxo->init internal logic for CTAD (use () not {})

Also improve comments to the functions.
---
 rpcs3/util/fixed_typemap.hpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/rpcs3/util/fixed_typemap.hpp b/rpcs3/util/fixed_typemap.hpp
index 20b29a504d..d6a96a8ac5 100644
--- a/rpcs3/util/fixed_typemap.hpp
+++ b/rpcs3/util/fixed_typemap.hpp
@@ -165,15 +165,16 @@ namespace stx
 			return obj;
 		}
 
-		// Special stuff
-		template <template <class...> typename CTAD, typename... Args>
+		// CTAD adaptor for init (see init description), accepts template not type
+		template <template <class X, class...> typename Template, typename... Args>
 		auto init(Args&&... args) noexcept
 		{
-			using T = decltype(CTAD{std::forward<Args>(args)...});
+			// Deduce the type from given template and its arguments
+			using T = decltype(Template(std::forward<Args>(args)...));
 			return init<T>(std::forward<Args>(args)...);
 		}
 
-		// Obtain object pointer (the only thread safe function)
+		// Obtain object pointer (thread safe just against other get calls)
 		template <typename T>
 		T* get() const noexcept
 		{