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

Added forward define for ServerPort

David Marcec 7 лет назад
Родитель
Сommit
612ce89eca
2 измененных файлов с 6 добавлено и 4 удалено
  1. 4 0
      src/core/hle/kernel/client_port.cpp
  2. 2 4
      src/core/hle/kernel/client_port.h

+ 4 - 0
src/core/hle/kernel/client_port.cpp

@@ -17,6 +17,10 @@ namespace Kernel {
 ClientPort::ClientPort(KernelCore& kernel) : Object{kernel} {}
 ClientPort::ClientPort(KernelCore& kernel) : Object{kernel} {}
 ClientPort::~ClientPort() = default;
 ClientPort::~ClientPort() = default;
 
 
+SharedPtr<ServerPort> ClientPort::GetServerPort() const {
+    return server_port;
+}
+
 ResultVal<SharedPtr<ClientSession>> ClientPort::Connect() {
 ResultVal<SharedPtr<ClientSession>> ClientPort::Connect() {
     // Note: Threads do not wait for the server endpoint to call
     // Note: Threads do not wait for the server endpoint to call
     // AcceptSession before returning from this call.
     // AcceptSession before returning from this call.

+ 2 - 4
src/core/hle/kernel/client_port.h

@@ -7,13 +7,13 @@
 #include <string>
 #include <string>
 #include "common/common_types.h"
 #include "common/common_types.h"
 #include "core/hle/kernel/object.h"
 #include "core/hle/kernel/object.h"
-#include "core/hle/kernel/server_port.h"
 #include "core/hle/result.h"
 #include "core/hle/result.h"
 
 
 namespace Kernel {
 namespace Kernel {
 
 
 class ClientSession;
 class ClientSession;
 class KernelCore;
 class KernelCore;
+class ServerPort;
 
 
 class ClientPort final : public Object {
 class ClientPort final : public Object {
 public:
 public:
@@ -30,9 +30,7 @@ public:
         return HANDLE_TYPE;
         return HANDLE_TYPE;
     }
     }
 
 
-    SharedPtr<ServerPort> GetServerPort() const {
-        return server_port;
-    }
+    SharedPtr<ServerPort> GetServerPort() const;
 
 
     /**
     /**
      * Creates a new Session pair, adds the created ServerSession to the associated ServerPort's
      * Creates a new Session pair, adds the created ServerSession to the associated ServerPort's