diff options
| author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2017-06-06 08:01:18 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-06 08:01:18 -0700 |
| commit | 7d59c3acbf74698ad32935214cab70dc2f17833f (patch) | |
| tree | b1308e008f8a79d94350da54df2feb3a62013934 /src/core/hle/kernel/server_session.cpp | |
| parent | 8f0a23b63192ccd62faf45b884393247ff97b8e3 (diff) | |
| parent | e626a520ca8d3047449d7d7028d6b9c773a6b570 (diff) | |
Merge pull request #2752 from yuriks/move-session-request-handler
HLE: Move SessionRequestHandler from Service:: to Kernel::
Diffstat (limited to 'src/core/hle/kernel/server_session.cpp')
| -rw-r--r-- | src/core/hle/kernel/server_session.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/core/hle/kernel/server_session.cpp b/src/core/hle/kernel/server_session.cpp index 500b909ab..dc39d5229 100644 --- a/src/core/hle/kernel/server_session.cpp +++ b/src/core/hle/kernel/server_session.cpp @@ -4,8 +4,11 @@ #include <tuple> +#include "core/hle/kernel/client_port.h" #include "core/hle/kernel/client_session.h" +#include "core/hle/kernel/hle_ipc.h" #include "core/hle/kernel/server_session.h" +#include "core/hle/kernel/session.h" #include "core/hle/kernel/thread.h" namespace Kernel { @@ -26,7 +29,7 @@ ServerSession::~ServerSession() { } ResultVal<SharedPtr<ServerSession>> ServerSession::Create( - std::string name, std::shared_ptr<Service::SessionRequestHandler> hle_handler) { + std::string name, std::shared_ptr<SessionRequestHandler> hle_handler) { SharedPtr<ServerSession> server_session(new ServerSession); server_session->name = std::move(name); @@ -69,7 +72,7 @@ ResultCode ServerSession::HandleSyncRequest() { } ServerSession::SessionPair ServerSession::CreateSessionPair( - const std::string& name, std::shared_ptr<Service::SessionRequestHandler> hle_handler, + const std::string& name, std::shared_ptr<SessionRequestHandler> hle_handler, SharedPtr<ClientPort> port) { auto server_session = |