From 46458e72846f2611f738e41ece6336472f5288d5 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 18 Jul 2018 19:02:47 -0400 Subject: core/memory, core/hle/kernel: Use std::move where applicable Avoids pointless copies --- src/core/hle/kernel/vm_manager.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/core/hle/kernel/vm_manager.cpp') diff --git a/src/core/hle/kernel/vm_manager.cpp b/src/core/hle/kernel/vm_manager.cpp index 034dd490e..1cd7f1984 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 +#include #include "common/assert.h" #include "common/logging/log.h" #include "core/arm/arm_interface.h" @@ -117,7 +118,7 @@ ResultVal 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); @@ -160,7 +161,7 @@ ResultVal 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(MergeAdjacent(vma_handle)); -- cgit v1.2.3