diff options
| author |  bunnei | 2019-04-01 22:20:05 -0400 |
|---|---|---|
| committer |  GitHub | 2019-04-01 22:20:05 -0400 |
| commit | 29df6bbbd368a8265a401e8d529453352b43d5e1 (patch) | |
| tree | 36ed85250c33cea2623765e7bc6c3f1708932b2e /src/core/loader/elf.cpp | |
| parent | Merge pull request #2301 from FearlessTobi/remove-amiibo-setting (diff) | |
| parent | kernel/codeset: Make CodeSet's memory data member a regular std::vector (diff) | |
| download | yuzu-29df6bbbd368a8265a401e8d529453352b43d5e1.tar.gz yuzu-29df6bbbd368a8265a401e8d529453352b43d5e1.tar.xz yuzu-29df6bbbd368a8265a401e8d529453352b43d5e1.zip | |
Merge pull request #2281 from lioncash/memory
kernel/codeset: Make CodeSet's memory data member a regular std::vector
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 8b1920f22..46ac372f6 100644 --- a/src/core/loader/elf.cpp +++ b/src/core/loader/elf.cpp | |||
| @@ -341,7 +341,7 @@ Kernel::CodeSet ElfReader::LoadInto(VAddr vaddr) { | |||
| 341 | } | 341 | } |
| 342 | 342 | ||
| 343 | codeset.entrypoint = base_addr + header->e_entry; | 343 | codeset.entrypoint = base_addr + header->e_entry; |
| 344 | codeset.memory = std::make_shared<std::vector<u8>>(std::move(program_image)); | 344 | codeset.memory = std::move(program_image); |
| 345 | 345 | ||
| 346 | LOG_DEBUG(Loader, "Done loading."); | 346 | LOG_DEBUG(Loader, "Done loading."); |
| 347 | 347 | ||