diff options
| author | 2018-09-17 09:51:47 -0400 | |
|---|---|---|
| committer | 2018-09-17 09:51:47 -0400 | |
| commit | 076add4ccddff3940e20fc320615e3d330f77119 (patch) | |
| tree | bacabcfed8665974c276489509a1caa330ad36a2 /src/core/loader | |
| parent | Merge pull request #1329 from raven02/bgr5a1u (diff) | |
| parent | Port #4182 from Citra: "Prefix all size_t with std::" (diff) | |
| download | yuzu-076add4ccddff3940e20fc320615e3d330f77119.tar.gz yuzu-076add4ccddff3940e20fc320615e3d330f77119.tar.xz yuzu-076add4ccddff3940e20fc320615e3d330f77119.zip | |
Merge pull request #1326 from FearlessTobi/port-4182
Port #4182 from Citra: "Prefix all size_t with std::"
Diffstat (limited to 'src/core/loader')
| -rw-r--r-- | src/core/loader/elf.cpp | 2 | ||||
| -rw-r--r-- | src/core/loader/loader.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/core/loader/elf.cpp b/src/core/loader/elf.cpp index 120e1e133..0e2af20b4 100644 --- a/src/core/loader/elf.cpp +++ b/src/core/loader/elf.cpp | |||
| @@ -300,7 +300,7 @@ SharedPtr<CodeSet> ElfReader::LoadInto(u32 vaddr) { | |||
| 300 | } | 300 | } |
| 301 | 301 | ||
| 302 | std::vector<u8> program_image(total_image_size); | 302 | std::vector<u8> program_image(total_image_size); |
| 303 | size_t current_image_position = 0; | 303 | std::size_t current_image_position = 0; |
| 304 | 304 | ||
| 305 | auto& kernel = Core::System::GetInstance().Kernel(); | 305 | auto& kernel = Core::System::GetInstance().Kernel(); |
| 306 | SharedPtr<CodeSet> codeset = CodeSet::Create(kernel, ""); | 306 | SharedPtr<CodeSet> codeset = CodeSet::Create(kernel, ""); |
diff --git a/src/core/loader/loader.cpp b/src/core/loader/loader.cpp index fa43a2650..f2a183ba1 100644 --- a/src/core/loader/loader.cpp +++ b/src/core/loader/loader.cpp | |||
| @@ -155,7 +155,7 @@ constexpr std::array<const char*, 58> RESULT_MESSAGES{ | |||
| 155 | }; | 155 | }; |
| 156 | 156 | ||
| 157 | std::ostream& operator<<(std::ostream& os, ResultStatus status) { | 157 | std::ostream& operator<<(std::ostream& os, ResultStatus status) { |
| 158 | os << RESULT_MESSAGES.at(static_cast<size_t>(status)); | 158 | os << RESULT_MESSAGES.at(static_cast<std::size_t>(status)); |
| 159 | return os; | 159 | return os; |
| 160 | } | 160 | } |
| 161 | 161 | ||