diff options
author | Lioncash <mathew1800@gmail.com> | 2019-07-24 13:18:48 +0200 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2019-08-30 01:28:58 +0200 |
commit | a43ee8d752187bee8cc1dbfe8fef8b27e891b974 (patch) | |
tree | d2ce03343f8c62a095b6c19fa4195196d9e78f0d /src/core/hle/kernel | |
parent | kernel/vm_manager: Deduplicate iterator creation in MergeAdjacentVMA (diff) | |
download | yuzu-a43ee8d752187bee8cc1dbfe8fef8b27e891b974.tar yuzu-a43ee8d752187bee8cc1dbfe8fef8b27e891b974.tar.gz yuzu-a43ee8d752187bee8cc1dbfe8fef8b27e891b974.tar.bz2 yuzu-a43ee8d752187bee8cc1dbfe8fef8b27e891b974.tar.lz yuzu-a43ee8d752187bee8cc1dbfe8fef8b27e891b974.tar.xz yuzu-a43ee8d752187bee8cc1dbfe8fef8b27e891b974.tar.zst yuzu-a43ee8d752187bee8cc1dbfe8fef8b27e891b974.zip |
Diffstat (limited to 'src/core/hle/kernel')
-rw-r--r-- | src/core/hle/kernel/vm_manager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/hle/kernel/vm_manager.cpp b/src/core/hle/kernel/vm_manager.cpp index e86796ba5..721f7cc44 100644 --- a/src/core/hle/kernel/vm_manager.cpp +++ b/src/core/hle/kernel/vm_manager.cpp @@ -773,7 +773,7 @@ void VMManager::MergeAdjacentVMA(VirtualMemoryArea& left, const VirtualMemoryAre new_memory->insert(new_memory->end(), left_begin, left_end); new_memory->insert(new_memory->end(), right_begin, right_end); - left.backing_block = new_memory; + left.backing_block = std::move(new_memory); left.offset = 0; } |