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/nro.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/nro.cpp')
| -rw-r--r-- | src/core/loader/nro.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/loader/nro.cpp b/src/core/loader/nro.cpp index 5de02a94b..31e4a0c84 100644 --- a/src/core/loader/nro.cpp +++ b/src/core/loader/nro.cpp | |||
| @@ -187,7 +187,7 @@ static bool LoadNroImpl(Kernel::Process& process, const std::vector<u8>& data, | |||
| 187 | program_image.resize(static_cast<u32>(program_image.size()) + bss_size); | 187 | program_image.resize(static_cast<u32>(program_image.size()) + bss_size); |
| 188 | 188 | ||
| 189 | // Load codeset for current process | 189 | // Load codeset for current process |
| 190 | codeset.memory = std::make_shared<std::vector<u8>>(std::move(program_image)); | 190 | codeset.memory = std::move(program_image); |
| 191 | process.LoadModule(std::move(codeset), load_base); | 191 | process.LoadModule(std::move(codeset), load_base); |
| 192 | 192 | ||
| 193 | // Register module with GDBStub | 193 | // Register module with GDBStub |