diff options
author | Subv <subv2112@gmail.com> | 2017-05-22 01:52:42 +0200 |
---|---|---|
committer | Subv <subv2112@gmail.com> | 2017-05-22 01:52:42 +0200 |
commit | 37347bfa380464a1ee1236d2a35f1ec1b697e4b6 (patch) | |
tree | b8bd602646825ddfa78189f3d89d1a9437a543fa /src | |
parent | Kernel: Remove a now unused enum and variable regarding a session's status. (diff) | |
download | yuzu-37347bfa380464a1ee1236d2a35f1ec1b697e4b6.tar yuzu-37347bfa380464a1ee1236d2a35f1ec1b697e4b6.tar.gz yuzu-37347bfa380464a1ee1236d2a35f1ec1b697e4b6.tar.bz2 yuzu-37347bfa380464a1ee1236d2a35f1ec1b697e4b6.tar.lz yuzu-37347bfa380464a1ee1236d2a35f1ec1b697e4b6.tar.xz yuzu-37347bfa380464a1ee1236d2a35f1ec1b697e4b6.tar.zst yuzu-37347bfa380464a1ee1236d2a35f1ec1b697e4b6.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/kernel/client_session.cpp | 8 | ||||
-rw-r--r-- | src/core/hle/kernel/client_session.h | 7 | ||||
-rw-r--r-- | src/core/hle/kernel/server_session.cpp | 4 |
3 files changed, 3 insertions, 16 deletions
diff --git a/src/core/hle/kernel/client_session.cpp b/src/core/hle/kernel/client_session.cpp index 6737b204b..e297b7464 100644 --- a/src/core/hle/kernel/client_session.cpp +++ b/src/core/hle/kernel/client_session.cpp @@ -25,14 +25,6 @@ ClientSession::~ClientSession() { 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() { // Signal the server session that new data is available if (parent->server) diff --git a/src/core/hle/kernel/client_session.h b/src/core/hle/kernel/client_session.h index 5ec4ee901..9f3adb72b 100644 --- a/src/core/hle/kernel/client_session.h +++ b/src/core/hle/kernel/client_session.h @@ -47,13 +47,6 @@ public: private: ClientSession(); ~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 diff --git a/src/core/hle/kernel/server_session.cpp b/src/core/hle/kernel/server_session.cpp index a93e55c76..500b909ab 100644 --- a/src/core/hle/kernel/server_session.cpp +++ b/src/core/hle/kernel/server_session.cpp @@ -74,7 +74,9 @@ ServerSession::SessionPair ServerSession::CreateSessionPair( auto server_session = 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); parent->client = client_session.get(); |