Просмотр исходного кода

Kernel/Sessions: Remove the ClientSession::Create function.

It is not meant to be used by anything other than CreateSessionPair.
Subv 9 лет назад
Родитель
Сommit
37347bfa38

+ 0 - 8
src/core/hle/kernel/client_session.cpp

@@ -25,14 +25,6 @@ ClientSession::~ClientSession() {
     parent->client = nullptr;
     parent->client = nullptr;
 }
 }
 
 
-ResultVal<SharedPtr<ClientSession>> ClientSession::Create(std::string name) {
-    SharedPtr<ClientSession> client_session(new ClientSession);
-
-    client_session->name = std::move(name);
-    client_session->parent = nullptr;
-    return MakeResult<SharedPtr<ClientSession>>(std::move(client_session));
-}
-
 ResultCode ClientSession::SendSyncRequest() {
 ResultCode ClientSession::SendSyncRequest() {
     // Signal the server session that new data is available
     // Signal the server session that new data is available
     if (parent->server)
     if (parent->server)

+ 0 - 7
src/core/hle/kernel/client_session.h

@@ -47,13 +47,6 @@ public:
 private:
 private:
     ClientSession();
     ClientSession();
     ~ClientSession() override;
     ~ClientSession() override;
-
-    /**
-     * Creates a client session.
-     * @param name Optional name of client session
-     * @return The created client session
-     */
-    static ResultVal<SharedPtr<ClientSession>> Create(std::string name = "Unknown");
 };
 };
 
 
 } // namespace
 } // namespace

+ 3 - 1
src/core/hle/kernel/server_session.cpp

@@ -74,7 +74,9 @@ ServerSession::SessionPair ServerSession::CreateSessionPair(
 
 
     auto server_session =
     auto server_session =
         ServerSession::Create(name + "_Server", std::move(hle_handler)).MoveFrom();
         ServerSession::Create(name + "_Server", std::move(hle_handler)).MoveFrom();
-    auto client_session = ClientSession::Create(name + "_Client").MoveFrom();
+
+    SharedPtr<ClientSession> client_session(new ClientSession);
+    client_session->name = name + "_Client";
 
 
     std::shared_ptr<Session> parent(new Session);
     std::shared_ptr<Session> parent(new Session);
     parent->client = client_session.get();
     parent->client = client_session.get();