diff options
| author | 2022-06-28 16:59:33 -0700 | |
|---|---|---|
| committer | 2022-06-28 16:59:33 -0700 | |
| commit | 01bc0c84f021ad389309aeb23bdb063070aeb2fe (patch) | |
| tree | 720dc203d1eeb85e47c6f9b0d57cd00ec8a69038 /src/core/hle/ipc_helpers.h | |
| parent | Merge pull request #8504 from comex/mesosphere-current-process (diff) | |
| parent | video_core: Replace VKUpdateDescriptorQueue with UpdateDescriptorQueue (diff) | |
| download | yuzu-01bc0c84f021ad389309aeb23bdb063070aeb2fe.tar.gz yuzu-01bc0c84f021ad389309aeb23bdb063070aeb2fe.tar.xz yuzu-01bc0c84f021ad389309aeb23bdb063070aeb2fe.zip | |
Merge pull request #8512 from german77/nnResult
Replace multiple names with a better name
Diffstat (limited to 'src/core/hle/ipc_helpers.h')
| -rw-r--r-- | src/core/hle/ipc_helpers.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/hle/ipc_helpers.h b/src/core/hle/ipc_helpers.h index 3c4e45fcd..004bb2005 100644 --- a/src/core/hle/ipc_helpers.h +++ b/src/core/hle/ipc_helpers.h | |||
| @@ -19,7 +19,7 @@ | |||
| 19 | 19 | ||
| 20 | namespace IPC { | 20 | namespace IPC { |
| 21 | 21 | ||
| 22 | constexpr ResultCode ERR_REMOTE_PROCESS_DEAD{ErrorModule::HIPC, 301}; | 22 | constexpr Result ERR_REMOTE_PROCESS_DEAD{ErrorModule::HIPC, 301}; |
| 23 | 23 | ||
| 24 | class RequestHelperBase { | 24 | class RequestHelperBase { |
| 25 | protected: | 25 | protected: |
| @@ -176,7 +176,7 @@ public: | |||
| 176 | void PushImpl(float value); | 176 | void PushImpl(float value); |
| 177 | void PushImpl(double value); | 177 | void PushImpl(double value); |
| 178 | void PushImpl(bool value); | 178 | void PushImpl(bool value); |
| 179 | void PushImpl(ResultCode value); | 179 | void PushImpl(Result value); |
| 180 | 180 | ||
| 181 | template <typename T> | 181 | template <typename T> |
| 182 | void Push(T value) { | 182 | void Push(T value) { |
| @@ -251,7 +251,7 @@ void ResponseBuilder::PushRaw(const T& value) { | |||
| 251 | index += (sizeof(T) + 3) / 4; // round up to word length | 251 | index += (sizeof(T) + 3) / 4; // round up to word length |
| 252 | } | 252 | } |
| 253 | 253 | ||
| 254 | inline void ResponseBuilder::PushImpl(ResultCode value) { | 254 | inline void ResponseBuilder::PushImpl(Result value) { |
| 255 | // Result codes are actually 64-bit in the IPC buffer, but only the high part is discarded. | 255 | // Result codes are actually 64-bit in the IPC buffer, but only the high part is discarded. |
| 256 | Push(value.raw); | 256 | Push(value.raw); |
| 257 | Push<u32>(0); | 257 | Push<u32>(0); |
| @@ -481,8 +481,8 @@ inline bool RequestParser::Pop() { | |||
| 481 | } | 481 | } |
| 482 | 482 | ||
| 483 | template <> | 483 | template <> |
| 484 | inline ResultCode RequestParser::Pop() { | 484 | inline Result RequestParser::Pop() { |
| 485 | return ResultCode{Pop<u32>()}; | 485 | return Result{Pop<u32>()}; |
| 486 | } | 486 | } |
| 487 | 487 | ||
| 488 | template <typename T> | 488 | template <typename T> |