diff options
| author |  raven02 | 2018-09-19 19:53:11 +0800 |
|---|---|---|
| committer |  GitHub | 2018-09-19 19:53:11 +0800 |
| commit | c8f9bbbf859c0e38cf691b64c67761382fcebfc2 (patch) | |
| tree | 99529c2277a6b740a6e278985c5147fa649c5497 /src/core/loader/elf.cpp | |
| parent | Add 1D sampler for TLDS - TexelFetch (Mario Rabbids) (diff) | |
| parent | Merge pull request #1348 from ogniK5377/GetImageSize (diff) | |
| download | yuzu-c8f9bbbf859c0e38cf691b64c67761382fcebfc2.tar.gz yuzu-c8f9bbbf859c0e38cf691b64c67761382fcebfc2.tar.xz yuzu-c8f9bbbf859c0e38cf691b64c67761382fcebfc2.zip | |
Merge branch 'master' into tlds
Diffstat (limited to 'src/core/loader/elf.cpp')
| -rw-r--r-- | src/core/loader/elf.cpp | 2 |
1 files changed, 1 insertions, 1 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, ""); |