Przeglądaj źródła

Merge pull request #4471 from ogniK5377/sm-getservice-concept

sm: Make use of IsBaseOf for GetService
bunnei 6 lat temu
rodzic
commit
94c1689ef3
1 zmienionych plików z 2 dodań i 3 usunięć
  1. 2 3
      src/core/hle/service/sm/sm.h

+ 2 - 3
src/core/hle/service/sm/sm.h

@@ -9,6 +9,7 @@
 #include <type_traits>
 #include <type_traits>
 #include <unordered_map>
 #include <unordered_map>
 
 
+#include "common/concepts.h"
 #include "core/hle/kernel/client_port.h"
 #include "core/hle/kernel/client_port.h"
 #include "core/hle/kernel/object.h"
 #include "core/hle/kernel/object.h"
 #include "core/hle/kernel/server_port.h"
 #include "core/hle/kernel/server_port.h"
@@ -56,10 +57,8 @@ public:
     ResultVal<std::shared_ptr<Kernel::ClientPort>> GetServicePort(const std::string& name);
     ResultVal<std::shared_ptr<Kernel::ClientPort>> GetServicePort(const std::string& name);
     ResultVal<std::shared_ptr<Kernel::ClientSession>> ConnectToService(const std::string& name);
     ResultVal<std::shared_ptr<Kernel::ClientSession>> ConnectToService(const std::string& name);
 
 
-    template <typename T>
+    template <Common::IsBaseOf<Kernel::SessionRequestHandler> T>
     std::shared_ptr<T> GetService(const std::string& service_name) const {
     std::shared_ptr<T> GetService(const std::string& service_name) const {
-        static_assert(std::is_base_of_v<Kernel::SessionRequestHandler, T>,
-                      "Not a base of ServiceFrameworkBase");
         auto service = registered_services.find(service_name);
         auto service = registered_services.find(service_name);
         if (service == registered_services.end()) {
         if (service == registered_services.end()) {
             LOG_DEBUG(Service, "Can't find service: {}", service_name);
             LOG_DEBUG(Service, "Can't find service: {}", service_name);