aboutsummaryrefslogtreecommitdiff
path: root/src/core/hle/kernel/server_port.h
diff options
context:
space:
mode:
authorYuri Kunde Schlesner <yuriks@yuriks.net>2017-06-06 08:01:18 -0700
committerGitHub <noreply@github.com>2017-06-06 08:01:18 -0700
commit7d59c3acbf74698ad32935214cab70dc2f17833f (patch)
treeb1308e008f8a79d94350da54df2feb3a62013934 /src/core/hle/kernel/server_port.h
parent8f0a23b63192ccd62faf45b884393247ff97b8e3 (diff)
parente626a520ca8d3047449d7d7028d6b9c773a6b570 (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_port.h')
-rw-r--r--src/core/hle/kernel/server_port.h9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/core/hle/kernel/server_port.h b/src/core/hle/kernel/server_port.h
index 2a24d8412..281559acf 100644
--- a/src/core/hle/kernel/server_port.h
+++ b/src/core/hle/kernel/server_port.h
@@ -11,13 +11,10 @@
#include "core/hle/kernel/kernel.h"
#include "core/hle/kernel/wait_object.h"
-namespace Service {
-class SessionRequestHandler;
-}
-
namespace Kernel {
class ClientPort;
+class SessionRequestHandler;
class ServerPort final : public WaitObject {
public:
@@ -31,7 +28,7 @@ public:
*/
static std::tuple<SharedPtr<ServerPort>, SharedPtr<ClientPort>> CreatePortPair(
u32 max_sessions, std::string name = "UnknownPort",
- std::shared_ptr<Service::SessionRequestHandler> hle_handler = nullptr);
+ std::shared_ptr<SessionRequestHandler> hle_handler = nullptr);
std::string GetTypeName() const override {
return "ServerPort";
@@ -52,7 +49,7 @@ public:
/// This session's HLE request handler template (optional)
/// ServerSessions created from this port inherit a reference to this handler.
- std::shared_ptr<Service::SessionRequestHandler> hle_handler;
+ std::shared_ptr<SessionRequestHandler> hle_handler;
bool ShouldWait(Thread* thread) const override;
void Acquire(Thread* thread) override;