diff options
| author | bunnei <bunneidev@gmail.com> | 2018-07-19 05:55:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-19 05:55:55 +0200 |
| commit | 85421f34062bd0303f97cc9d01fa838709231326 (patch) | |
| tree | c953a283bcf0f83c83b282bfea2da8080f16d556 /src/core/hle/kernel/vm_manager.cpp | |
| parent | Merge pull request #691 from lioncash/guard (diff) | |
| parent | core/memory, core/hle/kernel: Use std::move where applicable (diff) | |
| download | yuzu-85421f34062bd0303f97cc9d01fa838709231326.tar yuzu-85421f34062bd0303f97cc9d01fa838709231326.tar.gz yuzu-85421f34062bd0303f97cc9d01fa838709231326.tar.bz2 yuzu-85421f34062bd0303f97cc9d01fa838709231326.tar.lz yuzu-85421f34062bd0303f97cc9d01fa838709231326.tar.xz yuzu-85421f34062bd0303f97cc9d01fa838709231326.tar.zst yuzu-85421f34062bd0303f97cc9d01fa838709231326.zip | |
Diffstat (limited to 'src/core/hle/kernel/vm_manager.cpp')
| -rw-r--r-- | src/core/hle/kernel/vm_manager.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/hle/kernel/vm_manager.cpp b/src/core/hle/kernel/vm_manager.cpp index 10b3ebaca..9d26fd781 100644 --- a/src/core/hle/kernel/vm_manager.cpp +++ b/src/core/hle/kernel/vm_manager.cpp @@ -3,6 +3,7 @@ // Refer to the license.txt file included. #include <iterator> +#include <utility> #include "common/assert.h" #include "common/logging/log.h" #include "core/arm/arm_interface.h" @@ -107,7 +108,7 @@ ResultVal<VMManager::VMAHandle> VMManager::MapMemoryBlock(VAddr target, final_vma.type = VMAType::AllocatedMemoryBlock; final_vma.permissions = VMAPermission::ReadWrite; final_vma.meminfo_state = state; - final_vma.backing_block = block; + final_vma.backing_block = std::move(block); final_vma.offset = offset; UpdatePageTableForVMA(final_vma); @@ -150,7 +151,7 @@ ResultVal<VMManager::VMAHandle> VMManager::MapMMIO(VAddr target, PAddr paddr, u6 final_vma.permissions = VMAPermission::ReadWrite; final_vma.meminfo_state = state; final_vma.paddr = paddr; - final_vma.mmio_handler = mmio_handler; + final_vma.mmio_handler = std::move(mmio_handler); UpdatePageTableForVMA(final_vma); return MakeResult<VMAHandle>(MergeAdjacent(vma_handle)); |