From 2eceee3a4cc2786dae4e9b80a8b5f3bb666d3fc6 Mon Sep 17 00:00:00 2001
From: Subv <subv2112@gmail.com>
Date: Wed, 30 Nov 2016 23:28:31 -0500
Subject: Fixed the rebase mistakes.

---
 src/core/hle/kernel/client_port.h | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

(limited to 'src/core/hle/kernel/client_port.h')

diff --git a/src/core/hle/kernel/client_port.h b/src/core/hle/kernel/client_port.h
index 7a53c93b8..4848cb4c4 100644
--- a/src/core/hle/kernel/client_port.h
+++ b/src/core/hle/kernel/client_port.h
@@ -5,14 +5,9 @@
 #pragma once
 
 #include <string>
-#include <memory>
 #include "common/common_types.h"
 #include "core/hle/kernel/kernel.h"
 
-namespace Service {
-class Interface;
-}
-
 namespace Kernel {
 
 class ServerPort;
@@ -21,6 +16,17 @@ class ServerSession;
 class ClientPort final : public Object {
 public:
     friend class ServerPort;
+    std::string GetTypeName() const override {
+        return "ClientPort";
+    }
+    std::string GetName() const override {
+        return name;
+    }
+
+    static const HandleType HANDLE_TYPE = HandleType::ClientPort;
+    HandleType GetHandleType() const override {
+        return HANDLE_TYPE;
+    }
 
     /**
      * Adds the specified server session to the queue of pending sessions of the associated ServerPort
@@ -28,18 +34,10 @@ public:
      */
     void AddWaitingSession(SharedPtr<ServerSession> server_session);
 
-    std::string GetTypeName() const override { return "ClientPort"; }
-    std::string GetName() const override { return name; }
-
-    static const HandleType HANDLE_TYPE = HandleType::ClientPort;
-    HandleType GetHandleType() const override {
-        return HANDLE_TYPE;
-    }
-
-    SharedPtr<ServerPort> server_port;                           ///< ServerPort associated with this client port.
-    u32 max_sessions;                                            ///< Maximum number of simultaneous sessions the port can have
-    u32 active_sessions;                                         ///< Number of currently open sessions to this port
-    std::string name;                                            ///< Name of client port (optional)
+    SharedPtr<ServerPort> server_port; ///< ServerPort associated with this client port.
+    u32 max_sessions;    ///< Maximum number of simultaneous sessions the port can have
+    u32 active_sessions; ///< Number of currently open sessions to this port
+    std::string name;    ///< Name of client port (optional)
 private:
     ClientPort();
     ~ClientPort() override;
-- 
cgit v1.2.3