diff options
| author | 2018-09-15 15:21:06 +0200 | |
|---|---|---|
| committer | 2018-09-15 15:21:06 +0200 | |
| commit | 63c2e32e207d31ecadd9022e1d7cd705c9febac8 (patch) | |
| tree | 8a90e8ef2804f147dff7225a543a8740ecf7160c /src/core/hle/ipc_helpers.h | |
| parent | Merge pull request #1310 from lioncash/kernel-ns (diff) | |
| download | yuzu-63c2e32e207d31ecadd9022e1d7cd705c9febac8.tar.gz yuzu-63c2e32e207d31ecadd9022e1d7cd705c9febac8.tar.xz yuzu-63c2e32e207d31ecadd9022e1d7cd705c9febac8.zip | |
Port #4182 from Citra: "Prefix all size_t with std::"
Diffstat (limited to 'src/core/hle/ipc_helpers.h')
| -rw-r--r-- | src/core/hle/ipc_helpers.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/hle/ipc_helpers.h b/src/core/hle/ipc_helpers.h index 0f3ffdb60..7545ecf2a 100644 --- a/src/core/hle/ipc_helpers.h +++ b/src/core/hle/ipc_helpers.h | |||
| @@ -152,8 +152,8 @@ public: | |||
| 152 | } | 152 | } |
| 153 | 153 | ||
| 154 | void ValidateHeader() { | 154 | void ValidateHeader() { |
| 155 | const size_t num_domain_objects = context->NumDomainObjects(); | 155 | const std::size_t num_domain_objects = context->NumDomainObjects(); |
| 156 | const size_t num_move_objects = context->NumMoveObjects(); | 156 | const std::size_t num_move_objects = context->NumMoveObjects(); |
| 157 | ASSERT_MSG(!num_domain_objects || !num_move_objects, | 157 | ASSERT_MSG(!num_domain_objects || !num_move_objects, |
| 158 | "cannot move normal handles and domain objects"); | 158 | "cannot move normal handles and domain objects"); |
| 159 | ASSERT_MSG((index - datapayload_index) == normal_params_size, | 159 | ASSERT_MSG((index - datapayload_index) == normal_params_size, |
| @@ -329,10 +329,10 @@ public: | |||
| 329 | T PopRaw(); | 329 | T PopRaw(); |
| 330 | 330 | ||
| 331 | template <typename T> | 331 | template <typename T> |
| 332 | Kernel::SharedPtr<T> GetMoveObject(size_t index); | 332 | Kernel::SharedPtr<T> GetMoveObject(std::size_t index); |
| 333 | 333 | ||
| 334 | template <typename T> | 334 | template <typename T> |
| 335 | Kernel::SharedPtr<T> GetCopyObject(size_t index); | 335 | Kernel::SharedPtr<T> GetCopyObject(std::size_t index); |
| 336 | 336 | ||
| 337 | template <class T> | 337 | template <class T> |
| 338 | std::shared_ptr<T> PopIpcInterface() { | 338 | std::shared_ptr<T> PopIpcInterface() { |
| @@ -406,12 +406,12 @@ void RequestParser::Pop(First& first_value, Other&... other_values) { | |||
| 406 | } | 406 | } |
| 407 | 407 | ||
| 408 | template <typename T> | 408 | template <typename T> |
| 409 | Kernel::SharedPtr<T> RequestParser::GetMoveObject(size_t index) { | 409 | Kernel::SharedPtr<T> RequestParser::GetMoveObject(std::size_t index) { |
| 410 | return context->GetMoveObject<T>(index); | 410 | return context->GetMoveObject<T>(index); |
| 411 | } | 411 | } |
| 412 | 412 | ||
| 413 | template <typename T> | 413 | template <typename T> |
| 414 | Kernel::SharedPtr<T> RequestParser::GetCopyObject(size_t index) { | 414 | Kernel::SharedPtr<T> RequestParser::GetCopyObject(std::size_t index) { |
| 415 | return context->GetCopyObject<T>(index); | 415 | return context->GetCopyObject<T>(index); |
| 416 | } | 416 | } |
| 417 | 417 | ||