diff options
| author | 2018-10-06 17:47:33 +1000 | |
|---|---|---|
| committer | 2018-10-06 17:47:33 +1000 | |
| commit | 612ce89ecaa3588a46f222d178673f4ee6c5637d (patch) | |
| tree | 1e95fb85e0f7cfe1ed8ed863cf2bac6170de7f91 /src | |
| parent | Ported #4296 from citra (diff) | |
| download | yuzu-612ce89ecaa3588a46f222d178673f4ee6c5637d.tar.gz yuzu-612ce89ecaa3588a46f222d178673f4ee6c5637d.tar.xz yuzu-612ce89ecaa3588a46f222d178673f4ee6c5637d.zip | |
Added forward define for ServerPort
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hle/kernel/client_port.cpp | 4 | ||||
| -rw-r--r-- | src/core/hle/kernel/client_port.h | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/core/hle/kernel/client_port.cpp b/src/core/hle/kernel/client_port.cpp index 873d6c516..d4c91d529 100644 --- a/src/core/hle/kernel/client_port.cpp +++ b/src/core/hle/kernel/client_port.cpp | |||
| @@ -17,6 +17,10 @@ namespace Kernel { | |||
| 17 | ClientPort::ClientPort(KernelCore& kernel) : Object{kernel} {} | 17 | ClientPort::ClientPort(KernelCore& kernel) : Object{kernel} {} |
| 18 | ClientPort::~ClientPort() = default; | 18 | ClientPort::~ClientPort() = default; |
| 19 | 19 | ||
| 20 | SharedPtr<ServerPort> ClientPort::GetServerPort() const { | ||
| 21 | return server_port; | ||
| 22 | } | ||
| 23 | |||
| 20 | ResultVal<SharedPtr<ClientSession>> ClientPort::Connect() { | 24 | ResultVal<SharedPtr<ClientSession>> ClientPort::Connect() { |
| 21 | // Note: Threads do not wait for the server endpoint to call | 25 | // Note: Threads do not wait for the server endpoint to call |
| 22 | // AcceptSession before returning from this call. | 26 | // AcceptSession before returning from this call. |
diff --git a/src/core/hle/kernel/client_port.h b/src/core/hle/kernel/client_port.h index a82b29417..6cd607206 100644 --- a/src/core/hle/kernel/client_port.h +++ b/src/core/hle/kernel/client_port.h | |||
| @@ -7,13 +7,13 @@ | |||
| 7 | #include <string> | 7 | #include <string> |
| 8 | #include "common/common_types.h" | 8 | #include "common/common_types.h" |
| 9 | #include "core/hle/kernel/object.h" | 9 | #include "core/hle/kernel/object.h" |
| 10 | #include "core/hle/kernel/server_port.h" | ||
| 11 | #include "core/hle/result.h" | 10 | #include "core/hle/result.h" |
| 12 | 11 | ||
| 13 | namespace Kernel { | 12 | namespace Kernel { |
| 14 | 13 | ||
| 15 | class ClientSession; | 14 | class ClientSession; |
| 16 | class KernelCore; | 15 | class KernelCore; |
| 16 | class ServerPort; | ||
| 17 | 17 | ||
| 18 | class ClientPort final : public Object { | 18 | class ClientPort final : public Object { |
| 19 | public: | 19 | public: |
| @@ -30,9 +30,7 @@ public: | |||
| 30 | return HANDLE_TYPE; | 30 | return HANDLE_TYPE; |
| 31 | } | 31 | } |
| 32 | 32 | ||
| 33 | SharedPtr<ServerPort> GetServerPort() const { | 33 | SharedPtr<ServerPort> GetServerPort() const; |
| 34 | return server_port; | ||
| 35 | } | ||
| 36 | 34 | ||
| 37 | /** | 35 | /** |
| 38 | * Creates a new Session pair, adds the created ServerSession to the associated ServerPort's | 36 | * Creates a new Session pair, adds the created ServerSession to the associated ServerPort's |