fix: match_or_fail

Author: qudix

include/REL/Pattern.h

@@ -146,12 +146,13 @@ namespace REL
 				if (!this->match(a_address)) {
 					const auto mod = Module::GetSingleton();
 					const auto version = mod->version();
-					REX::FAIL(
+					REX::IMPL::FAIL(
+						a_loc,
 						"A pattern has failed to match.\n"
 						"This means the plugin is incompatible with either the "
 						"current version of the game ({}), or another "
-						"installed mod."sv,
-						version.string(), a_loc);
+						"installed mod.",
+						version.string());
 				}
 			}
 		};

include/REX/REX/Singleton.h

@@ -5,7 +5,7 @@
 namespace REX
 {
 	template <class T>
-	class Singleton
+	class TSingleton
 	{
 	public:
 		static T* GetSingleton()
@@ -15,13 +15,16 @@ namespace REX
 		}
 
 	protected:
-		Singleton() = default;
-		~Singleton() = default;
+		TSingleton() = default;
+		~TSingleton() = default;
 
-		Singleton(const Singleton&) = delete;
-		Singleton(Singleton&&) = delete;
+		TSingleton(const TSingleton&) = delete;
+		TSingleton(TSingleton&&) = delete;
 
-		Singleton& operator=(const Singleton&) = delete;
-		Singleton& operator=(Singleton&&) = delete;
+		TSingleton& operator=(const TSingleton&) = delete;
+		TSingleton& operator=(TSingleton&&) = delete;
 	};
+
+	template <class T>
+	using Singleton = TSingleton<T>;
 }