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 #include #include -#include #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 - requires std::is_base_of_v + requires std::is_base_of_v && Singleton bool load_resource(const std::filesystem::path& path) { if (!std::filesystem::exists(path)) { @@ -29,7 +29,7 @@ namespace asst } template - requires std::is_base_of_v + requires std::is_base_of_v && Singleton bool load_resource_with_templ(const std::filesystem::path& path, const std::filesystem::path& templ_dir) { if (!load_resource(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 + concept Singleton = std::is_base_of_v, T>; }