From 3f4e588e838226c2f53abffcc0210e6af8f6441d Mon Sep 17 00:00:00 2001
From: MistEO <mistereo@hotmail.com>
Date: Sun, 4 Sep 2022 00:59:01 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E5=8A=A0=E5=BC=BA=E8=AF=BB=E5=8F=96?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E7=B1=BB=E7=9A=84=E7=BA=A6=E6=9D=9F=EF=BC=8C?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8D=95=E4=BE=8B=20concept?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/MeoAssistant/Logger.hpp          | 1 -
 src/MeoAssistant/ResourceLoader.h    | 4 ++--
 src/MeoAssistant/SingletonHolder.hpp | 3 +++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/MeoAssistant/Logger.hpp b/src/MeoAssistant/Logger.hpp
index d46fcd6f13..c9b6502a12 100644
--- a/src/MeoAssistant/Logger.hpp
+++ b/src/MeoAssistant/Logger.hpp
@@ -7,7 +7,6 @@
 #include <thread>
 #include <type_traits>
 #include <utility>
-#include <vector>
 
 #include "AsstRanges.hpp"
 #include "AsstUtils.hpp"
diff --git a/src/MeoAssistant/ResourceLoader.h b/src/MeoAssistant/ResourceLoader.h
index e35f7e0dd9..22de653e07 100644
--- a/src/MeoAssistant/ResourceLoader.h
+++ b/src/MeoAssistant/ResourceLoader.h
@@ -19,7 +19,7 @@ namespace asst
 
     private:
         template <typename T>
-        requires std::is_base_of_v<AbstractResource, T>
+        requires std::is_base_of_v<AbstractResource, T> && Singleton<T>
         bool load_resource(const std::filesystem::path& path)
         {
             if (!std::filesystem::exists(path)) {
@@ -29,7 +29,7 @@ namespace asst
         }
 
         template <typename T>
-        requires std::is_base_of_v<AbstractConfigerWithTempl, T>
+        requires std::is_base_of_v<AbstractConfigerWithTempl, T> && Singleton<T>
         bool load_resource_with_templ(const std::filesystem::path& path, const std::filesystem::path& templ_dir)
         {
             if (!load_resource<T>(path)) {
diff --git a/src/MeoAssistant/SingletonHolder.hpp b/src/MeoAssistant/SingletonHolder.hpp
index 321166fd15..2f95de7c1e 100644
--- a/src/MeoAssistant/SingletonHolder.hpp
+++ b/src/MeoAssistant/SingletonHolder.hpp
@@ -23,4 +23,7 @@ namespace asst
     protected:
         SingletonHolder() = default;
     };
+
+    template <typename T>
+    concept Singleton = std::is_base_of_v<SingletonHolder<T>, T>;
 }